repeat play, in/out <> shortcuts, append to proj wording, cleanup

[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 ea05537bb7b2ec6e67bdfe08dfd21a685c13f100..4458eb764c80ba1bf608fd1e25f80f5284a1c9c4 100644 (file)
--- a/cinelerra-5.1/cinelerra/vwindowgui.C
+++ b/cinelerra-5.1/cinelerra/vwindowgui.C
@@ -352,20 +352,26 @@ int VWindowGUI::keypress_event()
        return result;
 }
 
+void VWindowGUI::stop_transport(const char *lock_msg)
+{
+       if( !transport->is_stopped() ) {
+               if( lock_msg ) unlock_window();
+               transport->handle_transport(STOP, 1, 0, 0);
+               if( lock_msg ) lock_window(lock_msg);
+       }
+}
+
 int VWindowGUI::button_press_event()
 {
        if( get_buttonpress() == LEFT_BUTTON && canvas->get_canvas() &&
            canvas->get_canvas()->get_cursor_over_window() ) {
                PlaybackEngine *playback_engine = vwindow->playback_engine;
-               unlock_window();
-               if( playback_engine->is_playing_back ) {
-                       transport->handle_transport(STOP, 1);
-               }
-               else {
-                       transport->handle_transport(NORMAL_FWD, 1);
+               if( !playback_engine->is_playing_back && vwindow->get_edl() != 0 ) {
+                       double length = vwindow->get_edl()->tracks->total_playable_length();
+                       double position = playback_engine->get_tracking_position();
+                       if( position >= length ) transport->goto_start();
                }
-               vwindow->gui->lock_window("VWindowEditing::prev_label");
-               return 1;
+               return transport->forward_play->handle_event();
        }
        if(canvas->get_canvas())
                return canvas->button_press_event_base(canvas->get_canvas());
@@ -424,6 +430,7 @@ int VWindowGUI::drag_stop()
        {
                highlighted = 0;
                canvas->draw_refresh();
+               unlock_window();
 
                Indexable *indexable = mwindow->session->drag_assets->size() ?
                        mwindow->session->drag_assets->get(0) :
@@ -431,17 +438,12 @@ int VWindowGUI::drag_stop()
                EDL *edl = mwindow->session->drag_clips->size() ?
                        mwindow->session->drag_clips->get(0) :
                        0;
-               if( vwindow->playback_engine->is_playing_back ) {
-                       unlock_window();
-                       vwindow->stop_playback(1);
-                       lock_window("VWindowGUI::drag_stop");
-               }
-
                if(indexable)
                        vwindow->change_source(indexable);
                else
                if(edl)
                        vwindow->change_source(edl);
+               lock_window("VWindowGUI::drag_stop");
                return 1;
        }