projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
proxy images, add beep on proxy auto_load, fix unnest proxy bug, vwin in/out to_clip bug
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
mwindow.C
diff --git
a/cinelerra-5.1/cinelerra/mwindow.C
b/cinelerra-5.1/cinelerra/mwindow.C
index 565f33283a705a29902585f131badf72817a3f0a..2e590c668f376c244c2d46fd6af4f7693962888c 100644
(file)
--- a/
cinelerra-5.1/cinelerra/mwindow.C
+++ b/
cinelerra-5.1/cinelerra/mwindow.C
@@
-2256,6
+2256,7
@@
int MWindow::render_proxy(ArrayList<Indexable *> &new_idxbls)
int MWindow::enable_proxy()
{
int MWindow::enable_proxy()
{
+ int ret = 0;
if( edl->session->proxy_scale == 1 &&
edl->session->proxy_disabled_scale != 1 ) {
int new_scale = edl->session->proxy_disabled_scale;
if( edl->session->proxy_scale == 1 &&
edl->session->proxy_disabled_scale != 1 ) {
int new_scale = edl->session->proxy_disabled_scale;
@@
-2263,8
+2264,10
@@
int MWindow::enable_proxy()
Asset *asset = new Asset;
asset->format = FILE_FFMPEG;
asset->load_defaults(defaults, "PROXY_", 1, 1, 0, 0, 0);
Asset *asset = new Asset;
asset->format = FILE_FFMPEG;
asset->load_defaults(defaults, "PROXY_", 1, 1, 0, 0, 0);
- to_proxy(asset, new_scale);
+
ret =
to_proxy(asset, new_scale);
asset->remove_user();
asset->remove_user();
+ if( ret > 0 )
+ beep(2000., 1.5, 0.5);
}
return 1;
}
}
return 1;
}