cposer/viewer btn1/2/3 fwd/rev/frm playback, misc fixes, leaks, 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 931b0d3e1a18c101b576b360ab4fd89ba594f790..e5275cbc1c68900a90dc0a7bb51645d2842c5ada 100644 (file)
--- a/cinelerra-5.1/cinelerra/vwindowgui.C
+++ b/cinelerra-5.1/cinelerra/vwindowgui.C
@@ -348,26 +348,45 @@ int VWindowGUI::keypress_event()
                        break;
        }
        if(!result) result = transport->keypress_event();
-
+       if( result && !vwindow->playback_engine->is_playing_back )
+               timebar->update(1);
        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() &&
+       if( vwindow->get_edl() != 0 && canvas->get_canvas() &&
            canvas->get_canvas()->get_cursor_over_window() ) {
-               int command = STOP;
-               PlaybackEngine *playback_engine = vwindow->playback_engine;
-               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();
-                       command = NORMAL_FWD;
+               switch( get_buttonpress() ) {
+               case LEFT_BUTTON:
+                       if( !vwindow->playback_engine->is_playing_back ) {
+                               double length = vwindow->get_edl()->tracks->total_playable_length();
+                               double position = vwindow->playback_engine->get_tracking_position();
+                               if( position >= length ) transport->goto_start();
+                       }
+                       return transport->forward_play->handle_event();
+               case MIDDLE_BUTTON:
+                       if( !vwindow->playback_engine->is_playing_back ) {
+                               double position = vwindow->playback_engine->get_tracking_position();
+                               if( position <= 0 ) transport->goto_end();
+                       }
+                       return transport->reverse_play->handle_event();
+               case RIGHT_BUTTON:  // activates popup
+                       break;
+               case WHEEL_UP:
+                       return transport->frame_forward_play->handle_event();
+               case WHEEL_DOWN:
+                       return transport->frame_reverse_play->handle_event();
                }
-               unlock_window();
-               transport->handle_transport(command, 1);
-               lock_window("VWindowGUI::button_press_event");
-               return 1;
        }
        if(canvas->get_canvas())
                return canvas->button_press_event_base(canvas->get_canvas());