png img proxy fixes, speed zoom segv fix, colapse ins 1frm silence undo, repair rende...

[goodguy/history.git] / cinelerra-5.1 / cinelerra / mwindowedit.C

diff --git a/cinelerra-5.1/cinelerra/mwindowedit.C b/cinelerra-5.1/cinelerra/mwindowedit.C
index e5d90c6b52e23ef8cef4f96cadacee22f5f4cb5a..53cb4c338e00a42faf6309ff531b57b76dc8ed9f 100644 (file)
--- 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,
@@ -2091,14 +2091,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();
@@ -2398,11 +2400,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;
 }