add evEnd to (p)core

[enigma2.git] / lib / nav / core.h

diff --git a/lib/nav/core.h b/lib/nav/core.h
index c4306e3999994e6b6be89501d75dd43cd8a66328..f1146b447a473c98ca80b2c90c37bdffd9bbb8c1 100644 (file)
--- a/lib/nav/core.h
+++ b/lib/nav/core.h
@@ -3,7 +3,6 @@
 
 #include <lib/base/object.h>
 #include <lib/service/iservice.h>
-#include <lib/nav/playlist.h>
 #include <connection.h>
 
 class eNavigation: public iObject, public Object
@@ -12,34 +11,29 @@ class eNavigation: public iObject, public Object
 private:
        ePtr<iPlayableService> m_runningService;
        
-       ePtr<iRecordableService> m_recordingService;
-       
        ePtr<iServiceHandler> m_servicehandler;
        Signal2<void,eNavigation*,int> m_event;
        ePtr<eConnection> m_service_event_conn;
        void serviceEvent(iPlayableService* service, int event);
-       
-       ePtr<ePlaylist> m_playlist;
 public:
        enum
        {
                evStopService,  /** the "current" service was just stopped and likes to be deallocated (clear refs!) */
                evNewService,   /** a new "current" service was just started */
                evPlayFailed,   /** the next service (in playlist) or the one given in playService failed to play */
-               evPlaylistDone, /** the last service in the playlist was just played */
-               evUpdatedEventInfo /** the "currently running" event info was updated */
+               evUpdatedEventInfo, /** the "currently running" event info was updated */
+               evUpdatedInfo, /** the program info of this service was updated */
+               evSeekableStatusChanged,
+               evEnd
        };
        
        RESULT playService(const eServiceReference &service);
-       RESULT enqueueService(const eServiceReference &service);
        RESULT connectEvent(const Slot2<void,eNavigation*,int> &event, ePtr<eConnection> &connection);
 /*     int connectServiceEvent(const Slot1<void,iPlayableService*,int> &event, ePtr<eConnection> &connection); */
        RESULT getCurrentService(ePtr<iPlayableService> &service);
-       RESULT getPlaylist(ePtr<ePlaylist> &playlist);
        RESULT stopService(void);
        
-       RESULT recordService(const eServiceReference &service);
-       RESULT endRecording();
+       RESULT recordService(const eServiceReference &ref, ePtr<iRecordableService> &service);
        
        RESULT pause(int p);
        eNavigation(iServiceHandler *serviceHandler);