X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fcinelerra%2Fmwindow.C;h=577f229ef5f1216236cda2bcb40e6c79e95f685f;hb=d0f9735ae263eebd484a22d1e49bd3e1cd16cf70;hp=27aa6dfa121b3b9297108cd7a29b4a4fa4394712;hpb=5d04838af782e02954b28e9573a1f80769919441;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C
index 27aa6dfa..577f229e 100644
--- a/cinelerra-5.1/cinelerra/mwindow.C
+++ b/cinelerra-5.1/cinelerra/mwindow.C
@@ -200,6 +200,7 @@ MWindow::MWindow()
 	mainindexes = 0;
 	mainprogress = 0;
 	brender = 0;
+	brender_active = 0;
 	channeldb_buz =  new ChannelDB;
 	channeldb_v4l2jpeg =  new ChannelDB;
 	//file_server = 0;
@@ -1163,12 +1164,14 @@ void MWindow::init_brender()
 		session->brender_end = 0;
 		brender_lock->unlock();
 	}
-	if(brender) brender->restart(edl);
+	brender_active = 0;
+	stop_brender();
 }
 
 void MWindow::restart_brender()
 {
 //printf("MWindow::restart_brender 1\n");
+	if(!brender_active || !preferences->use_brender) return;
 	if(brender) brender->restart(edl);
 }
 
@@ -1200,21 +1203,28 @@ int MWindow::brender_available(int position)
 	return result;
 }
 
-void MWindow::set_brender_range()
+void MWindow::set_brender_active(int v, int update)
 {
-	edl->session->brender_start = edl->local_session->get_selectionstart(1);
-	edl->session->brender_end = edl->local_session->get_selectionend(1);
+	if( !preferences->use_brender ) v = 0;
+	brender_active = v;
+	gui->mainmenu->brender_active->set_checked(v);
+	if( v != 0 ) {
+		edl->session->brender_start = edl->local_session->get_selectionstart(1);
+		edl->session->brender_end = edl->local_session->get_selectionend(1);
 
-	if(EQUIV(edl->session->brender_end, edl->session->brender_start))
-	{
-		edl->session->brender_end = edl->tracks->total_video_length();
+		if(EQUIV(edl->session->brender_end, edl->session->brender_start)) {
+			edl->session->brender_end = edl->tracks->total_video_length();
+		}
+		restart_brender();
+	}
+	else
+		stop_brender();
+	if( update ) {
+		gui->update_timebar(0);
+		gui->draw_overlays(1);
 	}
-
-	restart_brender();
-	gui->draw_overlays(1);
 }
 
-
 int MWindow::has_commercials()
 {
 	return theme->use_commercials;
@@ -1742,6 +1752,7 @@ if(debug) printf("MWindow::load_filenames %d\n", __LINE__);
 		edl->local_session->loop_playback = 0;
 		edl->local_session->set_selectionstart(0);
 		edl->local_session->set_selectionend(0);
+		set_brender_active(0, 0);
 		fit_selection();
 		goto_start();
 	}