X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fproxy.C;h=23f6e7b7fbfbd212ee3c28723f1d8f3d3fc2b605;hb=83c58d6d78f6bf0d1d1fd4cfba8654906fe6ec29;hp=fd1ba562cb725aaebee1b41fce341f0710483d87;hpb=c905fabd0678fcc8ab9e32e4443ad8709adafefd;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/proxy.C b/cinelerra-5.1/cinelerra/proxy.C
index fd1ba562..23f6e7b7 100644
--- a/cinelerra-5.1/cinelerra/proxy.C
+++ b/cinelerra-5.1/cinelerra/proxy.C
@@ -47,8 +47,8 @@
 #include "transportque.h"
 #include "vrender.h"
 
-#define WIDTH 400
-#define HEIGHT 330
+#define WIDTH xS(400)
+#define HEIGHT yS(330)
 #define MAX_SCALE 16
 
 ProxyMenuItem::ProxyMenuItem(MWindow *mwindow)
@@ -88,6 +88,7 @@ ProxyDialog::ProxyDialog(MWindow *mwindow)
 	strcpy(asset->fformat, "mpeg");
 	strcpy(asset->vcodec, "mpeg.mpeg");
 	asset->ff_video_bitrate = 2000000;
+	asset->video_data = 1;
 
 	bzero(size_text, sizeof(char*) * MAX_SIZES);
 	bzero(size_factors, sizeof(int) * MAX_SIZES);
