X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindow.C;h=6d4c8fb81ff7a68d81b25f6462c980de6c6d07a2;hb=2cda7606e91cc23cf68a7f6376af2e8b9520b273;hp=f62df89b82f2ea99718954b03de6636e5413b97f;hpb=0c7b0aebb5e9f85f4eb7abb69b800d8d37b30b0f;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C
index f62df89b..6d4c8fb8 100644
--- a/cinelerra-5.1/cinelerra/mwindow.C
+++ b/cinelerra-5.1/cinelerra/mwindow.C
@@ -249,6 +249,10 @@ MWindow::~MWindow()
 	run_lock->lock("MWindow::~MWindow");
 	in_destructor = 1;
 //printf("MWindow::~MWindow %d\n", __LINE__);
+	if( wwindow && wwindow->is_running() )
+		wwindow->close_window();
+	if( twindow && twindow->is_running() )
+		twindow->close_window();
 	gui->remote_control->deactivate();
 	gui->record->stop();
 #ifdef HAVE_DVB
@@ -286,16 +290,12 @@ MWindow::~MWindow()
 	if( cwindow && cwindow->gui ) cwindow->gui->close(0);
 	if( lwindow && lwindow->gui ) lwindow->gui->close(0);
 	if( gwindow && gwindow->gui ) gwindow->gui->close(0);
-	if( twindow && twindow->is_running() ) twindow->close_window();
-	if( wwindow && wwindow->is_running() ) wwindow->close_window();
 	vwindows.remove_all_objects();
 	zwindows.remove_all_objects();
 	gui->close(0);
 	if( awindow ) awindow->join();
 	if( cwindow ) cwindow->join();
 	if( lwindow ) lwindow->join();
-	if( twindow ) twindow->join();
-	if( wwindow ) wwindow->join();
 	if( gwindow ) gwindow->join();
 	join();
 #else
@@ -307,8 +307,6 @@ MWindow::~MWindow()
 	close_gui(cwindow);
 	close_gui(lwindow);
 	close_gui(gwindow);
-	close_gui(twindow);
-	close_gui(wwindow);
 	vwindows.remove_all_objects();
 	zwindows.remove_all_objects();
 	gui->close(0);
@@ -1259,10 +1257,10 @@ void MWindow::update_mixer_tracks()
 	zwindows_lock->unlock();
 }
 
-void MWindow::queue_mixers(EDL *edl, int command, int wait_tracking,
-		int use_inout, int update_refresh, int toggle_audio, int loop_play)
+void MWindow::handle_mixers(EDL *edl, int command, int wait_tracking,
+		int use_inout, int toggle_audio, int loop_play, float speed)
 {
-	zwindows_lock->lock("MWindow::queue_mixers");
+	zwindows_lock->lock("MWindow::handle_mixers");
 	for( int vidx=0; vidx<zwindows.size(); ++vidx ) {
 		ZWindow *zwindow = zwindows[vidx];
 		if( zwindow->idx < 0 ) continue;
@@ -1291,8 +1289,8 @@ void MWindow::queue_mixers(EDL *edl, int command, int wait_tracking,
 				track->record = track->play = 0;
 		}
 		zwindow->change_source(mixer_edl);
-		zwindow->issue_command(command,
-			wait_tracking, use_inout, update_refresh, toggle_audio, loop_play);
+		zwindow->handle_mixer(command, 0,
+				use_inout, toggle_audio, loop_play, speed);
 	}
 	zwindows_lock->unlock();
 }
@@ -1300,7 +1298,7 @@ void MWindow::queue_mixers(EDL *edl, int command, int wait_tracking,
 void MWindow::refresh_mixers(int dir)
 {
 	int command = dir >= 0 ? CURRENT_FRAME : LAST_FRAME;
-	queue_mixers(edl,command,0,0,1,0,0);
+	handle_mixers(edl, command, 0, 0, 0, 0, 0);
 }
 
 void MWindow::stop_mixers()
@@ -1308,7 +1306,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, 0);
+		zwindow->handle_mixer(STOP, 0, 0, 0, 0, 0);
 	}
 }
 
@@ -1589,10 +1587,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
 }
@@ -1817,23 +1820,11 @@ void MWindow::stop_transport()
 
 void MWindow::undo_before(const char *description, void *creator)
 {
-	if( cwindow->playback_engine->is_playing_back ) {
-		undo_command = cwindow->playback_engine->command->command;
-		cwindow->playback_engine->que->send_command(STOP, CHANGE_NONE, 0, 0);
-		gui->unlock_window();
-		cwindow->playback_engine->interrupt_playback(1);
-		gui->lock_window(description);
-	}
 	undo->update_undo_before(description, creator);
 }
 
 void MWindow::undo_after(const char *description, uint32_t load_flags, int changes_made)
 {
-	if( undo_command != COMMAND_NONE ) {
-		cwindow->playback_engine->que->send_command(undo_command, CHANGE_NONE, edl, 1, 0);
-		undo_command = COMMAND_NONE;
-	}
-
 	undo->update_undo_after(description, load_flags, changes_made);
 }
 
@@ -3083,35 +3074,24 @@ void MWindow::sync_parameters(int change_type)
 	if( in_destructor ) return;
 
 // Sync engines which are playing back
-	if(cwindow->playback_engine->is_playing_back)
-	{
-		if(change_type == CHANGE_PARAMS)
-		{
+	if( cwindow->playback_engine->is_playing_back ) {
+		if( change_type == CHANGE_PARAMS ) {
 // TODO: block keyframes until synchronization is done
 			cwindow->playback_engine->sync_parameters(edl);
 		}
-		else
+		else {
 // Stop and restart
-		{
 			int command = cwindow->playback_engine->command->command;
-			cwindow->playback_engine->que->send_command(STOP,
-				CHANGE_NONE,
-				0,
-				0);
 // 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->que->send_command(command,
-					change_type,
-					edl,
-					1,
-					0);
+			cwindow->playback_engine->transport_stop(0);
+			cwindow->playback_engine->next_command->realtime = 1;
+			cwindow->playback_engine->transport_command(command, change_type, edl, 0);
 		}
 	}
-	else
-	{
+	else {
 		cwindow->refresh_frame(change_type);
 	}
 }