asset drag/drop to viewers, bluebanana bug, listbox fontlist highlight

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

diff --git a/cinelerra-5.1/cinelerra/track.C b/cinelerra-5.1/cinelerra/track.C
index ec243b282cc0d01e93d1e5401172083f0e3e9e2e..ae7d10491daa4149a71f7221b278d13b625e4b94 100644 (file)
--- a/cinelerra-5.1/cinelerra/track.C
+++ b/cinelerra-5.1/cinelerra/track.C
@@ -245,7 +245,8 @@ double Track::get_length()
        for(int i = 0; i < plugin_set.total; i++)
        {
                if( !plugin_set.values[i]->last ) continue;
-               length = from_units(plugin_set.values[i]->last->startproject);
+               length = from_units(plugin_set.values[i]->last->startproject +
+                       plugin_set.values[i]->last->length);
                if(length > total_length) total_length = length;
        }
 
@@ -351,6 +352,8 @@ int Track::load(FileXML *file, int track_offset, uint32_t load_flags)
                        {
                                if(load_flags & LOAD_EDITS)
                                        edits->load(file, track_offset);
+                               else
+                                       result = file->skip_tag();
                        }
                        else
                        if(file->tag.title_is("PLUGINSET"))
@@ -371,6 +374,8 @@ int Track::load(FileXML *file, int track_offset, uint32_t load_flags)
                                                current_plugin++;
                                        }
                                }
+                               else
+                                       result = file->skip_tag();
                        }
                        else
                                load_derived(file, load_flags);
@@ -1540,7 +1545,10 @@ void Track::shuffle_edits(double start, double end, int first_track)
                int index = rand() % new_edits.size();
                Edit *edit = new_edits.get(index);
                new_edits.remove_number(index);
-               edits->insert_after(start_edit, edit);
+               if( !start_edit )
+                       edits->insert_before(edits->first, edit);
+               else
+                       edits->insert_after(start_edit, edit);
                start_edit = edit;
 
 // Recalculate start position
@@ -1563,20 +1571,18 @@ void Track::shuffle_edits(double start, double end, int first_track)
                if(first_track && edl->session->labels_follow_edits)
                {
                        double start_seconds1 = from_units(startproject1);
+                       double end_seconds1 = from_units(startproject1 + edit->length);
                        double start_seconds2 = from_units(startproject2);
-                       //double end_seconds1 = from_units(edit->startproject +
-                       //      edit->length);
                        for(int i = new_labels.size() - 1; i >= 0; i--)
                        {
                                Label *label = new_labels.get(i);
 // Was in old edit position
                                if(label->position >= start_seconds1 &&
-                                       label->position < start_seconds2)
+                                       label->position < end_seconds1)
                                {
 // Move to new edit position
                                        double position = label->position -
-                                               start_seconds1 +
-                                               start_seconds2;
+                                               start_seconds1 + start_seconds2;
                                        edl->labels->insert_label(position);
                                        new_labels.remove_object_number(i);
                                }
@@ -1656,7 +1662,10 @@ void Track::reverse_edits(double start, double end, int first_track)
                int index = new_edits.size() - 1;
                Edit *edit = new_edits.get(index);
                new_edits.remove_number(index);
-               edits->insert_after(start_edit, edit);
+               if( !start_edit )
+                       edits->insert_before(edits->first, edit);
+               else
+                       edits->insert_after(start_edit, edit);
                start_edit = edit;
 
 // Recalculate start position
@@ -1679,19 +1688,18 @@ void Track::reverse_edits(double start, double end, int first_track)
                if(first_track && edl->session->labels_follow_edits)
                {
                        double start_seconds1 = from_units(startproject1);
+                       double end_seconds1 = from_units(startproject1 + edit->length);
                        double start_seconds2 = from_units(startproject2);
-                       //double end_seconds1 = from_units(edit->startproject + edit->length);
                        for(int i = new_labels.size() - 1; i >= 0; i--)
                        {
                                Label *label = new_labels.get(i);
 // Was in old edit position
                                if(label->position >= start_seconds1 &&
-                                       label->position < start_seconds2)
+                                       label->position < end_seconds1)
                                {
 // Move to new edit position
                                        double position = label->position -
-                                               start_seconds1 +
-                                               start_seconds2;
+                                               start_seconds1 + start_seconds2;
                                        edl->labels->insert_label(position);
                                        new_labels.remove_object_number(i);
                                }