label edit deadlock, build openexr cfg option, code cleanup

[goodguy/history.git] / cinelerra-5.1 / cinelerra / asset.h

diff --git a/cinelerra-5.1/cinelerra/asset.h b/cinelerra-5.1/cinelerra/asset.h
index 51f775034e7b7126b7d0dcacfdfe451a29de0b22..4fa58aa41a010adb314b5d264da07b98a3c203d8 100644 (file)
--- 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.
@@ -145,18 +139,11 @@ public:
 
        int64_t audio_length;
 
-// contains video data
-       int video_data;
+// contains video data, single frame data set
+       int video_data, single_frame;
        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