prev/next label fix in viewer, inout highlight, modify folder layout, ffmpeg scan...

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

diff --git a/cinelerra-5.1/cinelerra/vwindowgui.C b/cinelerra-5.1/cinelerra/vwindowgui.C
index 92505781fac1330d60857aaf3f4afb50d77efc45..bc423328da44ebbc7c42b767fdd12c8837439a13 100644 (file)
--- a/cinelerra-5.1/cinelerra/vwindowgui.C
+++ b/cinelerra-5.1/cinelerra/vwindowgui.C
@@ -471,10 +471,10 @@ int VWindowGUI::drag_stop()
                unlock_window();
 
                Indexable *indexable =
-                       mwindow->session->drag_clips->size() > 0 ?
-                               (Indexable *)mwindow->session->drag_clips->get(0) :
                        mwindow->session->drag_assets->size() > 0 ?
-                               (Indexable *)mwindow->session->drag_assets->get(0) : 0;
+                               (Indexable *)mwindow->session->drag_assets->get(0) :
+                       mwindow->session->drag_clips->size() > 0 ?
+                               (Indexable *)mwindow->session->drag_clips->get(0) : 0;
                if( indexable )
                        vwindow->change_source(indexable);
 
@@ -598,7 +598,7 @@ void VWindowEditing::toggle_label()
        }
 }
 
-void VWindowEditing::prev_label()
+void VWindowEditing::prev_label(int cut)
 {
        if(vwindow->get_edl())
        {
@@ -628,7 +628,7 @@ void VWindowEditing::prev_label()
        }
 }
 
-void VWindowEditing::next_label()
+void VWindowEditing::next_label(int cut)
 {
        if(vwindow->get_edl())
        {
@@ -857,6 +857,12 @@ void VWindowCanvas::draw_refresh(int flush)
        }
 }
 
+int VWindowCanvas::need_overlays()
+{
+       if( gui->highlighted ) return 1;
+       return 0;
+}
+
 void VWindowCanvas::draw_overlays()
 {
        if( gui->highlighted )