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

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

diff --git a/cinelerra-5.1/cinelerra/vwindow.C b/cinelerra-5.1/cinelerra/vwindow.C
index 206292f3cdc1e534c7f6ab7d1e74a65324d8f1f6..7a24e1bcda33d524a2f2c7721a05d625e3ced78d 100644 (file)
--- a/cinelerra-5.1/cinelerra/vwindow.C
+++ b/cinelerra-5.1/cinelerra/vwindow.C
@@ -255,7 +255,7 @@ void VWindow::change_source(Indexable *indexable)
        if(asset)
                mwindow->asset_to_edl(this->edl, asset);
        else
-               mwindow->edl_to_nested(this->edl, nested_edl);
+               this->edl->to_nested(nested_edl);
 
 // Update GUI
        gui->change_source(this->edl, title);
@@ -351,6 +351,7 @@ void VWindow::update_position(int change_type,
                double position = edl->local_session->get_selectionstart(1);
                if(lock_window) gui->lock_window("VWindow::update_position");
                gui->clock->update(position);
+               gui->timebar->update(1);
                if(lock_window) gui->unlock_window();
        }
 }
@@ -420,14 +421,7 @@ void VWindow::copy()
                double start = edl->local_session->get_selectionstart();
                double end = edl->local_session->get_selectionend();
                FileXML file;
-               edl->copy(start,
-                       end,
-                       0,
-                       0,
-                       0,
-                       &file,
-                       "",
-                       1);
+               edl->copy(start, end, 0, &file, "", 1);
                const char *file_string = file.string();
                long file_length = strlen(file_string);
                mwindow->gui->lock_window();