X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fproxy.C;h=4774ecde51fc69ec81f4f921bed64cf11e9c7ad4;hb=4a90ef3ae46465c0634f81916b79e279e4bd9961;hp=90c02a738b157298ed6f6b224e6ab49bd441502e;hpb=2f1bbd12877daf745e1d18b62b731f04cece827e;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/proxy.C b/cinelerra-5.1/cinelerra/proxy.C
index 90c02a73..4774ecde 100644
--- 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)
- : BC_MenuItem(_("Proxy settings..."),  _("Alt-P"), 'p')
+ : BC_MenuItem(_("Proxy settings..."),  _("Alt-r"), 'r')
 {
 	this->mwindow = mwindow;
 	set_alt();
+	dialog = 0;
+}
+ProxyMenuItem::~ProxyMenuItem()
+{
+	delete dialog;
 }
 
 void ProxyMenuItem::create_objects()
@@ -94,7 +99,7 @@ BC_Window* ProxyDialog::new_gui()
 	asset->load_defaults(mwindow->defaults, "PROXY_", 1, 1, 0, 0, 0);
 	mwindow->gui->lock_window("ProxyDialog::new_gui");
 	int cx, cy;
-	mwindow->gui->get_abs_cursor_xy(cx, cy);
+	mwindow->gui->get_abs_cursor(cx, cy);
 	gui = new ProxyWindow(mwindow, this, cx - WIDTH/2, cy - HEIGHT/2);
 	gui->create_objects();
 	mwindow->gui->unlock_window();
@@ -177,13 +182,13 @@ void ProxyDialog::to_proxy()
 		for( ; orig_asset; orig_asset=orig_asset->next ) {
 			char new_path[BCTEXTLEN];
 			proxy_render.to_proxy_path(new_path, orig_asset, proxy_scale);
-			Asset *proxy_asset = edl->assets->get_asset(new_path);
-			if( !proxy_asset ) continue;
 // test if proxy asset was already added to proxy_assets
 			int got_it = 0;
 			for( int i = 0; !got_it && i<proxy_assets.size(); ++i )
 				got_it = !strcmp(proxy_assets[i]->path, new_path);
 			if( got_it ) continue;
+			Asset *proxy_asset = edl->assets->get_asset(new_path);
+			if( !proxy_asset ) continue;
 // add pointer to existing EDL asset if it exists
 // EDL won't delete it unless it's the same pointer.
 			proxy_assets.append(proxy_asset);
@@ -197,8 +202,12 @@ void ProxyDialog::to_proxy()
 		mwindow->set_proxy(0, 1, proxy_auto_scale, &proxy_assets, &orig_idxbls);
 
 // remove the references
-		for( int i=0; i<proxy_assets.size(); ++i )
-			proxy_assets[i]->remove_user();
+		for( int i=0; i<proxy_assets.size(); ++i ) {
+			Asset *proxy = (Asset *) proxy_assets[i];
+			proxy->width = proxy->actual_width;
+			proxy->height = proxy->actual_height;
+			proxy->remove_user();
+		}
 		proxy_assets.remove_all();
 		for( int i = 0; i < orig_idxbls.size(); i++ )
 			orig_idxbls[i]->remove_user();
@@ -328,26 +337,30 @@ Asset *ProxyRender::add_original(Indexable *idxbl, int new_scale)
 	for( int i = 0; !got_it && i<orig_proxies.size(); ++i )
 		got_it = !strcmp(orig_proxies[i]->path, new_path);
 	if( got_it ) return 0;
-
-// new proxy asset
-	Asset *proxy = new Asset;
+	Assets *edl_assets = mwindow->edl->assets;
+	Asset *proxy = edl_assets->get_asset(new_path);
+	if( !proxy ) {
+		proxy = new Asset(new_path);
 // new compression parameters
-	proxy->copy_format(format_asset, 0);
-	proxy->update_path(new_path);
-	proxy->audio_data = 0;
-	proxy->video_data = 1;
-	proxy->layers = 1;
-	proxy->width = idxbl->get_w() / new_scale;
-	if( proxy->width & 1 ) ++proxy->width;
-	proxy->actual_width = proxy->width;
-	proxy->height = idxbl->get_h() / new_scale;
-	if( proxy->height & 1 ) ++proxy->height;
-	proxy->actual_height = proxy->height;
-	proxy->frame_rate = idxbl->get_frame_rate();
-	proxy->video_length = idxbl->get_video_frames();
+		proxy->copy_format(format_asset, 0);
+		proxy->awindow_folder = AW_PROXY_FOLDER;
+		proxy->audio_data = 0;
+		proxy->video_data = 1;
+		proxy->layers = 1;
+		proxy->width = idxbl->get_w() / new_scale;
+		if( proxy->width & 1 ) ++proxy->width;
+		proxy->actual_width = proxy->width;
+		proxy->height = idxbl->get_h() / new_scale;
+		if( proxy->height & 1 ) ++proxy->height;
+		proxy->actual_height = proxy->height;
+		proxy->frame_rate = idxbl->get_frame_rate();
+		proxy->video_length = idxbl->get_video_frames();
+		edl_assets->append(proxy);
+	}
+	proxy->add_user();
 	orig_proxies.append(proxy);
-	orig_idxbls.append(idxbl);
 	idxbl->add_user();
+	orig_idxbls.append(idxbl);
 	return proxy;
 }
 
@@ -666,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;
-	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;