X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.0%2Fcinelerra%2Ffile.h;h=854b4919cd9a4f697d0dbb1b39064a82971dcde8;hb=52fcc46226f9df46f9ce9d0566dc568455a7db0b;hp=692706a0cc78583f8b9df39aa78144482cfe6712;hpb=2d99bb8ce591f05a31464b517d85dc2bc35b2abe;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.0/cinelerra/file.h b/cinelerra-5.0/cinelerra/file.h
index 692706a0..854b4919 100644
--- a/cinelerra-5.0/cinelerra/file.h
+++ b/cinelerra-5.0/cinelerra/file.h
@@ -30,10 +30,6 @@
 #include "filebase.inc"
 #include "file.inc"
 
-#ifdef USE_FILEFORK
-#include "filefork.inc"
-#endif
-
 #include "filethread.inc"
 #include "filexml.inc"
 #include "formattools.inc"
@@ -58,8 +54,6 @@ public:
 	File();
 	~File();
 
-	friend class FileFork;
-
 // Get attributes for various file formats.
 // The dither parameter is carried over from recording, where dither is done at the device.
 	int get_options(FormatTools *format,
@@ -237,6 +231,9 @@ public:
 // Used by read_frame.
 	int colormodel_supported(int colormodel);
 
+// stubs for now
+	static const char *compressiontostr(const char *codec) { return codec; }
+	static const char *strtocompression(const char *string) { return string; }
 // subclass memory usage
 	int64_t file_memory_usage();
 // Used by CICache to calculate the total size of the cache.
@@ -325,22 +322,6 @@ private:
 // Copy read frames to the cache
 	int use_cache;
 
-#ifdef USE_FILEFORK
-// Pointer to the fork object.  0 if this instance of File is the fork.
-	FileFork *file_fork;
-// If this instance is the fork.
-	int is_fork;
-// result_data must be locked during sync transaction
-	Mutex *forked;
-
-	class FileForker {
-		Mutex &m;
-	public:
-		FileForker(Mutex &lk) : m(lk) { m.lock("FileForker::FileForker"); }
-		~FileForker() { m.unlock(); }
-	};
-#endif
-
 };
 
 #endif