X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fasset.h;h=26fbfd7081b3c7fc9f4c404c1d8329dd254d811f;hb=4d515bb7ba93b462bc7871b38cdceec988c1e733;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..26fbfd70 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,