X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindow.h;h=564152125313c695853b5bbc1c066867e5674cf9;hp=e0f0d4f8c19eab038534474199c58c7490503e79;hb=076da20a596fe698e1152ce2f3f2d75d2daddec8;hpb=7fd85fb66168f6b518c5f2d73e04036e87faa0e1 diff --git a/cinelerra-5.1/cinelerra/mwindow.h b/cinelerra-5.1/cinelerra/mwindow.h index e0f0d4f8..56415212 100644 --- a/cinelerra-5.1/cinelerra/mwindow.h +++ b/cinelerra-5.1/cinelerra/mwindow.h @@ -62,6 +62,7 @@ #include "mainsession.inc" #include "mainundo.inc" #include "maxchannels.h" +#include "mixersalign.inc" #include "mutex.inc" #include "mwindow.inc" #include "mwindowgui.inc" @@ -82,11 +83,11 @@ #include "sharedlocation.inc" #include "sighandler.inc" #include "splashgui.inc" +#include "shuttle.inc" #include "theme.inc" #include "thread.h" #include "threadloader.inc" #include "timebar.inc" -#include "timebomb.h" #include "tipwindow.inc" #include "track.inc" #include "tracking.inc" @@ -102,8 +103,6 @@ #define FONT_SEARCHPATH "fonts" -// All entry points for commands except for window locking should be here. -// This allows scriptability. class MWindow : public Thread { @@ -115,6 +114,7 @@ public: void create_objects(int want_gui, int want_new, char *config_path); + int uses_opengl(); void show_splash(); void hide_splash(); void start(); @@ -140,6 +140,10 @@ public: void show_cwindow(); void show_gwindow(); void hide_gwindow(); + void restore_windows(); + void load_layout(const char *layout); + void save_layout(const char *layout); + void delete_layout(const char *layout); int tile_windows(int window_config); char *get_cwindow_display(); void set_screens(int value); @@ -180,7 +184,7 @@ public: // Fit selected time to horizontal display range void fit_selection(); // Fit selected autos to the vertical display range - void fit_autos(int doall); + void fit_autos(int all); void change_currentautorange(int autogrouptype, int increment, int changemax); void expand_autos(int changeall, int domin, int domax); void shrink_autos(int changeall, int domin, int domax); @@ -202,11 +206,13 @@ public: void dump_plugindb(FILE *fp); void stop_playback(int wait); void stop_transport(); + void undo_before(const char *description = "", void *creator = 0); + void undo_after(const char *description, uint32_t load_flags, int changes_made = 1); - void queue_mixers(EDL *edl, int command, int wait_tracking, - int use_inout, int update_refresh, int toggle_audio, int loop_play); - ZWindow *create_mixer(Indexable *indexable); - void create_mixers(); + void handle_mixers(EDL *edl, int command, int wait_tracking, + int use_inout, int toggle_audio, int loop_play, float speed); + ZWindow *create_mixer(Indexable *indexable, double position); + void create_mixers(double position = 0); void refresh_mixers(int dir=1); void stop_mixers(); void close_mixers(int destroy=1); @@ -218,7 +224,6 @@ public: void start_mixer(); int select_zwindow(ZWindow *zwindow); void tile_mixers(); - int load_filenames(ArrayList *filenames, int load_mode = LOADMODE_REPLACE, // Cause the project filename on the top of the window to be updated. @@ -253,6 +258,8 @@ public: int find_selection(double position, int scroll_display = 0); void toggle_camera_xyz(); void toggle_projector_xyz(); + double get_position(); + void set_position(double position); // seek to labels // shift_down must be passed by the caller because different windows call @@ -278,7 +285,7 @@ public: int zoom_in_t(); void split_x(); void split_y(); - void crop_video(); + void crop_video(int mode); void update_plugins(); // Call after every edit operation void save_backup(); @@ -306,7 +313,10 @@ public: void hide_keyframe_guis(); void hide_keyframe_gui(Plugin *plugin); void update_keyframe_guis(); - + int get_hash_color(Edit *edit); + int get_hash_color(int v); + int get_group_color(int v); + int get_title_color(Edit *edit); // ============================= editing commands ======================== @@ -337,7 +347,11 @@ public: void clear(int clear_handle); void clear_labels(); int clear_labels(double start, double end); + void clear_hard_edges(); + int clear_hard_edges(double start, double end); + void clear_select(); void concatenate_tracks(); + int copy_flags(int copy_flags=COPY_CLIPBOARD); void copy(); int copy(double start, double end); void cut(); @@ -354,23 +368,18 @@ public: // Calculate defaults path static void create_defaults_path(char *string, const char *config_file); - void delete_track(); void delete_track(Track *track); void delete_tracks(); 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. - 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. @@ -381,33 +390,30 @@ public: // 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, - 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 delete_edit(Edit *edit, const char *msg, int collapse=0); + void delete_edits(ArrayList *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 - void move_edits(ArrayList *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 *edits, Track *track, double position, + int mode); // mode: 0 - mute and overwrite, 1 - cut and paste + void selected_edits_to_clipboard(int packed); + void paste_clipboard(Track *first_track, double position, int overwrite, + int edit_edits, int edit_labels, int edit_autos, int edit_plugins); + void move_group(EDL *group, Track *first_track, double position, int overwrite); // 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); @@ -419,11 +425,13 @@ public: 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, - 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, @@ -466,16 +474,17 @@ public: void set_automation_mode(int mode); void set_keyframe_type(int mode); - void set_auto_keyframes(int value, int lock_mwindow, int lock_cwindow); + void set_auto_keyframes(int value); + void set_span_keyframes(int value); void set_auto_visibility(Autos *autos, int value); void set_labels_follow_edits(int value); // Update the editing mode - int set_editing_mode(int new_editing_mode, int lock_mwindow, int lock_cwindow); + int set_editing_mode(int new_editing_mode); void toggle_editing_mode(); - void set_inpoint(int is_mwindow); - void set_outpoint(int is_mwindow); - void unset_inoutpoint(int is_mwindow); + void set_inpoint(); + void set_outpoint(); + void unset_inoutpoint(); void toggle_loop_playback(); void trim_selection(); // Synchronize EDL settings with all playback engines depending on current @@ -483,7 +492,7 @@ public: void sync_parameters(int change_type = CHANGE_PARAMS); void save_clip(EDL *new_edl, const char *txt); void to_clip(EDL *edl, const char *txt, int all); - int toggle_label(int is_mwindow); + int toggle_label(); void undo_entry(BC_WindowBase *calling_window_gui); void redo_entry(BC_WindowBase *calling_window_gui); void save_undo_data(); @@ -513,9 +522,8 @@ public: int modify_pluginhandles(); void finish_modify_handles(); void rescale_proxy(EDL *clip, int orig_scale, int new_scale); - void add_proxy(int use_scaler, - ArrayList *orig_assets, - ArrayList *proxy_assets); + void add_proxy(ArrayList *orig_assets, + ArrayList *proxy_assets); int render_proxy(ArrayList &new_idxbls); void beep(double freq, double secs, double gain); int enable_proxy(); @@ -544,6 +552,8 @@ public: // Main undo stack MainUndo *undo; + int undo_command; + BC_Hash *defaults; Assets *assets; // CICaches for drawing timeline only @@ -572,7 +582,6 @@ public: ArrayList colormodels; ArrayList interlace_project_modes; ArrayList interlace_asset_modes; - ArrayList interlace_asset_fixmethods; int reset_meters(); void resync_guis(); @@ -590,7 +599,7 @@ public: static ArrayList *plugindb; // Currently visible plugins int64_t plugin_visibility; - ArrayList *plugin_guis; + PluginGUIs *plugin_guis; // GUI Plugins to delete ArrayList *dead_plugins; // Keyframe editors @@ -622,6 +631,8 @@ public: // Mixer Mutex *zwindows_lock; ArrayList zwindows; + MixersAlign *mixers_align; + // Asset manager AWindow *awindow; // Automation window @@ -700,6 +711,7 @@ public: void init_preferences(); void init_signals(); + void init_shuttle(); void init_theme(); void init_compositor(); void init_levelwindow(); @@ -724,6 +736,7 @@ public: int restart_status; int screens; int in_destructor; + Shuttle *shuttle; }; #endif