X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Frender.C;h=746b41879f3fd25bdb4c92d63f897d6f031a1bc0;hb=f46839d462b640dd0542b2d87c7ab03e72a72613;hp=015bebd5fe1102f196a2b3975c2f738b79ba918e;hpb=0df48ad2d876409c5beeae2e21933a728ea76c33;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/render.C b/cinelerra-5.1/cinelerra/render.C
index 015bebd5..746b4187 100644
--- a/cinelerra-5.1/cinelerra/render.C
+++ b/cinelerra-5.1/cinelerra/render.C
@@ -222,6 +222,7 @@ Render::Render(MWindow *mwindow)
 
 Render::~Render()
 {
+	stop_operation();
 	close_window();
 	delete package_lock;
 	delete counter_lock;
@@ -337,7 +338,7 @@ void Render::handle_close_event(int result)
 	}
 	EDL *edl = mwindow->edl;
 	if( !result && use_labels && !edl->labels->first ) {
-		eprintf(_("render file per label and no labels\n"));
+		eprintf(_("Create new file at labels checked, but no labels\n"));
 		result = 1;
 	}
 	if( !result && asset->video_data ) {
@@ -732,8 +733,8 @@ void RenderThread::render_single(int test_overwrite, Asset *asset, EDL *edl,
 			render->result = 1;
 		}
 	}
-
-	render_frames = render->default_asset->frame_rate * total_length;
+// prevent single frame truncation to zero frames
+	render_frames = render->default_asset->frame_rate * total_length + 1e-4;
 
 // Generate packages
 	if( !render->result ) {
@@ -954,8 +955,9 @@ void RenderThread::run()
 			render_frames, render_time, render_rate);
 	}
 
-	if( render->mode == Render::INTERACTIVE && render->beep )
-		mwindow->beep(3000., 1.5, 0.5);
+	float gain = render->beep;
+	if( render->mode == Render::INTERACTIVE && gain > 0 )
+		mwindow->beep(3000., 1.5, gain);
 
 	if( script ) {
 		if( !render->result )
@@ -1056,6 +1058,8 @@ void RenderWindow::create_objects()
 	x1 = x2 + xs20;
 	render->beep = mwindow->edl->session->render_beep;
 	add_subwindow(beep_on_done = new RenderBeepOnDone(this, x1, y1));
+	y1 += beep_on_done->get_h();
+	add_subwindow(new BC_Title(x1, y1, _("Beep on done volume")));
 
 	renderprofile = new RenderProfile(mwindow, this, x, y, 1);
 	renderprofile->create_objects();
@@ -1211,14 +1215,14 @@ int RenderFormat::handle_event()
 }
 
 RenderBeepOnDone::RenderBeepOnDone(RenderWindow *rwindow, int x, int y)
- : BC_CheckBox(x, y, rwindow->render->beep, _("Beep on done"))
+ : BC_FPot(x, y, rwindow->render->beep*100.f, 0.f, 100.f)
 {
 	this->rwindow = rwindow;
 }
 
 int RenderBeepOnDone::handle_event()
 {
-	rwindow->render->beep = get_value();
+	rwindow->render->beep = get_value()/100.f;
 	return 1;
 }