X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fxinema.h;h=cdb1db8e0c3c52079869e2c537d29f556f010b0a;hb=4761421e3fb681e9924cef5e72e5b2928051f2e2;hp=ce0345dfeb43850bac27721e75f45e4152f7cff2;hpb=0ebb4044ca544358d6d944a89fd9f6e806528be4;p=xinema.git

diff --git a/source/xinema.h b/source/xinema.h
index ce0345d..cdb1db8 100644
--- a/source/xinema.h
+++ b/source/xinema.h
@@ -2,7 +2,6 @@
 #define XINEMA_H_
 
 #include <msp/core/application.h>
-#include <msp/core/mutex.h>
 #include <msp/fs/path.h>
 #include <msp/graphics/display.h>
 #include <msp/graphics/window.h>
@@ -13,19 +12,28 @@ class XineStream;
 
 class Xinema: public Msp::RegisteredApplication<Xinema>
 {
+private:
+	struct EarlyInit
+	{
+		EarlyInit();
+	};
+
 public:
 	sigc::signal<void, XineStream &> signal_stream_created;
+	sigc::signal<void> signal_stream_destroyed;
 
 private:
+	EarlyInit early_init;
 	Msp::Graphics::Display display;
-	Msp::Mutex display_mutex;
 	Msp::Graphics::Window window;
 	NetworkInterface network;
 	XineEngine *engine;
 	XineStream *stream;
+	bool logo_mode;
 
 	Msp::Mutex command_mutex;
 	std::string pending_mrl;
+	bool pending_logo;
 
 public:
 	Xinema(int, char **);
@@ -36,7 +44,10 @@ private:
 
 public:
 	void play_file(const Msp::FS::Path &);
-	XineStream *get_stream() const { return stream; }
+	XineStream *get_stream() const { return logo_mode ? 0 : stream; }
+
+private:
+	void show_logo();
 };
 
 #endif