X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Frender.C;h=34b5c7dc51eaf42ca45fab9051ad8d219345f68f;hb=b78e8ac7987fbf35a4ba60534c4a3d2b290562b9;hp=d6db3811469629a999d44d1889e91b66d1475673;hpb=27d1d08d9125dc46f252073aaf1fead7518ee4c8;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/render.C b/cinelerra-5.1/cinelerra/render.C
index d6db3811..34b5c7dc 100644
--- a/cinelerra-5.1/cinelerra/render.C
+++ b/cinelerra-5.1/cinelerra/render.C
@@ -409,19 +409,11 @@ int Render::check_asset(EDL *edl, Asset &asset)
 		asset.width = edl->session->output_w;
 		asset.height = edl->session->output_h;
 		asset.interlace_mode = edl->session->interlace_mode;
-		asset.tcstart = (int64_t) (edl->session->get_frame_offset() +
-			edl->local_session->get_selectionstart() *
-				edl->session->frame_rate);
-		asset.tcend = (int64_t) (edl->session->get_frame_offset() +
-			edl->local_session->get_selectionend() *
-				edl->session->frame_rate);
 	}
 	else
 	{
 		asset.video_data = 0;
 		asset.layers = 0;
-		asset.tcstart = 0;
-		asset.tcend = 0;
 	}
 
 	if(asset.audio_data &&
@@ -430,19 +422,11 @@ int Render::check_asset(EDL *edl, Asset &asset)
 	{
 		asset.audio_data = 1;
 		asset.channels = edl->session->audio_channels;
-		asset.tcstart = (int64_t) (edl->session->get_frame_offset() +
-			edl->local_session->get_selectionstart() *
-				edl->session->sample_rate);
-		asset.tcend = (int64_t) (edl->session->get_frame_offset() +
-			edl->local_session->get_selectionend() *
-				edl->session->sample_rate);
 	}
 	else
 	{
 		asset.audio_data = 0;
 		asset.channels = 0;
-		asset.tcstart = 0;
-		asset.tcend = 0;
 	}
 
 	if(!asset.audio_data &&
@@ -512,6 +496,7 @@ void Render::stop_progress()
 		sprintf(string2, _("Rendering took %s"), string);
 		mwindow->gui->lock_window("");
 		mwindow->gui->show_message(string2);
+		mwindow->gui->update_default_message();
 		mwindow->gui->stop_hourglass();
 		mwindow->gui->unlock_window();
 	}
@@ -945,11 +930,7 @@ if(debug) printf("Render::render %d\n", __LINE__);
 		if(render->load_mode == LOADMODE_PASTE)
 			mwindow->clear(0);
 if(debug) printf("Render::render %d\n", __LINE__);
-		mwindow->load_assets(assets,
-			-1,
-			render->load_mode,
-			0,
-			0,
+		mwindow->load_assets(assets, -1, render->load_mode, 0, 0,
 			mwindow->edl->session->labels_follow_edits,
 			mwindow->edl->session->plugins_follow_edits,
 			mwindow->edl->session->autos_follow_edits,