fixes for vicons checkin

[goodguy/history.git] / cinelerra-5.0 / cinelerra / edl.C

diff --git a/cinelerra-5.0/cinelerra/edl.C b/cinelerra-5.0/cinelerra/edl.C
index a22d3f139fc5aecf451a9cb2a90c3168ca7bf186..8ef59f2bf984b1301dbf9bf02c5f6b5591b69c3c 100644 (file)
--- a/cinelerra-5.0/cinelerra/edl.C
+++ b/cinelerra-5.0/cinelerra/edl.C
@@ -27,7 +27,7 @@
 #include "awindowgui.inc"
 #include "bcsignals.h"
 #include "clip.h"
-#include "colormodels.h"
+#include "bccmodels.h"
 #include "bchash.h"
 #include "edits.h"
 #include "edl.h"
@@ -394,8 +394,7 @@ int EDL::save_xml(FileXML *file,
 int EDL::copy_all(EDL *edl)
 {
        if(this == edl) return 0;
-
-       index_state->copy_from(edl->index_state);
+       update_index(edl);
        nested_edls->clear();
        copy_session(edl);
        copy_assets(edl);
@@ -1201,7 +1200,7 @@ void EDL::insert_asset(Asset *asset,
 
 void EDL::set_index_file(Indexable *indexable)
 {
-       if(indexable->is_asset) 
+       if(indexable->is_asset)
                assets->update_index((Asset*)indexable);
        else
                nested_edls->update_index((EDL*)indexable);