nested clips, big rework and cleanup, sams new icons, leaks and tweaks

[goodguy/history.git] / cinelerra-5.1 / cinelerra / edit.C

diff --git a/cinelerra-5.1/cinelerra/edit.C b/cinelerra-5.1/cinelerra/edit.C
index 9eb0d9d8f885aedabd0c9aac3d745a6b9a97e64d..ce2612acfacccd87a13965f8e20cb30be168e4e1 100644 (file)
--- a/cinelerra-5.1/cinelerra/edit.C
+++ b/cinelerra-5.1/cinelerra/edit.C
@@ -32,7 +32,6 @@
 #include "localsession.h"
 #include "plugin.h"
 #include "mainsession.h"
 #include "localsession.h"
 #include "plugin.h"
 #include "mainsession.h"

-#include "nestededls.h"

 #include "strack.h"
 #include "trackcanvas.h"
 #include "tracks.h"
 #include "strack.h"
 #include "trackcanvas.h"
 #include "tracks.h"


@@ -242,7 +241,7 @@ int Edit::silence()
 
 void Edit::copy_from(Edit *edit)
 {
 
 void Edit::copy_from(Edit *edit)
 {

-       this->nested_edl = edl->nested_edls->get_copy(edit->nested_edl);
+       this->nested_edl = edl->nested_edls.get_copy(edit->nested_edl);

        this->asset = edl->assets->update(edit->asset);
        this->startsource = edit->startsource;
        this->startproject = edit->startproject;
        this->asset = edl->assets->update(edit->asset);
        this->startsource = edit->startsource;
        this->startproject = edit->startproject;