Revert to using XLockDisplay/XUnlockDisplay

[xinema.git] / source / xineengine.h

diff --git a/source/xineengine.h b/source/xineengine.h
index eb26406379350a575f552430f23a345ab68fe7dc..50b0927659089d0c417c480daf5316066e9dfca4 100644 (file)
--- a/source/xineengine.h
+++ b/source/xineengine.h
@@ -4,7 +4,6 @@
 #include <pthread.h>
 #include <sigc++/trackable.h>
 #include <xine.h>
-#include <msp/core/mutex.h>
 #include <msp/graphics/window.h>
 
 class XineStream;
@@ -13,9 +12,6 @@ class XineEngine: public sigc::trackable
 {
 private:
        Msp::Graphics::Window &window;
-       Msp::Mutex *display_mutex;
-       pthread_t locked_thread;
-       unsigned lock_count;
        xine_t *engine;
        xine_audio_port_t *audio_driver;
        x11_visual_t visual;
@@ -24,7 +20,7 @@ private:
        std::list<XineStream *> streams;
 
 public:
-       XineEngine(Msp::Graphics::Window &, Msp::Mutex * = 0);
+       XineEngine(Msp::Graphics::Window &);
        ~XineEngine();
 
        xine_t *get_engine() { return engine; }
@@ -41,8 +37,6 @@ private:
 
        static void dest_size_cb(void *, int, int, double, int *, int *, double *);
        static void frame_output_cb(void *, int, int, double, int *, int *, int *, int *, double *, int *, int *);
-       static void lock_cb(void *);
-       static void unlock_cb(void *);
 };
 
 #endif