projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mixer/clips plg/edt/lbl follow edits for overwrite, olaf de.po update, zoom_auto...
[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 24d757902c67307322892b7cced2e7be68aefc21..66b43626f63c52f9e0fb56720a89aaa7eb5a73ad 100644
(file)
--- a/
cinelerra-5.1/cinelerra/mwindow.h
+++ b/
cinelerra-5.1/cinelerra/mwindow.h
@@
-39,6
+39,7
@@
#include "channel.inc"
#include "channeldb.inc"
#include "commercials.inc"
#include "channel.inc"
#include "channeldb.inc"
#include "commercials.inc"
+#include "convert.inc"
#include "cwindow.inc"
#include "bchash.inc"
#include "devicedvbinput.inc"
#include "cwindow.inc"
#include "bchash.inc"
#include "devicedvbinput.inc"
@@
-71,6
+72,7
@@
#include "playback3d.inc"
#include "playbackengine.inc"
#include "plugin.inc"
#include "playback3d.inc"
#include "playbackengine.inc"
#include "plugin.inc"
+#include "pluginclient.inc"
#include "pluginfclient.inc"
#include "pluginserver.inc"
#include "pluginset.inc"
#include "pluginfclient.inc"
#include "pluginserver.inc"
#include "pluginset.inc"
@@
-88,7
+90,6
@@
#include "thread.h"
#include "threadloader.inc"
#include "timebar.inc"
#include "thread.h"
#include "threadloader.inc"
#include "timebar.inc"
-#include "timebomb.h"
#include "tipwindow.inc"
#include "track.inc"
#include "tracking.inc"
#include "tipwindow.inc"
#include "track.inc"
#include "tracking.inc"
@@
-181,6
+182,7
@@
public:
int overwrite);
// Reset everything for a load
void update_project(int load_mode);
int overwrite);
// Reset everything for a load
void update_project(int load_mode);
+ void update_preferences(Preferences *prefs);
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();
@@
-231,7
+233,6
@@
public:
// Not wanted for loading backups.
int update_filename = 1);
// Not wanted for loading backups.
int update_filename = 1);
-
// Print out plugins which are referenced in the EDL but not loaded.
void test_plugins(EDL *new_edl, char *path);
// Print out plugins which are referenced in the EDL but not loaded.
void test_plugins(EDL *new_edl, char *path);
@@
-286,7
+287,7
@@
public:
int zoom_in_t();
void split_x();
void split_y();
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();
void update_plugins();
// Call after every edit operation
void save_backup();
@@
-304,11
+305,16
@@
public:
// Searches for matching plugin and renders data in it.
void render_plugin_gui(void *data, Plugin *plugin);
void render_plugin_gui(void *data, int size, Plugin *plugin);
// Searches for matching plugin and renders data in it.
void render_plugin_gui(void *data, Plugin *plugin);
void render_plugin_gui(void *data, int size, Plugin *plugin);
+ void reset_plugin_gui_frames(Plugin *plugin);
+ void render_plugin_gui_frames(PluginClientFrames *frames, Plugin *plugin);
+ double get_tracking_position();
+ int get_tracking_direction();
// Called from PluginVClient::process_buffer
// Returns 1 if a GUI for the plugin is open so OpenGL routines can determine if
// they can run.
int plugin_gui_open(Plugin *plugin);
// Called from PluginVClient::process_buffer
// Returns 1 if a GUI for the plugin is open so OpenGL routines can determine if
// they can run.
int plugin_gui_open(Plugin *plugin);
+ void stop_plugin_guis();
void show_keyframe_gui(Plugin *plugin);
void hide_keyframe_guis();
void show_keyframe_gui(Plugin *plugin);
void hide_keyframe_guis();
@@
-466,8
+472,7
@@
public:
// Asset removal from caches
void reset_caches();
void remove_asset_from_caches(Asset *asset);
// Asset removal from caches
void reset_caches();
void remove_asset_from_caches(Asset *asset);
- void remove_assets_from_project(int push_undo /* = 0 */,
- int redraw /* 1 */,
+ void remove_assets_from_project(int push_undo, int redraw, int delete_indexes,
ArrayList<Indexable*> *drag_assets /* mwindow->session->drag_assets */,
ArrayList<EDL*> *drag_clips /* mwindow->session->drag_clips */);
void remove_assets_from_disk();
ArrayList<Indexable*> *drag_assets /* mwindow->session->drag_assets */,
ArrayList<EDL*> *drag_clips /* mwindow->session->drag_clips */);
void remove_assets_from_disk();
@@
-523,9
+528,8
@@
public:
int modify_pluginhandles();
void finish_modify_handles();
void rescale_proxy(EDL *clip, int orig_scale, int new_scale);
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<Indexable*> *orig_assets,
- ArrayList<Indexable*> *proxy_assets);
+ void add_proxy(ArrayList<Indexable*> *orig_assets,
+ ArrayList<Indexable*> *proxy_assets);
int render_proxy(ArrayList<Indexable *> &new_idxbls);
void beep(double freq, double secs, double gain);
int enable_proxy();
int render_proxy(ArrayList<Indexable *> &new_idxbls);
void beep(double freq, double secs, double gain);
int enable_proxy();
@@
-544,6
+548,11
@@
public:
// Send new EDL to caches
void age_caches();
int optimize_assets(); // delete unused assets from the cache and assets
// Send new EDL to caches
void age_caches();
int optimize_assets(); // delete unused assets from the cache and assets
+// render edl assets to specified format, then replace in edl
+ void start_convert(Asset *format_asset, const char *suffix,
+ float beep, int remove_originals);
+ void finish_convert(int remove_originals);
+ ConvertRender *convert_render;
void select_point(double position);
int set_loop_boundaries(); // toggle loop playback and set boundaries for loop playback
void select_point(double position);
int set_loop_boundaries(); // toggle loop playback and set boundaries for loop playback
@@
-601,7
+610,7
@@
public:
static ArrayList<PluginServer*> *plugindb;
// Currently visible plugins
int64_t plugin_visibility;
static ArrayList<PluginServer*> *plugindb;
// Currently visible plugins
int64_t plugin_visibility;
-
ArrayList<PluginServer*>
*plugin_guis;
+
PluginGUIs
*plugin_guis;
// GUI Plugins to delete
ArrayList<PluginServer*> *dead_plugins;
// Keyframe editors
// GUI Plugins to delete
ArrayList<PluginServer*> *dead_plugins;
// Keyframe editors