rework intl strategy, titler upgrades, fonts fixes, igor ru.po

[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..26fbfd7081b3c7fc9f4c404c1d8329dd254d811f 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,
@@ -145,8 +141,8 @@ 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;