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
/
edl.C
diff --git
a/cinelerra-5.1/cinelerra/edl.C
b/cinelerra-5.1/cinelerra/edl.C
index d3f19b2353652f04390b1fcbc6be766afb550f0e..cfed55d6c59adb89c24bd61b008d256ca660b003 100644
(file)
--- a/
cinelerra-5.1/cinelerra/edl.C
+++ b/
cinelerra-5.1/cinelerra/edl.C
@@
-1494,16
+1494,15
@@
void EDL::rescale_proxy(int orig_scale, int new_scale)
}
}
}
}
-void EDL::set_proxy(int
use_scaler, int new_scale, int auto_scale, int beep
,
+void EDL::set_proxy(int
new_scale, int use_scaler
,
ArrayList<Indexable*> *orig_assets, ArrayList<Indexable*> *proxy_assets)
{
ArrayList<Indexable*> *orig_assets, ArrayList<Indexable*> *proxy_assets)
{
- int orig_use_scaler = session->proxy_use_scaler;
int orig_scale = session->proxy_scale;
int orig_scale = session->proxy_scale;
+ int orig_use_scaler = session->proxy_use_scaler;
+
// rescale to full size asset in read_frame
// rescale to full size asset in read_frame
- session->proxy_use_scaler = use_scaler;
session->proxy_scale = new_scale;
session->proxy_scale = new_scale;
- session->proxy_auto_scale = auto_scale;
- session->proxy_beep = beep;
+ session->proxy_use_scaler = use_scaler;
if( use_scaler ) {
for( int i=0; i<proxy_assets->size(); ++i ) {
if( use_scaler ) {
for( int i=0; i<proxy_assets->size(); ++i ) {