Refactor the libxine interface into classes

[xinema.git] / source / xinema.h

diff --git a/source/xinema.h b/source/xinema.h
index ce9e92af666ab7f71c7c42e9f8e85fcfef5102b1..3c3f75a0eb610746433343778157b39998686bcc 100644 (file)
--- a/source/xinema.h
+++ b/source/xinema.h
@@ -2,28 +2,22 @@
 #define XINEMA_H_
 
 #include <msp/core/application.h>
+#include <msp/core/mutex.h>
 #include <msp/graphics/display.h>
 #include <msp/graphics/window.h>
-#include <xine.h>
+
+class XineEngine;
+class XineStream;
 
 class Xinema: public Msp::RegisteredApplication<Xinema>
 {
 private:
-       struct EarlyInit
-       {
-               EarlyInit();
-       };
-
-       EarlyInit early_init;
        std::string filename;
        Msp::Graphics::Display display;
+       Msp::Mutex display_mutex;
        Msp::Graphics::Window window;
-       xine_t *xine;
-       xine_audio_port_t *xine_audio;
-       x11_visual_t xine_visual;
-       xine_video_port_t *xine_video;
-       xine_stream_t *xine_stream;
-       xine_event_queue_t *xine_queue;
+       XineEngine *engine;
+       XineStream *stream;
 
 public:
        Xinema(int, char **);
@@ -32,9 +26,6 @@ public:
 
 private:
        virtual void tick();
-
-       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 *);
 };
 
 #endif