X-Git-Url: https://cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindow.C;h=af743cc730bf2192fddaa853db6803a052d5ca13;hb=2a56d102d9db53017b306f2a61a2382f29a75783;hp=6e8547d6359f231493c37e64b74b162d6396179a;hpb=e23393f4ff9f772ac8f47926cf490dc87a630ed4;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C
index 6e8547d6..af743cc7 100644
--- a/cinelerra-5.1/cinelerra/mwindow.C
+++ b/cinelerra-5.1/cinelerra/mwindow.C
@@ -102,6 +102,7 @@
 #include "savefile.inc"
 #include "samplescroll.h"
 #include "sha1.h"
+#include "shuttle.h"
 #include "sighandler.h"
 #include "splashgui.h"
 #include "statusbar.h"
@@ -237,6 +238,7 @@ MWindow::MWindow()
 	in_destructor = 0;
 	speed_edl = 0;
 	proxy_beep = 0;
+	shuttle = 0;
 }
 
 
@@ -254,6 +256,7 @@ MWindow::~MWindow()
 	delete proxy_beep;
 	delete create_bd;       create_bd = 0;
 	delete create_dvd;      create_dvd = 0;
+	delete shuttle;         shuttle = 0;
 	delete batch_render;    batch_render = 0;
 	delete render;          render = 0;
 	commit_commercial();
@@ -1582,6 +1585,17 @@ void MWindow::init_exportedl()
 	exportedl = new ExportEDL(this);
 }
 
+void MWindow::init_shuttle()
+{
+#ifdef HAVE_SHUTTLE
+	const char *dev_name = Shuttle::probe();
+	if( dev_name ) {
+		shuttle = new Shuttle(this);
+		shuttle->start(dev_name);
+	}
+#endif
+}
+
 void MWindow::init_brender()
 {
 	if(preferences->use_brender && !brender)
@@ -2620,6 +2634,7 @@ void MWindow::create_objects(int want_gui,
 	init_render();
 	if(debug) printf("MWindow::create_objects %d total_time=%d\n", __LINE__, (int)timer.get_difference());
 
+	init_shuttle();
 	init_brender();
 	init_exportedl();
 	init_commercials();
@@ -3354,7 +3369,7 @@ int MWindow::get_title_color(Edit *edit)
 		else
 			return 0;
 	}
-	if( !alpha )
+	if( alpha == 0xff )
 		alpha = session->title_bar_alpha*255;
 	return color | (~alpha<<24);
 }