X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fcwindowgui.C;h=1c56a6d641e3b70f3f737906fe8c6d794d4a7884;hb=a88121d876acc81c5a28dbd2cc71e7c6856e2ac0;hp=20eff1207d05532fca714077f2b5c8c4b049bf72;hpb=9d832a1fff11b11aaa1108c460690ed05e2bdc05;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/cwindowgui.C b/cinelerra-5.1/cinelerra/cwindowgui.C
index 20eff120..1c56a6d6 100644
--- a/cinelerra-5.1/cinelerra/cwindowgui.C
+++ b/cinelerra-5.1/cinelerra/cwindowgui.C
@@ -604,7 +604,7 @@ int CWindowGUI::drag_stop()
 		if(mwindow->session->drag_assets->total)
 		{
 			mwindow->gui->lock_window("CWindowGUI::drag_stop 1");
-			mwindow->clear(0, 1);
+			mwindow->clear(0);
 			mwindow->load_assets(mwindow->session->drag_assets,
 				mwindow->edl->local_session->get_selectionstart(),
 				LOADMODE_PASTE,
@@ -619,7 +619,7 @@ int CWindowGUI::drag_stop()
 		if(mwindow->session->drag_clips->total)
 		{
 			mwindow->gui->lock_window("CWindowGUI::drag_stop 2");
-			mwindow->clear(0, 1);
+			mwindow->clear(0);
 			mwindow->paste_edls(mwindow->session->drag_clips,
 				LOADMODE_PASTE,
 				mwindow->session->track_highlighted,
@@ -716,8 +716,7 @@ CWrapper(splice_selection)
 CWrapper(overwrite_selection)
 CWrapper(set_inpoint)
 CWrapper(set_outpoint)
-CWrapper(clear_inpoint)
-CWrapper(clear_outpoint)
+CWrapper(unset_inoutpoint)
 CWrapper(toggle_label)
 CWrapper(prev_label)
 CWrapper(next_label)
@@ -829,7 +828,7 @@ int CWindowSlider::handle_event()
 
 void CWindowSlider::set_position()
 {
-	double new_length = mwindow->edl->tracks->total_playable_length();
+	double new_length = mwindow->edl->tracks->total_length();
 // 	if(mwindow->edl->local_session->preview_end <= 0 ||
 // 		mwindow->edl->local_session->preview_end > new_length)
 // 		mwindow->edl->local_session->preview_end = new_length;
@@ -3178,10 +3177,7 @@ int CWindowCanvas::cursor_motion_event()
 		gui->unlock_window();
 		mwindow->restart_brender();
 		mwindow->sync_parameters(CHANGE_PARAMS);
-		gui->cwindow->playback_engine->que->send_command(CURRENT_FRAME,
-			CHANGE_NONE,
-			mwindow->edl,
-			1);
+		mwindow->cwindow->refresh_frame(CHANGE_NONE);
 		if(!redraw) gui->update_tool();
 		gui->lock_window("CWindowCanvas::cursor_motion_event 2");
 	}
@@ -3270,10 +3266,7 @@ int CWindowCanvas::button_press_event()
 
 		mwindow->restart_brender();
 		mwindow->sync_parameters(CHANGE_PARAMS);
-		gui->cwindow->playback_engine->que->send_command(CURRENT_FRAME,
-			CHANGE_NONE,
-			mwindow->edl,
-			1);
+		mwindow->cwindow->refresh_frame(CHANGE_NONE);
 		if(!redraw) gui->update_tool();
 		gui->lock_window("CWindowCanvas::button_press_event 2");
 	}