clean up build

[enigma2.git] / lib / python / Plugins / Extensions / DVDPlayer / src / servicedvd.h

diff --git a/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.h b/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.h
index bc92b37ed5dc3eca12ef3e79a3bb3a9fa8eaf508..c751a39413bdee367c299b4e7c6ba174d66b6f92 100644 (file)
--- a/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.h
+++ b/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.h
@@ -12,7 +12,7 @@ class eStaticServiceDVDInfo;
 
 class eServiceFactoryDVD: public iServiceHandler
 {
-DECLARE_REF(eServiceFactoryDVD);
+       DECLARE_REF(eServiceFactoryDVD);
 public:
        eServiceFactoryDVD();
        virtual ~eServiceFactoryDVD();
@@ -30,7 +30,7 @@ class eServiceDVD: public iPlayableService, public iPauseableService, public iSe
        public iServiceInformation, public iSubtitleOutput, public iServiceKeys, public iCueSheet, public eThread, public Object
 {
        friend class eServiceFactoryDVD;
-DECLARE_REF(eServiceDVD);
+       DECLARE_REF(eServiceDVD);
 public:
        virtual ~eServiceDVD();
                // not implemented (yet)
@@ -42,6 +42,7 @@ public:
        RESULT audioDelay(ePtr<iAudioDelay> &ptr) { ptr = 0; return -1; }
        RESULT rdsDecoder(ePtr<iRdsDecoder> &ptr) { ptr = 0; return -1; }
        RESULT stream(ePtr<iStreamableService> &ptr) { ptr = 0; return -1; }
+       RESULT streamed(ePtr<iStreamedService> &ptr) { ptr = 0; return -1; }
        RESULT cueSheet(ePtr<iCueSheet> &ptr);
 
                // iPlayableService
@@ -91,7 +92,7 @@ public:
                // iServiceKeys
        RESULT keyPressed(int key);
 private:
-       eServiceDVD(const char *filename);
+       eServiceDVD(eServiceReference ref);
 
        void gotMessage(int); // message from dvdlib
        void gotThreadMessage(const int &); // message from dvd thread
@@ -100,7 +101,7 @@ private:
        void thread();
        void thread_finished();
 
-       std::string m_filename;
+       eServiceReference m_ref;
 
        Signal2<void,iPlayableService*,int> m_event;
 
@@ -118,12 +119,16 @@ private:
 
        char m_ddvd_titlestring[96];
 
-       eSocketNotifier m_sn;
+       ePtr<eSocketNotifier> m_sn;
        eFixedMessagePump<int> m_pump;
 
        pts_t m_cue_pts;
+       struct ddvd_resume m_resume_info;
+
        void loadCuesheet();
        void saveCuesheet();
+
+       int m_width, m_height, m_aspect, m_framerate, m_progressive;
 };
 
 #endif