X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindow.C;h=53b5a1937b5bfca4ff1b8bc3b07264e509f26771;hp=1f69fd504e785390946c478552a394248a75945b;hb=60f8df69db9ddd8148bfc41a17bb0955b52a45e6;hpb=c2c09a4c97194b07dbd1eae82aa0226d9774f350

diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C
index 1f69fd50..53b5a193 100644
--- a/cinelerra-5.1/cinelerra/mwindow.C
+++ b/cinelerra-5.1/cinelerra/mwindow.C
@@ -1217,7 +1217,7 @@ void MWindow::update_mixer_tracks()
 }
 
 void MWindow::queue_mixers(EDL *edl, int command, int wait_tracking,
-		int use_inout, int update_refresh, int toggle_audio)
+		int use_inout, int update_refresh, int toggle_audio, int loop_play)
 {
 	zwindows_lock->lock("MWindow::queue_mixers");
 	for( int vidx=0; vidx<zwindows.size(); ++vidx ) {
@@ -1249,14 +1249,14 @@ void MWindow::queue_mixers(EDL *edl, int command, int wait_tracking,
 		}
 		zwindow->change_source(mixer_edl);
 		zwindow->issue_command(command,
-			wait_tracking, use_inout, update_refresh, toggle_audio);
+			wait_tracking, use_inout, update_refresh, toggle_audio, loop_play);
 	}
 	zwindows_lock->unlock();
 }
 
 void MWindow::refresh_mixers()
 {
-	queue_mixers(edl,CURRENT_FRAME,0,0,1,0);
+	queue_mixers(edl,CURRENT_FRAME,0,0,1,0,0);
 }
 
 void MWindow::stop_mixers()
@@ -1264,7 +1264,7 @@ void MWindow::stop_mixers()
 	for( int vidx=0; vidx<zwindows.size(); ++vidx ) {
 		ZWindow *zwindow = zwindows[vidx];
 		if( zwindow->idx < 0 ) continue;
-		zwindow->issue_command(STOP, 0, 0, 0, 0);
+		zwindow->issue_command(STOP, 0, 0, 0, 0, 0);
 	}
 }
 
@@ -1723,6 +1723,11 @@ void MWindow::stop_playback(int wait)
 	}
 }
 
+void MWindow::stop_transport()
+{
+	gui->stop_transport(gui->get_window_lock() ? "MWindow::stop_transport" : 0);
+}
+
 int MWindow::load_filenames(ArrayList<char*> *filenames,
 	int load_mode,
 	int update_filename)
@@ -3280,6 +3285,10 @@ void MWindow::update_project(int load_mode)
 			if( !vwindow->is_running() ) continue;
 			vwindow->close_window();
 		}
+		for( int i=0; i<edl->vwindow_edls.size(); ++i ) {
+			VWindow *vwindow = get_viewer(1, -1);
+			vwindow->change_source(i);
+		}
 		if(debug) PRINT_TRACE
 		select_zwindow(0);
 		close_mixers();