projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
search fixes, preset fixes, ladspa icon logging, igor pref theme, drag btn rollover
[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 10460c0cff35d959a5bfff45a763faf8d45cacd5..f3852cf90e5bab5308e9383aeb29324dbb061a15 100644
(file)
--- a/
cinelerra-5.1/cinelerra/track.C
+++ b/
cinelerra-5.1/cinelerra/track.C
@@
-352,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);
{
if(load_flags & LOAD_EDITS)
edits->load(file, track_offset);
+ else
+ result = file->skip_tag();
}
else
if(file->tag.title_is("PLUGINSET"))
}
else
if(file->tag.title_is("PLUGINSET"))
@@
-372,6
+374,8
@@
int Track::load(FileXML *file, int track_offset, uint32_t load_flags)
current_plugin++;
}
}
current_plugin++;
}
}
+ else
+ result = file->skip_tag();
}
else
load_derived(file, load_flags);
}
else
load_derived(file, load_flags);
@@
-1146,17
+1150,9
@@
int Track::copy_assets(double start,
}
}
-
-
-
-int Track::clear(double start,
- double end,
- int edit_edits,
- int edit_labels,
- int edit_plugins,
- int edit_autos,
- int convert_units,
- Edits *trim_edits)
+int Track::clear(double start, double end,
+ int edit_edits, int edit_labels, int edit_plugins,
+ int edit_autos, int convert_units, Edits *trim_edits)
{
// Edits::move_auto calls this routine after the units are converted to the track
// format.
{
// Edits::move_auto calls this routine after the units are converted to the track
// format.
@@
-1541,7
+1537,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);
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
start_edit = edit;
// Recalculate start position
@@
-1564,20
+1563,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);
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 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 &&
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 -
{
// 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);
}
edl->labels->insert_label(position);
new_labels.remove_object_number(i);
}
@@
-1657,7
+1654,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);
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
start_edit = edit;
// Recalculate start position
@@
-1680,19
+1680,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);
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 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 &&
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 -
{
// 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);
}
edl->labels->insert_label(position);
new_labels.remove_object_number(i);
}