projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
p/s proxy icon, rework window locks, segv in close_mixers + exportedl, ffmpeg default...
[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 2ec3068359830bff038cce0efe932f07e647bc25..8053f0ee61a1573dc6731dbdcc4c3c47b8bfa7d1 100644
(file)
--- a/
cinelerra-5.1/cinelerra/mwindow.h
+++ b/
cinelerra-5.1/cinelerra/mwindow.h
@@
-516,7
+516,7
@@
public:
void beep(double freq, double secs, double gain);
int enable_proxy();
int disable_proxy();
void beep(double freq, double secs, double gain);
int enable_proxy();
int disable_proxy();
- int to_proxy(Asset *asset, int new_scale);
+ int to_proxy(Asset *asset, int new_scale
, int new_use_scaler
);
ProxyBeep *proxy_beep;
void dump_plugins(FILE *fp=stdout);
ProxyBeep *proxy_beep;
void dump_plugins(FILE *fp=stdout);