projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
inter-view map only if armed track, copy/paste behavior rework
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
mwindow.h
diff --git
a/cinelerra-5.1/cinelerra/mwindow.h
b/cinelerra-5.1/cinelerra/mwindow.h
index e0f0d4f8c19eab038534474199c58c7490503e79..71d23568f67fb0ae1e9e0790440605f1417893ab 100644
(file)
--- a/
cinelerra-5.1/cinelerra/mwindow.h
+++ b/
cinelerra-5.1/cinelerra/mwindow.h
@@
-140,6
+140,9
@@
public:
void show_cwindow();
void show_gwindow();
void hide_gwindow();
void show_cwindow();
void show_gwindow();
void hide_gwindow();
+ void restore_windows();
+ void save_layout(int no);
+ void load_layout(int no);
int tile_windows(int window_config);
char *get_cwindow_display();
void set_screens(int value);
int tile_windows(int window_config);
char *get_cwindow_display();
void set_screens(int value);
@@
-179,6
+182,7
@@
public:
void update_vwindow();
// Fit selected time to horizontal display range
void fit_selection();
void update_vwindow();
// Fit selected time to horizontal display range
void fit_selection();
+ void selected_to_clipboard(int packed);
// Fit selected autos to the vertical display range
void fit_autos(int doall);
void change_currentautorange(int autogrouptype, int increment, int changemax);
// Fit selected autos to the vertical display range
void fit_autos(int doall);
void change_currentautorange(int autogrouptype, int increment, int changemax);
@@
-360,17
+364,13
@@
public:
int feather_edits(int64_t feather_samples, int audio, int video);
int64_t get_feather(int audio, int video);
float get_aspect_ratio();
int feather_edits(int64_t feather_samples, int audio, int video);
int64_t get_feather(int audio, int video);
float get_aspect_ratio();
- void insert(double position,
- FileXML *file,
- int edit_labels,
- int edit_plugins,
- int edit_autos,
- EDL *parent_edl /* = 0 */);
+ void insert(double position, FileXML *file,
+ int edit_labels, int edit_plugins, int edit_autos,
+ EDL *parent_edl, Track *first_track, int overwrite);
// TrackCanvas calls this to insert multiple effects from the drag_pluginservers
// into pluginset_highlighted.
// TrackCanvas calls this to insert multiple effects from the drag_pluginservers
// into pluginset_highlighted.
- void insert_effects_canvas(double start,
- double length);
+ void insert_effects_canvas(double start, double length);
// CWindow calls this to insert multiple effects from
// the drag_pluginservers array.
// CWindow calls this to insert multiple effects from
// the drag_pluginservers array.
@@
-381,33
+381,27
@@
public:
// other tracks
void insert_effect(char *title,
SharedLocation *shared_location,
// other tracks
void insert_effect(char *title,
SharedLocation *shared_location,
- int data_type,
- int plugin_type,
- int single_standalone);
+ int data_type, int plugin_type, int single_standalone);
// This is called multiple times by the above functions.
// It can't sync parameters.
void insert_effect(char *title,
SharedLocation *shared_location,
// This is called multiple times by the above functions.
// It can't sync parameters.
void insert_effect(char *title,
SharedLocation *shared_location,
- Track *track,
- PluginSet *plugin_set,
- double start,
- double length,
- int plugin_type);
+ Track *track, PluginSet *plugin_set,
+ double start, double length, int plugin_type);
void match_output_size(Track *track);
void match_output_size(Track *track);
+ void delete_edit(Edit *edit, const char *msg, int collapse=0);
+ void delete_edits(ArrayList<Edit*> *edits, const char *msg, int collapse=0);
+ void delete_edits(int collapse=0);
+ void cut_selected_edits(int collapse, int packed);
// Move edit to new position
// Move edit to new position
- void move_edits(ArrayList<Edit*> *edits,
- Track *track,
- double position,
- int behaviour); // behaviour: 0 - old style (cut and insert elswhere), 1- new style - (clear and overwrite elsewere)
+ void move_edits(ArrayList<Edit*> *edits, Track *track, double position,
+// 0 - old style (cut and insert elswhere), 1- new style - (clear and overwrite elsewere)
+ int behaviour);
// Move effect to position
// Move effect to position
- void move_effect(Plugin *plugin,
- Track *track,
- int64_t position);
- void move_effect(Plugin *plugin,
- PluginSet *plugin_set,
- int64_t position);
+ void move_effect(Plugin *plugin, Track *track, int64_t position);
+ void move_effect(Plugin *plugin, PluginSet *plugin_set, int64_t position);
void move_plugins_up(PluginSet *plugin_set);
void move_plugins_down(PluginSet *plugin_set);
void move_track_down(Track *track);
void move_plugins_up(PluginSet *plugin_set);
void move_plugins_down(PluginSet *plugin_set);
void move_track_down(Track *track);
@@
-419,11
+413,13
@@
public:
void delete_folder(char *folder);
// For clipboard commands
void paste();
void delete_folder(char *folder);
// For clipboard commands
void paste();
+ void paste(double start, Track *first_track, int clear_selection, int overwrite);
// For splice and overwrite
void overwrite(EDL *source, int all);
void splice(EDL *source, int all);
int paste(double start, double end, FileXML *file,
// For splice and overwrite
void overwrite(EDL *source, int all);
void splice(EDL *source, int all);
int paste(double start, double end, FileXML *file,
- int edit_labels, int edit_plugins, int edit_autos);
+ int edit_labels, int edit_plugins, int edit_autos,
+ Track *first_track, int overwrite);
int paste_output(int64_t startproject, int64_t endproject,
int64_t startsource_sample, int64_t endsource_sample,
int64_t startsource_frame, int64_t endsource_frame,
int paste_output(int64_t startproject, int64_t endproject,
int64_t startsource_sample, int64_t endsource_sample,
int64_t startsource_frame, int64_t endsource_frame,