X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fproxy.C;h=5432f478546fb1927cd64e7c20667e843545bb06;hb=f3ab8166b4ee39bd518e7ddce28648f74e072673;hp=ddc4d1c9d6fa678a0664525b8c9e57a91713b41e;hpb=3c357d8bcdb855ea71487d2b2b6e518bf8a493f6;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/proxy.C b/cinelerra-5.1/cinelerra/proxy.C
index ddc4d1c9..5432f478 100644
--- a/cinelerra-5.1/cinelerra/proxy.C
+++ b/cinelerra-5.1/cinelerra/proxy.C
@@ -33,6 +33,7 @@
 #include "formattools.h"
 #include "language.h"
 #include "mainerror.h"
+#include "mainindexes.h"
 #include "mainprogress.h"
 #include "mainundo.h"
 #include "mutex.h"
@@ -51,10 +52,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()
@@ -78,7 +84,9 @@ ProxyDialog::ProxyDialog(MWindow *mwindow)
 	asset = new Asset;
 	bzero(size_text, sizeof(char*) * MAX_SIZES);
 	bzero(size_factors, sizeof(int) * MAX_SIZES);
-	total_sizes = 0;
+	size_text[0] = cstrdup(_("Original size"));
+	size_factors[0] = 1;
+	total_sizes = 1;
 }
 
 ProxyDialog::~ProxyDialog()
@@ -94,7 +102,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();
@@ -202,6 +210,8 @@ void ProxyDialog::to_proxy()
 			proxy->width = proxy->actual_width;
 			proxy->height = proxy->actual_height;
 			proxy->remove_user();
+			mwindow->edl->assets->remove_pointer(proxy);
+			proxy->remove_user();
 		}
 		proxy_assets.remove_all();
 		for( int i = 0; i < orig_idxbls.size(); i++ )
@@ -249,7 +259,7 @@ void ProxyDialog::to_proxy()
 	mwindow->restart_brender();
 
 	mwindow->gui->lock_window("ProxyDialog::to_proxy");
-	mwindow->update_project(LOAD_ALL);
+	mwindow->update_project(LOADMODE_REPLACE);
 	mwindow->gui->unlock_window();
 }
 
@@ -286,7 +296,7 @@ void ProxyRender::from_proxy_path(char *new_path, Asset *asset, int scale)
 	char prxy[BCTEXTLEN];
 	int n = sprintf(prxy, ".proxy%d", scale);
 	strcpy(new_path, asset->path);
-	char *ptr = strstr(asset->path, prxy);
+	char *ptr = strstr(new_path, prxy);
 	if( !ptr || (ptr[n] != '-' && ptr[n] != '.') ) return;
 // remove proxy, path.proxy#-sfx.ext => path.sfx
 	char *ext = strrchr(ptr, '.');
@@ -338,6 +348,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;
@@ -351,9 +362,7 @@ Asset *ProxyRender::add_original(Indexable *idxbl, int new_scale)
 		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);
@@ -450,9 +459,6 @@ void ProxyWindow::create_objects()
 	add_subwindow(text = new BC_Title(x, y, _("Scale factor:")));
 	x += text->get_w() + margin;
 
-	dialog->size_text[0] = cstrdup(_("Original size"));
-	dialog->size_factors[0] = 1;
-	dialog->total_sizes = 1;
 	int popupmenu_w = BC_PopupMenu::calculate_w(get_text_width(MEDIUMFONT, dialog->size_text[0]));
 	add_subwindow(scale_factor = new ProxyMenu(mwindow, this, x, y, popupmenu_w, ""));
 	scale_factor->update_sizes();
@@ -675,7 +681,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;
@@ -753,6 +760,11 @@ void ProxyClient::process_package(LoadPackage *ptr)
 		}
 		proxy_render->update_progress();
 	}
+	if( !proxy_render->failed && !proxy_render->is_canceled() ) {
+		Asset *asset = mwindow->edl->assets->update(proxy);
+		mwindow->mainindexes->add_next_asset(0, asset);
+		mwindow->mainindexes->start_build();
+	}
 }