Revert to using XLockDisplay/XUnlockDisplay

[xinema.git] / source / xinema.h

diff --git a/source/xinema.h b/source/xinema.h
index 3c3f75a0eb610746433343778157b39998686bcc..e82f26faaa48a038e4d670e4f17f37f7454fa60e 100644 (file)
--- a/source/xinema.h
+++ b/source/xinema.h
@@ -2,9 +2,10 @@
 #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>
+#include "networkinterface.h"
 
 class XineEngine;
 class XineStream;
@@ -12,20 +13,35 @@ class XineStream;
 class Xinema: public Msp::RegisteredApplication<Xinema>
 {
 private:
-       std::string filename;
+       struct EarlyInit
+       {
+               EarlyInit();
+       };
+
+public:
+       sigc::signal<void, XineStream &> signal_stream_created;
+
+private:
+       EarlyInit early_init;
        Msp::Graphics::Display display;
-       Msp::Mutex display_mutex;
        Msp::Graphics::Window window;
+       NetworkInterface network;
        XineEngine *engine;
        XineStream *stream;
 
+       Msp::Mutex command_mutex;
+       std::string pending_mrl;
+
 public:
        Xinema(int, char **);
 
        virtual int main();
-
 private:
        virtual void tick();
+
+public:
+       void play_file(const Msp::FS::Path &);
+       XineStream *get_stream() const { return stream; }
 };
 
 #endif