projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add proxy quick switch, folder lock, shortcuts update, bsd GL tweak
[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 08c46c0f7f437e91e3b3277f357094d14d50bda0..b974486145b5667148ee6521b37f69c6e09f47cc 100644
(file)
--- a/
cinelerra-5.1/cinelerra/mwindow.h
+++ b/
cinelerra-5.1/cinelerra/mwindow.h
@@
-75,6
+75,7
@@
#include "pluginset.inc"
#include "preferences.inc"
#include "preferencesthread.inc"
#include "pluginset.inc"
#include "preferences.inc"
#include "preferencesthread.inc"
+#include "proxy.inc"
#include "record.inc"
#include "recordlabel.inc"
#include "render.inc"
#include "record.inc"
#include "recordlabel.inc"
#include "render.inc"
@@
-208,7
+209,7
@@
public:
void create_mixers();
void refresh_mixers(int dir=1);
void stop_mixers();
void create_mixers();
void refresh_mixers(int dir=1);
void stop_mixers();
- void close_mixers();
+ void close_mixers(
int destroy=1
);
void open_mixers();
ZWindow *get_mixer(Mixer *&mixer);
void del_mixer(ZWindow *zwindow);
void open_mixers();
ZWindow *get_mixer(Mixer *&mixer);
void del_mixer(ZWindow *zwindow);
@@
-508,13
+509,15
@@
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 set_proxy(int use_scaler, int new_scale, int auto_scale,
- ArrayList<Indexable*> *orig_assets,
- ArrayList<Indexable*> *proxy_assets);
void add_proxy(int use_scaler,
ArrayList<Indexable*> *orig_assets,
ArrayList<Indexable*> *proxy_assets);
void add_proxy(int use_scaler,
ArrayList<Indexable*> *orig_assets,
ArrayList<Indexable*> *proxy_assets);
- void render_proxy(ArrayList<Indexable *> &new_idxbls);
+ int render_proxy(ArrayList<Indexable *> &new_idxbls);
+ void beep(double freq, double secs, double gain);
+ int enable_proxy();
+ int disable_proxy();
+ int to_proxy(Asset *asset, int new_scale);
+ ProxyBeep *proxy_beep;
void dump_plugins(FILE *fp=stdout);
void dump_edl(FILE *fp=stdout);
void dump_plugins(FILE *fp=stdout);
void dump_edl(FILE *fp=stdout);