projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rework tip-of-the-day, fix mjpeg segv, update ffmpeg/plugin.opts
[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 7628632ea92e409c6661bddf037a8bd3b386ecb2..041953cd724ab27eb198fa7062986bcb4514b6d0 100644
(file)
--- a/
cinelerra-5.1/cinelerra/mwindow.h
+++ b/
cinelerra-5.1/cinelerra/mwindow.h
@@
-24,6
+24,7
@@
#include <stdio.h>
#include <stdint.h>
#include <stdio.h>
#include <stdint.h>
+#include "apatchgui.h"
#include "arraylist.h"
#include "asset.inc"
#include "assets.inc"
#include "arraylist.h"
#include "asset.inc"
#include "assets.inc"
@@
-92,6
+93,7
@@
#include "transition.inc"
#include "transportque.inc"
#include "videowindow.inc"
#include "transition.inc"
#include "transportque.inc"
#include "videowindow.inc"
+#include "vpatchgui.h"
#include "vwindow.inc"
#include "wwindow.inc"
#include "wavecache.inc"
#include "vwindow.inc"
#include "wwindow.inc"
#include "wavecache.inc"
@@
-119,7
+121,7
@@
public:
int run_script(FileXML *script);
int new_project();
int delete_project(int flash = 1);
int run_script(FileXML *script);
int new_project();
int delete_project(int flash = 1);
- void quit(
int unlock
);
+ void quit();
int restart() { return restart_status; }
int load_defaults();
int restart() { return restart_status; }
int load_defaults();
@@
-135,6
+137,7
@@
public:
void show_lwindow();
void show_cwindow();
void show_gwindow();
void show_lwindow();
void show_cwindow();
void show_gwindow();
+ void hide_gwindow();
int tile_windows(int window_config);
char *get_cwindow_display();
// void set_titles(int value);
int tile_windows(int window_config);
char *get_cwindow_display();
// void set_titles(int value);
@@
-481,6
+484,10
@@
public:
int paste_default_keyframe();
int clear_default_keyframe();
int paste_default_keyframe();
int clear_default_keyframe();
+ FloatAuto* get_float_auto(PatchGUI *patch,int idx);
+ IntAuto* get_int_auto(PatchGUI *patch,int idx);
+ PanAuto* get_pan_auto(PatchGUI *patch);
+
int modify_edithandles();
int modify_pluginhandles();
void finish_modify_handles();
int modify_edithandles();
int modify_pluginhandles();
void finish_modify_handles();
@@
-521,6
+528,8
@@
public:
MainIndexes *mainindexes;
MainProgress *mainprogress;
BRender *brender;
MainIndexes *mainindexes;
MainProgress *mainprogress;
BRender *brender;
+ char cin_lang[4];
+ int brender_active;
const char *default_standard;
static Commercials *commercials;
int commercial_active;
const char *default_standard;
static Commercials *commercials;
int commercial_active;
@@
-589,6
+598,7
@@
public:
int wait_warning();
// Levels
LevelWindow *lwindow;
int wait_warning();
// Levels
LevelWindow *lwindow;
+ Mutex *run_lock;
// Lock during creation and destruction of GUI
Mutex *plugin_gui_lock;
Mutex *dead_plugin_lock;
// Lock during creation and destruction of GUI
Mutex *plugin_gui_lock;
Mutex *dead_plugin_lock;
@@
-613,7
+623,7
@@
public:
// This one happens asynchronously of the others. Used by playback to
// see what frame is background rendered.
int brender_available(int position);
// This one happens asynchronously of the others. Used by playback to
// see what frame is background rendered.
int brender_available(int position);
- void set_brender_
start(
);
+ void set_brender_
active(int v, int update=1
);
int put_commercial();
void activate_commercial() { commercial_active = 1; }
void commit_commercial();
int put_commercial();
void activate_commercial() { commercial_active = 1; }
void commit_commercial();
@@
-624,6
+634,7
@@
public:
void init_error();
void finit_error();
static void init_defaults(BC_Hash* &defaults, char *config_path);
void init_error();
void finit_error();
static void init_defaults(BC_Hash* &defaults, char *config_path);
+ void check_language();
const char *default_std();
void fill_preset_defaults(const char *preset, EDLSession *session);
const char *get_preset_name(int index);
const char *default_std();
void fill_preset_defaults(const char *preset, EDLSession *session);
const char *get_preset_name(int index);
@@
-664,7
+675,7
@@
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 clean_indexes();
// TimeBomb timebomb;
SigHandler *sighandler;
void clean_indexes();
// TimeBomb timebomb;
SigHandler *sighandler;