X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ffile.h;h=2ca1acbe921a62482d4595f3e86519d3189b66ef;hp=4d80870ac3db729d1f7f9f5e19d243e2f1e4a319;hb=7e5a0760f40ff787cc3d93cb7768a901ebe52809;hpb=ea0dfe3cd57bb60ef824cd0d3512fcd251020c76

diff --git a/cinelerra-5.1/cinelerra/file.h b/cinelerra-5.1/cinelerra/file.h
index 4d80870a..2ca1acbe 100644
--- a/cinelerra-5.1/cinelerra/file.h
+++ b/cinelerra-5.1/cinelerra/file.h
@@ -86,8 +86,9 @@ public:
 // to delete the file object.  Otherwise we'd delete just the cached frames
 // while the list of open files grew.
 	void set_cache_frames(int value);
-// Delete frame cache.  Return 0 if successful.  Return 1 if
-// nothing to delete.
+// Delete oldest frame from cache.
+// Return number of bytes freed if successful.
+// Return 0 if nothing to delete.
 	int purge_cache();
 // Delete oldest frame from cache.  Return 0 if successful.  Return 1 if
 // nothing to delete.
@@ -227,10 +228,12 @@ public:
 // allocated.
 // Get best colormodel to translate for hardware accelerated playback.
 // Called by VRender.
-	int get_best_colormodel(int driver);
+	int get_best_colormodel(int driver, int vstream=-1);
 // Get best colormodel for hardware accelerated recording.
 // Called by VideoDevice.
 	static int get_best_colormodel(Asset *asset, int driver);
+// asset scaling on read_frame
+	static int can_scale_input(Asset *asset);
 // Get nearest colormodel that can be decoded without a temporary frame.
 // Used by read_frame.
 	int colormodel_supported(int colormodel);
@@ -316,12 +319,7 @@ public:
 	static void init_cin_path();
 	static void get_exe_path(char *result, char *bnp=0);
 	static void getenv_path(char *result, const char *path);
-	static void setenv_path(char *result, const char *var, const char *path);
-	static char cinexe_path[BCTEXTLEN], cinpkg_path[BCTEXTLEN];
-	static char cindat_path[BCTEXTLEN], cinlib_path[BCTEXTLEN];
-	static char cincfg_path[BCTEXTLEN], cinplg_path[BCTEXTLEN];
-	static char cinlad_path[BCTEXTLEN], cinlcl_path[BCTEXTLEN];
-	static char cinbwr_path[BCTEXTLEN];
+	static void setenv_path(const char *var, const char *path, int overwrite);
 	static const char *get_cin() { return getenv("CIN_PKG"); }
 	static const char *get_cin_path() { return getenv("CIN_PATH"); }
 	static const char *get_cindat_path() { return getenv("CIN_DAT"); }
@@ -330,6 +328,7 @@ public:
 	static const char *get_plugin_path() { return getenv("CIN_PLUGIN"); }
 	static const char *get_ladspa_path() { return getenv("CIN_LADSPA"); }
 	static const char *get_locale_path() { return getenv("CIN_LOCALE"); }
+	static const char *get_render_path() { return getenv("CIN_RENDER"); }
 	static const char *get_browser_path() { return getenv("CIN_BROWSER"); }
 
 	static const char *default_probes[];