X-Git-Url: http://git.tdb.fi/?p=xinema.git;a=blobdiff_plain;f=source%2Fxinema.cpp;h=499154387e67eef838531e017ca944afe03007ea;hp=bc70c4154c04bec4aa63f49bd3cfe6855a73cd1e;hb=4761421;hpb=2c4dde7be7cc32b027812204b152c9f514d2e6aa

diff --git a/source/xinema.cpp b/source/xinema.cpp
index bc70c41..4991543 100644
--- a/source/xinema.cpp
+++ b/source/xinema.cpp
@@ -19,7 +19,9 @@ Xinema::Xinema(int, char **):
 	window(display, 1920, 1080),
 	network(*this),
 	engine(0),
-	stream(0)
+	stream(0),
+	logo_mode(false),
+	pending_logo(false)
 {
 	window.signal_close.connect(sigc::bind(sigc::mem_fun(this, &Xinema::exit), 0));
 }
@@ -30,7 +32,7 @@ int Xinema::main()
 	display.tick();
 
 	engine = new XineEngine(window);
-	play_file(FS::get_sys_data_dir()/"xinema.png");
+	show_logo();
 
 	Application::main();
 
@@ -43,22 +45,35 @@ int Xinema::main()
 
 void Xinema::tick()
 {
-	bool new_stream = false;
-
+	string mrl;
+	bool logo;
 	{
 		MutexLock lock(command_mutex);
-		if(!pending_mrl.empty())
-		{
-			delete stream;
-			stream = new XineStream(*engine, pending_mrl);
-			stream->play();
-			pending_mrl.clear();
-			new_stream = true;
-		}
+		mrl = pending_mrl;
+		logo = pending_logo;
+		pending_mrl.clear();
+		pending_logo = false;
 	}
 
-	if(new_stream)
-		signal_stream_created.emit(*stream);
+	if(!mrl.empty())
+	{
+		bool had_stream = stream;
+
+		delete stream;
+		stream = 0;
+
+		if(had_stream && !logo_mode)
+			signal_stream_destroyed.emit();
+
+		logo_mode = logo;
+		stream = new XineStream(*engine, mrl);
+		if(!logo_mode)
+			stream->signal_finished.connect(sigc::mem_fun(this, &Xinema::show_logo));
+		stream->play();
+
+		if(!logo_mode)
+			signal_stream_created.emit(*stream);
+	}
 
 	XLockDisplay(display.get_private().display);
 	display.tick();
@@ -73,4 +88,12 @@ void Xinema::play_file(const FS::Path &fn)
 {
 	MutexLock lock(command_mutex);
 	pending_mrl = "file://"+fn.str();
+	pending_logo = false;
+}
+
+void Xinema::show_logo()
+{
+	MutexLock lock(command_mutex);
+	pending_mrl = "file://"+(FS::get_sys_data_dir()/"xinema.png").str();
+	pending_logo = true;
 }