projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
folder icon move segv, resources drag scroll bug, memory leaks, global msgqual, po...
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
proxy.C
diff --git
a/cinelerra-5.1/cinelerra/proxy.C
b/cinelerra-5.1/cinelerra/proxy.C
index ddc4d1c9d6fa678a0664525b8c9e57a91713b41e..7f729f37ebe561305178998382a48ddac87a5f92 100644
(file)
--- a/
cinelerra-5.1/cinelerra/proxy.C
+++ b/
cinelerra-5.1/cinelerra/proxy.C
@@
-51,10
+51,15
@@
#define MAX_SCALE 16
ProxyMenuItem::ProxyMenuItem(MWindow *mwindow)
#define MAX_SCALE 16
ProxyMenuItem::ProxyMenuItem(MWindow *mwindow)
- : BC_MenuItem(_("Proxy settings..."), _("Alt-
P"), 'p
')
+ : BC_MenuItem(_("Proxy settings..."), _("Alt-
r"), 'r
')
{
this->mwindow = mwindow;
set_alt();
{
this->mwindow = mwindow;
set_alt();
+ dialog = 0;
+}
+ProxyMenuItem::~ProxyMenuItem()
+{
+ delete dialog;
}
void ProxyMenuItem::create_objects()
}
void ProxyMenuItem::create_objects()
@@
-338,6
+343,7
@@
Asset *ProxyRender::add_original(Indexable *idxbl, int new_scale)
proxy = new Asset(new_path);
// new compression parameters
proxy->copy_format(format_asset, 0);
proxy = new Asset(new_path);
// new compression parameters
proxy->copy_format(format_asset, 0);
+ proxy->awindow_folder = AW_PROXY_FOLDER;
proxy->audio_data = 0;
proxy->video_data = 1;
proxy->layers = 1;
proxy->audio_data = 0;
proxy->video_data = 1;
proxy->layers = 1;
@@
-351,9
+357,7
@@
Asset *ProxyRender::add_original(Indexable *idxbl, int new_scale)
proxy->video_length = idxbl->get_video_frames();
edl_assets->append(proxy);
}
proxy->video_length = idxbl->get_video_frames();
edl_assets->append(proxy);
}
- else {
- proxy->add_user();
- }
+ proxy->add_user();
orig_proxies.append(proxy);
idxbl->add_user();
orig_idxbls.append(idxbl);
orig_proxies.append(proxy);
idxbl->add_user();
orig_idxbls.append(idxbl);
@@
-675,7
+679,8
@@
void ProxyClient::process_package(LoadPackage *ptr)
Asset *proxy = package->proxy_asset;
//printf("%s %s\n", orig->path, proxy->path);
VRender *vrender = 0;
Asset *proxy = package->proxy_asset;
//printf("%s %s\n", orig->path, proxy->path);
VRender *vrender = 0;
- int processors = 1, result = 0;
+ int jobs = proxy_render->needed_proxies.size();
+ int processors = preferences->project_smp / jobs + 1, result = 0;
if( orig->is_asset ) {
src_file = new File;
if( orig->is_asset ) {
src_file = new File;