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

diff --git a/source/xinema.cpp b/source/xinema.cpp
index fc042e1..4991543 100644
--- a/source/xinema.cpp
+++ b/source/xinema.cpp
@@ -1,4 +1,6 @@
 #include <sigc++/bind.h>
+#include <msp/fs/dir.h>
+#include <msp/graphics/display_private.h>
 #include <msp/time/utils.h>
 #include "xineengine.h"
 #include "xinema.h"
@@ -7,11 +9,19 @@
 using namespace std;
 using namespace Msp;
 
+Xinema::EarlyInit::EarlyInit()
+{
+	XInitThreads();
+}
+
+
 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));
 }
@@ -21,7 +31,8 @@ int Xinema::main()
 	window.show();
 	display.tick();
 
-	engine = new XineEngine(window, &display_mutex);
+	engine = new XineEngine(window);
+	show_logo();
 
 	Application::main();
 
@@ -34,24 +45,41 @@ int Xinema::main()
 
 void Xinema::tick()
 {
+	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();
-		}
+		mrl = pending_mrl;
+		logo = pending_logo;
+		pending_mrl.clear();
+		pending_logo = false;
 	}
 
+	if(!mrl.empty())
 	{
-		MutexLock lock(display_mutex);
-		display.tick();
+		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);
 	}
 
-	if(stream)
-		stream->tick();
+	XLockDisplay(display.get_private().display);
+	display.tick();
+	XUnlockDisplay(display.get_private().display);
+
+	engine->tick();
 
 	Time::sleep(10*Time::msec);
 }
@@ -60,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;
 }