X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindowedit.C;h=e2f552042cf5b6f2a97645de05da41f25765dd9b;hp=a0856008867fa8bcff934ccd1f09479d822c7415;hb=502b6f3b6fd04f6b01c6d70dcb81aa304dd0db1c;hpb=b402ed7f93de4c98e6651483eb8561cf1c37ec9a

diff --git a/cinelerra-5.1/cinelerra/mwindowedit.C b/cinelerra-5.1/cinelerra/mwindowedit.C
index a0856008..e2f55204 100644
--- a/cinelerra-5.1/cinelerra/mwindowedit.C
+++ b/cinelerra-5.1/cinelerra/mwindowedit.C
@@ -1608,7 +1608,7 @@ void MWindow::paste_silence()
 		if( edl->session->frame_rate > 0 )
 			end += 1./edl->session->frame_rate;
 	}
-	undo->update_undo_before();
+	undo->update_undo_before(_("silence"), this);
 	edl->paste_silence(start, end,
 		edl->session->labels_follow_edits,
 		edl->session->plugins_follow_edits,
@@ -1881,6 +1881,7 @@ void MWindow::redo_entry(BC_WindowBase *calling_window_gui)
 	update_plugin_guis();
 
 	gui->update(1, 2, 1, 1, 1, 1, 1);
+	gui->update_proxy_toggle();
 	gui->unlock_window();
 	cwindow->update(1, 1, 1, 1, 1);
 	cwindow->gui->unlock_window();
@@ -2091,14 +2092,16 @@ void MWindow::save_clip(EDL *new_edl, const char *txt)
 void MWindow::to_clip(EDL *edl, const char *txt, int all)
 {
 	FileXML file;
-	double start, end;
+	LocalSession *src = edl->local_session;
 
 	gui->lock_window("MWindow::to_clip 1");
-	start = all ? 0 :
-		edl->local_session->get_selectionstart();
-	end = all ? edl->tracks->total_length() :
-		edl->local_session->get_selectionend();
-
+	double start = all ? 0 :
+		src->inpoint_valid() ? src->get_inpoint() :
+		src->outpoint_valid() ? 0 : src->get_selectionstart();
+	double end = all ? edl->tracks->total_length() :
+		src->outpoint_valid() ? src->get_outpoint() :
+		src->inpoint_valid() ? edl->tracks->total_length() :
+			src->get_selectionend();
 	if( EQUIV(end, start) ) {
 		start = 0;
 		end = edl->tracks->total_length();
@@ -2207,6 +2210,7 @@ void MWindow::undo_entry(BC_WindowBase *calling_window_gui)
 	update_plugin_guis();
 
 	gui->update(1, 2, 1, 1, 1, 1, 1);
+	gui->update_proxy_toggle();
 	gui->unlock_window();
 	cwindow->update(1, 1, 1, 1, 1);
 	cwindow->gui->unlock_window();
@@ -2329,12 +2333,6 @@ void MWindow::rescale_proxy(EDL *clip, int orig_scale, int new_scale)
 	edl->rescale_proxy(orig_scale, new_scale);
 }
 
-void MWindow::set_proxy(int use_scaler, int new_scale, int auto_scale,
-	ArrayList<Indexable*> *orig_assets, ArrayList<Indexable*> *proxy_assets)
-{
-	edl->set_proxy(use_scaler, new_scale, auto_scale, orig_assets, proxy_assets);
-}
-
 void MWindow::add_proxy(int use_scaler,
 	ArrayList<Indexable*> *orig_assets, ArrayList<Indexable*> *proxy_assets)
 {
@@ -2404,11 +2402,13 @@ void MWindow::speed_before()
 int MWindow::speed_after(int done)
 {
 	int result = 0;
-	if( speed_edl && done >= 0 )
-		result = normalize_speed(speed_edl, edl);
-	if( done ) {
-		speed_edl->remove_user();
-		speed_edl = 0;
+	if( speed_edl ) {
+		if( done >= 0 )
+			result = normalize_speed(speed_edl, edl);
+		if( done != 0 ) {
+			speed_edl->remove_user();
+			speed_edl = 0;
+		}
 	}
 	return result;
 }