projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fast drag/drop rework, modify labels in mwin->cwin locks, mods to cut/paste, marks...
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
tracks.h
diff --git
a/cinelerra-5.1/cinelerra/tracks.h
b/cinelerra-5.1/cinelerra/tracks.h
index 4d3bef901665b06644c0af5d94abbf33823554ef..abcc0af4bc7ece7be125b10494a404c3067da7f4 100644
(file)
--- a/
cinelerra-5.1/cinelerra/tracks.h
+++ b/
cinelerra-5.1/cinelerra/tracks.h
@@
-50,14
+50,14
@@
public:
int &track_offset,
uint32_t load_flags);
void move_edits(ArrayList<Edit*> *edits, Track *track, double position,
int &track_offset,
uint32_t load_flags);
void move_edits(ArrayList<Edit*> *edits, Track *track, double position,
- int edit_labels, int edit_plugins, int edit_autos, int
behaviour
);
- void move_group(EDL *group, Track *first_track, double position);
+ int edit_labels, int edit_plugins, int edit_autos, int
mode
);
+ void move_group(EDL *group, Track *first_track, double position
, int overwrite
);
void move_effect(Plugin *plugin, Track *track, int64_t position);
void move_effect(Plugin *plugin, PluginSet *plugin_set, int64_t position);
// Construct a list of all the recordable edits which start on position
void clear_selected_edits();
void move_effect(Plugin *plugin, Track *track, int64_t position);
void move_effect(Plugin *plugin, PluginSet *plugin_set, int64_t position);
// Construct a list of all the recordable edits which start on position
void clear_selected_edits();
- void select_affected_edits(double position, Track *start_track);
+ void select_affected_edits(double position, Track *start_track
, int sense
);
void get_selected_edits(ArrayList<Edit*> *drag_edits);
int next_group_id();
int new_group(int id);
void get_selected_edits(ArrayList<Edit*> *drag_edits);
int next_group_id();
int new_group(int id);
@@
-217,13
+217,9
@@
public:
int popup_transition(int cursor_x, int cursor_y);
int select_auto(int cursor_x, int cursor_y);
int move_auto(int cursor_x, int cursor_y, int shift_down);
int popup_transition(int cursor_x, int cursor_y);
int select_auto(int cursor_x, int cursor_y);
int move_auto(int cursor_x, int cursor_y, int shift_down);
- int modify_edithandles(double &oldposition,
- double &newposition,
- int currentend,
- int handle_mode,
- int edit_labels,
- int edit_plugins,
- int edit_autos);
+ int modify_edithandles(double &oldposition, double &newposition,
+ int currentend, int handle_mode, int edit_labels,
+ int edit_plugins, int edit_autos, int group_id);
int modify_pluginhandles(double &oldposition,
double &newposition,
int currentend,
int modify_pluginhandles(double &oldposition,
double &newposition,
int currentend,