projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add drag edit render_handle_frame
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
tracksedit.C
diff --git
a/cinelerra-5.1/cinelerra/tracksedit.C
b/cinelerra-5.1/cinelerra/tracksedit.C
index 169878ee262acf1d0d76114f716dfc72227f9794..4a836b96a1fb15755d52c498c290ada63c858c65 100644
(file)
--- a/
cinelerra-5.1/cinelerra/tracksedit.C
+++ b/
cinelerra-5.1/cinelerra/tracksedit.C
@@
-47,6
+47,15
@@
#include "vtrack.h"
#include <string.h>
#include "vtrack.h"
#include <string.h>
+int Tracks::blade(double position)
+{
+ for( Track *track=first; track!=0; track=track->next ) {
+ if( !track->record ) continue;
+ track->blade(position);
+ }
+ return 0;
+}
+
int Tracks::clear(double start, double end, int clear_plugins, int edit_autos)
{
Track *current_track;
int Tracks::clear(double start, double end, int clear_plugins, int edit_autos)
{
Track *current_track;
@@
-61,10
+70,10
@@
int Tracks::clear(double start, double end, int clear_plugins, int edit_autos)
end,
1, // edits
1, // labels
end,
1, // edits
1, // labels
- clear_plugins,
+ clear_plugins,
// edit_plugins
edit_autos,
edit_autos,
- 1,
- 0);
+ 1,
// convert_units
+ 0);
// trim_edits
}
}
return 0;
}
}
return 0;
@@
-623,6
+632,9
@@
void Tracks::move_edits(ArrayList<Edit*> *edits,
{
// This works like this: CUT edit, INSERT edit at final position, keyframes also follow
// FIXME: there should be a GUI way to tell whenever user also wants to move autos or not
{
// This works like this: CUT edit, INSERT edit at final position, keyframes also follow
// FIXME: there should be a GUI way to tell whenever user also wants to move autos or not
+// this is all screwed up
+// inserts defaults/bogus everywhere
+#if 0
// Copy keyframes
FileXML temp;
AutoConf temp_autoconf;
// Copy keyframes
FileXML temp;
AutoConf temp_autoconf;
@@
-655,7
+667,7
@@
void Tracks::move_edits(ArrayList<Edit*> *edits,
dest_track->automation->paste(position_a,
source_length, 1.0, &temp, 0, 1,
&temp_autoconf);
dest_track->automation->paste(position_a,
source_length, 1.0, &temp, 0, 1,
&temp_autoconf);
-
+#endif
// Insert new edit
Edit *dest_edit = dest_track->edits->shift(position_i,
source_length);
// Insert new edit
Edit *dest_edit = dest_track->edits->shift(position_i,
source_length);
@@
-763,6
+775,7
@@
void Tracks::move_effect(Plugin *plugin, PluginSet *plugin_set, int64_t position
// update plugin position
plugin->startproject = position;
plugin->plugin_set = plugin_set;
// update plugin position
plugin->startproject = position;
plugin->plugin_set = plugin_set;
+ plugin->edits = plugin_set;
src_plugin_set->track->optimize();
}
src_plugin_set->track->optimize();
}