X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fcinelerra%2Fmwindow.C;h=e6a40ee551bb01059bb985e9a99f17c2b43f71f7;hb=47f71d004db08fb289428240fb87ce97c64382d2;hp=10eb2dfb5fc5234706fd600006aa0906231dc79c;hpb=3bf30d220f7855b995b887dc10812ae3780e6805;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C
index 10eb2dfb..e6a40ee5 100644
--- a/cinelerra-5.1/cinelerra/mwindow.C
+++ b/cinelerra-5.1/cinelerra/mwindow.C
@@ -1291,7 +1291,7 @@ void MWindow::handle_mixers(EDL *edl, int command, int wait_tracking,
 				track->record = track->play = 0;
 		}
 		zwindow->change_source(mixer_edl);
-		zwindow->handle_mixer(command, wait_tracking,
+		zwindow->handle_mixer(command, 0,
 				use_inout, toggle_audio, loop_play, speed);
 	}
 	zwindows_lock->unlock();
@@ -1589,10 +1589,15 @@ void MWindow::init_exportedl()
 void MWindow::init_shuttle()
 {
 #ifdef HAVE_SHUTTLE
-	const char *dev_name = Shuttle::probe();
-	if( dev_name ) {
+	int ret = Shuttle::probe();
+	if( ret >= 0 ) {
 		shuttle = new Shuttle(this);
-		shuttle->start(dev_name);
+		if( shuttle->read_config_file() > 0 ) {
+			printf("shuttle: bad config file\n");
+			delete shuttle;  shuttle = 0;
+			return;
+		}
+		shuttle->start(ret);
 	}
 #endif
 }
@@ -3079,12 +3084,11 @@ void MWindow::sync_parameters(int change_type)
 		else {
 // Stop and restart
 			int command = cwindow->playback_engine->command->command;
-			cwindow->playback_engine->transport_stop();
 // Waiting for tracking to finish would make the restart position more
 // accurate but it can't lock the window to stop tracking for some reason.
 // Not waiting for tracking gives a faster response but restart position is
 // only as accurate as the last tracking update.
-			cwindow->playback_engine->interrupt_playback(0);
+			cwindow->playback_engine->transport_stop(0);
 			cwindow->playback_engine->next_command->realtime = 1;
 			cwindow->playback_engine->transport_command(command, change_type, edl, 0);
 		}