projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
proxy/mixer fixes, add proxy beep, igor ru xlat
[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 ccc5a1b9999e6ff90692a3847bd897a7c4cf8b18..d3f19b2353652f04390b1fcbc6be766afb550f0e 100644
(file)
--- a/
cinelerra-5.1/cinelerra/edl.C
+++ b/
cinelerra-5.1/cinelerra/edl.C
@@
-1494,7
+1494,7
@@
void EDL::rescale_proxy(int orig_scale, int new_scale)
}
}
}
}
-void EDL::set_proxy(int use_scaler, int new_scale, int auto_scale,
+void EDL::set_proxy(int use_scaler, int new_scale, int auto_scale,
int beep,
ArrayList<Indexable*> *orig_assets, ArrayList<Indexable*> *proxy_assets)
{
int orig_use_scaler = session->proxy_use_scaler;
ArrayList<Indexable*> *orig_assets, ArrayList<Indexable*> *proxy_assets)
{
int orig_use_scaler = session->proxy_use_scaler;
@@
-1503,6
+1503,7
@@
void EDL::set_proxy(int use_scaler, int new_scale, int auto_scale,
session->proxy_use_scaler = use_scaler;
session->proxy_scale = new_scale;
session->proxy_auto_scale = auto_scale;
session->proxy_use_scaler = use_scaler;
session->proxy_scale = new_scale;
session->proxy_auto_scale = auto_scale;
+ session->proxy_beep = beep;
if( use_scaler ) {
for( int i=0; i<proxy_assets->size(); ++i ) {
if( use_scaler ) {
for( int i=0; i<proxy_assets->size(); ++i ) {