X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fproxy.C;fp=cinelerra-5.1%2Fcinelerra%2Fproxy.C;h=d8ef2420ce41d8d160b5a4eeadb039528c90c2e9;hp=3378c6ed1e40e12861bfa7962aa7bcb7864b369c;hb=5c3e5d5e76c29b49708b4e42d194402150b508ab;hpb=9da9afce04d04dc94fa872536bd34051927b13c7 diff --git a/cinelerra-5.1/cinelerra/proxy.C b/cinelerra-5.1/cinelerra/proxy.C index 3378c6ed..d8ef2420 100644 --- a/cinelerra-5.1/cinelerra/proxy.C +++ b/cinelerra-5.1/cinelerra/proxy.C @@ -338,6 +338,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->awindow_folder = AW_PROXY_FOLDER; proxy->audio_data = 0; proxy->video_data = 1; proxy->layers = 1; @@ -673,7 +674,8 @@ void ProxyClient::process_package(LoadPackage *ptr) 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;