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
/
proxy.h
diff --git
a/cinelerra-5.1/cinelerra/proxy.h
b/cinelerra-5.1/cinelerra/proxy.h
index b11212546b930fd9b8f8448388d9631c8b4cd852..c98f2e04a5cea9168e947c39a2c4815919c4c3e5 100644
(file)
--- a/
cinelerra-5.1/cinelerra/proxy.h
+++ b/
cinelerra-5.1/cinelerra/proxy.h
@@
-99,7
+99,6
@@
public:
void handle_close_event(int result);
void from_proxy();
void handle_close_event(int result);
void from_proxy();
- int to_proxy();
// calculate possible sizes based on the original size
void calculate_sizes();
void scale_to_text(char *string, int scale);
// calculate possible sizes based on the original size
void calculate_sizes();
void scale_to_text(char *string, int scale);
@@
-108,7
+107,6
@@
public:
ProxyWindow *gui;
Asset *asset;
ProxyRender *proxy_render;
ProxyWindow *gui;
Asset *asset;
ProxyRender *proxy_render;
- ProxyBeep *proxy_beep;
int new_scale;
int orig_scale;
int new_scale;
int orig_scale;
@@
-198,6
+196,7
@@
public:
ProxyDialog *dialog;
FormatTools *format_tools;
BC_Title *new_dimensions;
ProxyDialog *dialog;
FormatTools *format_tools;
BC_Title *new_dimensions;
+ BC_Title *active_scale;
ProxyMenu *scale_factor;
ProxyUseScaler *use_scaler;
ProxyAutoScale *auto_scale;
ProxyMenu *scale_factor;
ProxyUseScaler *use_scaler;
ProxyAutoScale *auto_scale;