@@ -166,7 +167,7 @@ void ProxyDialog::handle_close_event(int result)
 {
 	if( result ) return;
 	if( !File::renders_video(asset) ) {
-		eprintf("Specified format does not render video");
+		eprintf(_("Specified format does not render video"));
 		return;
 	}
 	mwindow->edl->session->proxy_auto_scale = auto_scale;
@@ -177,11 +178,16 @@ void ProxyDialog::handle_close_event(int result)
 	mwindow->gui->unlock_window();
 	asset->save_defaults(mwindow->defaults, "PROXY_", 1, 1, 0, 0, 0); 
 	result = mwindow->to_proxy(asset, new_scale, use_scaler);
-	if( result >= 0 && beep && new_scale != 1 ) {
-		static struct { double freq, secs, gain; }
-		    tone[2] = { { 2000., 1.5, 0.5 }, { 4000., 0.25, 0.5 } };
-		int i = result > 0 ? 0 : 1;
-		mwindow->beep(tone[i].freq, tone[i].secs, tone[i].gain);
+	if( result >= 0 && beep > 0 && new_scale != 1 ) {
+		if( !result ) {
+			mwindow->beep(4000., 0.5, beep);
+			usleep(250000);
+			mwindow->beep(1000., 0.5, beep);
+			usleep(250000);
+			mwindow->beep(4000., 0.5, beep);
+		}
+		else
+			mwindow->beep(2000., 2.0, beep);
 	}
 }
 
@@ -230,10 +236,11 @@ int ProxyRender::from_proxy_path(char *new_path, Indexable *indexable, int scale
 	return 0;
 }
 
-ProxyRender::ProxyRender(MWindow *mwindow, Asset *format_asset)
+ProxyRender::ProxyRender(MWindow *mwindow, Asset *format_asset, int asset_scale)
 {
 	this->mwindow = mwindow;
 	this->format_asset = format_asset;
+	this->asset_scale = asset_scale;
 	progress = 0;
 	counter_lock = new Mutex("ProxyDialog::counter_lock");
 	total_rendered = 0;
@@ -345,7 +352,7 @@ printf("proxy: failed=%d canceled=%d\n", failed, progress->is_cancelled());
 	delete progress;  progress = 0;
 
 	if( failed && !canceled ) {
-		eprintf("Error making proxy.");
+		eprintf(_("Error making proxy."));
 	}
 	return !failed && !canceled ? 0 : 1;
 }
@@ -372,6 +379,7 @@ void ProxyWindow::create_objects()
 {
 	lock_window("ProxyWindow::create_objects");
 	int margin = mwindow->theme->widget_border;
+	int lmargin = margin + xS(10);
 
 	dialog->use_scaler = mwindow->edl->session->proxy_use_scaler;
 	dialog->orig_scale = mwindow->edl->session->proxy_scale;
@@ -385,8 +393,8 @@ void ProxyWindow::create_objects()
 		dialog->orig_h *= dialog->orig_scale;
 	}
 
-	int x = margin;
-	int y = margin+10;
+	int x = lmargin;
+	int y = margin+yS(10);
 	add_subwindow(use_scaler = new ProxyUseScaler(this, x, y));
 	y += use_scaler->get_h() + margin;
 
@@ -394,7 +402,7 @@ void ProxyWindow::create_objects()
 	add_subwindow(text = new BC_Title(x, y, _("Scale factor:")));
 	x += text->get_w() + margin;
 
-	int popupmenu_w = BC_PopupMenu::calculate_w(get_text_width(MEDIUMFONT, dialog->size_text[0])+15);
+	int popupmenu_w = BC_PopupMenu::calculate_w(get_text_width(MEDIUMFONT, dialog->size_text[0])+xS(15));
 	add_subwindow(scale_factor = new ProxyMenu(mwindow, this, x, y, popupmenu_w, ""));
 	scale_factor->update_sizes();
 	x += scale_factor->get_w() + margin;
@@ -403,28 +411,30 @@ void ProxyWindow::create_objects()
 	add_subwindow(tumbler = new ProxyTumbler(mwindow, this, x, y));
 	y += tumbler->get_h() + margin;
 
-	x = margin;
+	x = lmargin;
 	add_subwindow(text = new BC_Title(x, y, _("New media dimensions: ")));
 	x += text->get_w() + margin;
 	add_subwindow(new_dimensions = new BC_Title(x, y, ""));
 	y += new_dimensions->get_h() + margin;
 
-	x = margin;
+	x = lmargin;
 	add_subwindow(text = new BC_Title(x, y, _("Active Scale: ")));
 	x += text->get_w() + margin;
 	add_subwindow(active_scale = new BC_Title(x, y, ""));
 	y += active_scale->get_h() + margin;
 
-	x = margin;  y += 25;
+	x = lmargin;  y += yS(25);
 	format_tools = new ProxyFormatTools(mwindow, this, dialog->asset);
 	format_tools->create_objects(x, y, 0, 1, 0, 0, 0, 1, 0, 1, // skip the path
 		0, 0);
 
-	x = margin;
+	x = lmargin;
 	add_subwindow(auto_scale = new ProxyAutoScale(this, x, y));
 	y += auto_scale->get_h() + margin;
 	add_subwindow(beep_on_done = new ProxyBeepOnDone(this, x, y));
-	y += beep_on_done->get_h() + margin;
+	x += beep_on_done->get_w() + margin + xS(10);
+	add_subwindow(new BC_Title(x, y+yS(10), _("Beep on done volume")));
+//	y += beep_on_done->get_h() + margin;
 
 	update();
 
@@ -442,6 +452,7 @@ ProxyFormatTools::ProxyFormatTools(MWindow *mwindow, ProxyWindow *pwindow, Asset
 
 void ProxyFormatTools::update_format()
 {
+	asset->save_defaults(mwindow->defaults, "PROXY_", 1, 1, 0, 0, 0);
         FormatTools::update_format();
 	pwindow->use_scaler->update();
 }
@@ -515,14 +526,14 @@ int ProxyAutoScale::handle_event()
 }
 
 ProxyBeepOnDone::ProxyBeepOnDone(ProxyWindow *pwindow, int x, int y)
- : BC_CheckBox(x, y, pwindow->dialog->beep, _("Beep on done"))
+ : BC_FPot(x, y, pwindow->dialog->beep*100.f, 0.f, 100.f)
 {
 	this->pwindow = pwindow;
 }
 
 int ProxyBeepOnDone::handle_event()
 {
-	pwindow->dialog->beep = get_value();
+	pwindow->dialog->beep = get_value()/100.f;
 	pwindow->update();
 	return 1;
 }
@@ -722,7 +733,12 @@ 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);
+		Asset *asset = edl->assets->update(proxy);
+		asset->proxy_scale = proxy_render->asset_scale;
+		int scale = asset->proxy_scale;
+		if( !scale ) scale = 1;
+		asset->width = asset->actual_width * scale;
+		asset->height = asset->actual_height * scale;
 		mwindow->mainindexes->add_next_asset(0, asset);
 		mwindow->mainindexes->start_build();
 	}