projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sams icons, bsd fixups, lv2 deps
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
mwindow.h
diff --git
a/cinelerra-5.1/cinelerra/mwindow.h
b/cinelerra-5.1/cinelerra/mwindow.h
index 0dfd24cef96bb3c466d1d6147a3ebe9dd3344d2d..66f8f39373898056052f1b8e40e21d475240e7ce 100644
(file)
--- a/
cinelerra-5.1/cinelerra/mwindow.h
+++ b/
cinelerra-5.1/cinelerra/mwindow.h
@@
-484,7
+484,8
@@
public:
int toggle_label(int is_mwindow);
void undo_entry(BC_WindowBase *calling_window_gui);
void redo_entry(BC_WindowBase *calling_window_gui);
int toggle_label(int is_mwindow);
void undo_entry(BC_WindowBase *calling_window_gui);
void redo_entry(BC_WindowBase *calling_window_gui);
-
+ void save_undo_data();
+ void load_undo_data();
int cut_automation();
int copy_automation();
int cut_automation();
int copy_automation();
@@
-556,6
+557,8
@@
public:
static Commercials *commercials;
int commercial_active;
int has_commercials();
static Commercials *commercials;
int commercial_active;
int has_commercials();
+// copy of edl created in speed_before, used in speed_after to normalize_speed
+ EDL *speed_edl;
// Menu items
ArrayList<ColormodelItem*> colormodels;
// Menu items
ArrayList<ColormodelItem*> colormodels;
@@
-630,10
+633,8
@@
public:
Mutex *keyframe_gui_lock;
// Lock during creation and destruction of brender so playback doesn't use it.
Mutex *brender_lock;
Mutex *keyframe_gui_lock;
// Lock during creation and destruction of brender so playback doesn't use it.
Mutex *brender_lock;
-
// Initialize shared memory
// Initialize shared memory
- void init_shm();
-
+ void init_shm(const char *pfn, int64_t min);
// Initialize channel DB's for playback
void init_channeldb();
void init_render();
// Initialize channel DB's for playback
void init_channeldb();
void init_render();
@@
-654,6
+655,7
@@
public:
void commit_commercial();
void undo_commercial();
void cut_commercials();
void commit_commercial();
void undo_commercial();
void cut_commercials();
+ void update_gui(int changed_edl);
int paste_subtitle_text(char *text, double start, double end);
void init_error();
int paste_subtitle_text(char *text, double start, double end);
void init_error();
@@
-684,7
+686,10
@@
public:
static void init_ffmpeg_index(MWindow *mwindow, Preferences *preferences, FILE *fp);
static int load_plugin_index(MWindow *mwindow, const char *index_path,
const char *plugin_dir);
static void init_ffmpeg_index(MWindow *mwindow, Preferences *preferences, FILE *fp);
static int load_plugin_index(MWindow *mwindow, const char *index_path,
const char *plugin_dir);
- static PluginServer* new_ffmpeg_server(MWindow *mwindow, const char *name);
+ static PluginServer *new_ffmpeg_server(MWindow *mwindow, const char *name);
+ static int init_lv2_index(MWindow *mwindow, Preferences *preferences, FILE *fp);
+ static PluginServer *new_lv2_server(MWindow *mwindow, const char *name);
+
void init_preferences();
void init_signals();
void init_theme();
void init_preferences();
void init_signals();
void init_theme();
@@
-701,6
+706,9
@@
public:
void init_commercials();
static void add_plugins(ArrayList<PluginServer*> &plugins);
static void delete_plugins();
void init_commercials();
static void add_plugins(ArrayList<PluginServer*> &plugins);
static void delete_plugins();
+ void speed_before();
+ int speed_after(int done);
+ int normalize_speed(EDL *old_edl, EDL *new_edl);
//
void clean_indexes();
// TimeBomb timebomb;
//
void clean_indexes();
// TimeBomb timebomb;