undo fixes, viewer change_source rework, 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 0c4621e2bb2f3e096dda7ae4364d708177b32c9a..5ff595eeaec5801f23c60b0bb5006cbb486f3489 100644 (file)
--- a/cinelerra-5.1/cinelerra/vwindowgui.C
+++ b/cinelerra-5.1/cinelerra/vwindowgui.C
@@ -104,6 +104,7 @@ void VWindowGUI::change_source(EDL *edl, const char *title)
                sprintf(string, _(PROGRAM_NAME ": Viewer"));
 
        lock_window("VWindowGUI::change_source");
+       canvas->clear();
        timebar->update(0);
        set_title(string);
        unlock_window();
@@ -353,6 +354,19 @@ int VWindowGUI::keypress_event()
 
 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);
+               }
+               vwindow->gui->lock_window("VWindowEditing::prev_label");
+               return 1;
+       }
        if(canvas->get_canvas())
                return canvas->button_press_event_base(canvas->get_canvas());
        return 0;
@@ -410,6 +424,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) :
@@ -417,12 +432,12 @@ int VWindowGUI::drag_stop()
                EDL *edl = mwindow->session->drag_clips->size() ?
                        mwindow->session->drag_clips->get(0) :
                        0;
-
                if(indexable)
                        vwindow->change_source(indexable);
                else
                if(edl)
                        vwindow->change_source(edl);
+               lock_window("VWindowGUI::drag_stop");
                return 1;
        }
 
@@ -614,8 +629,7 @@ void VWindowEditing::next_label()
 double VWindowEditing::get_position()
 {
        EDL *edl = vwindow->get_edl();
-       double position = !edl ? 0 : edl->local_session->get_selectionstart(1) +
-                       edl->session->get_frame_offset() / edl->session->frame_rate;
+       double position = !edl ? 0 : edl->local_session->get_selectionstart(1);
        return position;
 }
 
@@ -624,7 +638,6 @@ void VWindowEditing::set_position(double position)
        EDL *edl = vwindow->get_edl();
        if( !edl ) return;
        if( get_position() != position ) {
-               position -= edl->session->get_frame_offset() / edl->session->frame_rate;
                if( position < 0 ) position = 0;
                edl->local_session->set_selectionstart(position);
                edl->local_session->set_selectionend(position);
@@ -642,15 +655,11 @@ void VWindowEditing::set_outpoint()
        vwindow->set_outpoint();
 }
 
-void VWindowEditing::clear_inpoint()
+void VWindowEditing::unset_inoutpoint()
 {
-       vwindow->clear_inpoint();
+       vwindow->unset_inoutpoint();
 }
 
-void VWindowEditing::clear_outpoint()
-{
-       vwindow->clear_outpoint();
-}
 
 void VWindowEditing::to_clip()
 {
@@ -881,7 +890,7 @@ void VWindowGUI::update_points()
 
 //printf("VWindowGUI::update_points 2\n");
        long pixel = (long)((double)edl->local_session->in_point /
-               edl->tracks->total_playable_length() *
+               edl->tracks->total_length() *
                (mwindow->theme->vtimebar_w -
                        2 *
                        mwindow->theme->in_point[0]->get_w())) +
@@ -933,7 +942,7 @@ void VWindowGUI::update_points()
 //printf("VWindowGUI::update_points 10\n");
 
        pixel = (long)((double)edl->local_session->out_point /
-               (edl->tracks->total_playable_length() + 0.5) *
+               (edl->tracks->total_length() + 0.5) *
                (mwindow->theme->vtimebar_w -
                        2 *
                        mwindow->theme->in_point[0]->get_w())) +