X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fasset.h;h=4fa58aa41a010adb314b5d264da07b98a3c203d8;hb=95683646dce10ad3f6a8c8c9c9225c69f4841ec5;hp=479cccbb0740ea3606a26af4757d20f84acd9a57;hpb=3b4d085f4235e6313c25871877180a1a989e5b9f;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/asset.h b/cinelerra-5.1/cinelerra/asset.h
index 479cccbb..4fa58aa4 100644
--- a/cinelerra-5.1/cinelerra/asset.h
+++ b/cinelerra-5.1/cinelerra/asset.h
@@ -27,6 +27,7 @@
 #include "arraylist.h"
 #include "bcwindowbase.inc"
 #include "bchash.inc"
+#include "edl.inc"
 #include "filexml.inc"
 #include "indexable.h"
 #include "indexfile.inc"
@@ -85,12 +86,7 @@ public:
 
 
 // Executed during index building only
-	int equivalent(Asset &asset,
-		int test_audio,
-		int test_video);
-	Asset& operator=(Asset &asset);
-	int operator==(Asset &asset);
-	int operator!=(Asset &asset);
+	int equivalent(Asset &asset, int test_audio, int test_video, EDL *edl=0);
 // Return 1 if the paths match
 	int test_path(const char *path);
 	int read(FileXML *file,
@@ -100,8 +96,6 @@ public:
 	int read_index(FileXML *xml);
 	void reset_audio();
 	void reset_video();
-	int set_timecode(char *tc, int format, int end);
-	int reset_timecode();
 
 // Output path is the path of the output file if name truncation is desired.
 // It is a "" if; complete names should be used.
@@ -150,13 +144,6 @@ public:
 	int layers, program;
 	double frame_rate;
 
-// Timecode information. User setable, in case of errors in source
-	char reel_name[BCTEXTLEN];
-	int reel_number;
-	int64_t tcstart;
-	int64_t tcend;
-	int tcformat;
-
 	int actual_width, actual_height;
 	int width, height;
 // String or FourCC describing compression