repair selected_to_clipboard bug

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

diff --git a/cinelerra-5.1/cinelerra/mwindowedit.C b/cinelerra-5.1/cinelerra/mwindowedit.C
index efe891df50e5044a37bc399beefab5f4312c1a9e..6e2df1c93d5a178a39abe9f7c2eda9620f60eaf4 100644 (file)
--- a/cinelerra-5.1/cinelerra/mwindowedit.C
+++ b/cinelerra-5.1/cinelerra/mwindowedit.C
@@ -905,15 +905,23 @@ void MWindow::match_output_size(Track *track)
 
 void MWindow::selected_to_clipboard(int packed)
 {
-       int64_t start = INT64_MAX, end = -INT64_MAX, pos = 0;
+       double start = DBL_MAX, end = DBL_MIN;
+       Track *first_track=0, *last_track = 0;
        for( Track *track=edl->tracks->first; track; track=track->next ) {
                if( !track->record ) continue;
+               int empty = 1;
                for( Edit *edit=track->edits->first; edit; edit=edit->next ) {
                        if( !edit->is_selected || edit->silence() ) continue;
-                       if( start > (pos=edit->startproject) ) start = pos;
-                       if( end < (pos+=edit->length) ) end = pos;
+                       double edit_pos = track->from_units(edit->startproject);
+                       if( start > edit_pos ) start = edit_pos;
+                       if( end < (edit_pos+=edit->length) ) end = edit_pos;
+                       empty = 0;
                }
+               if( empty ) continue;
+               if( !first_track ) first_track = track;
+               last_track = track;
        }
+       if( !first_track ) return;
        EDL *new_edl = new EDL();
        new_edl->create_objects();
        new_edl->copy_session(edl);
@@ -925,34 +933,41 @@ void MWindow::selected_to_clipboard(int packed)
        new_edl->session->audio_tracks = 0;
        for( Track *track=edl->tracks->first; track; track=track->next ) {
                if( !track->record ) continue;
+               if( first_track ) {
+                       if( first_track != track ) continue;
+                       first_track = 0;
+               }
                Track *new_track = 0;
                if( !packed )
                        new_track = new_edl->add_new_track(track->data_type);
-               int64_t startproject = 0, last_startproject = start;
+               int64_t start_pos = track->to_units(start, 0);
+               int64_t end_pos = track->to_units(end, 0);
+               int64_t startproject = 0;
                for( Edit *edit=track->edits->first; edit; edit=edit->next ) {
-                       if( edit->startproject < start ) continue;
-                       if( edit->startproject >= end ) break;
-                       if( !edit->is_selected || edit->silence() ) {
-                               if( !packed ) startproject += edit->length;
-                               continue;
-                       }
+                       if( edit->startproject < start_pos ) continue;
+                       if( edit->startproject >= end_pos ) break;
+                       if( !edit->is_selected || edit->silence() ) continue;
                        if( !new_track )
                                new_track = new_edl->add_new_track(track->data_type);
                        if( new_track ) {
-                               if( !packed && startproject > last_startproject ) {
-                                       Edit *silence = new Edit(new_edl, new_track);
-                                       silence->startproject = last_startproject;
-                                       silence->length = startproject - last_startproject;
-                                       new_track->edits->append(silence);
+                               if( !packed ) {
+                                       int64_t edit_position = edit->startproject - start_pos;
+                                       if( edit_position > startproject ) {
+                                               Edit *silence = new Edit(new_edl, new_track);
+                                               silence->startproject = startproject;
+                                               silence->length = edit_position - startproject;
+                                               new_track->edits->append(silence);
+                                               startproject = edit_position;
+                                       }
                                }
                                Edit *clip_edit = new Edit(new_edl, new_track);
                                clip_edit->copy_from(edit);
                                clip_edit->startproject = startproject;
                                startproject += clip_edit->length;
-                               last_startproject = startproject;
                                new_track->edits->append(clip_edit);
                        }
                }
+               if( last_track == track ) break;
        }
        double length = new_edl->tracks->total_length();
        FileXML file;