X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fservice%2Fservicedvb.h;h=7ded16a0c8c52e67bfa0869bd4cc3c96afae1616;hb=e41f07f1d0855ff8e47059f109413a41a065268b;hp=1262836e90d0cdb9db864c919f153749d928bbbf;hpb=7c75162a934f5cb088801396f2b3129d74a119e6;p=vuplus_dvbapp

diff --git a/lib/service/servicedvb.h b/lib/service/servicedvb.h
index 1262836..7ded16a 100644
--- a/lib/service/servicedvb.h
+++ b/lib/service/servicedvb.h
@@ -162,6 +162,7 @@ public:
 	RESULT stopTimeshift(bool swToLive=true);
 	int isTimeshiftActive();
 	RESULT activateTimeshift();
+	RESULT setNextPlaybackFile(const char *fn);
 
 		// iCueSheet
 	PyObject *getCutList();
@@ -184,7 +185,7 @@ public:
 	RESULT stream(ePtr<iStreamableService> &ptr);
 	PyObject *getStreamingData();
 
-private:
+protected:
 	friend class eServiceFactoryDVB;
 	eServiceReference m_reference;
 	
@@ -199,8 +200,9 @@ private:
 	eDVBServicePMTHandler m_service_handler_timeshift;
 	eDVBServiceEITHandler m_event_handler;
 	int m_current_audio_pid;
+	int m_current_video_pid_type;
 	
-	eDVBServicePlay(const eServiceReference &ref, eDVBService *service);
+	eDVBServicePlay(const eServiceReference &ref, eDVBService *service, bool connect_event=true);
 	
 		/* events */
 	void gotNewEvent();
@@ -208,14 +210,15 @@ private:
 	void serviceEvent(int event);
 	void serviceEventTimeshift(int event);
 	Signal2<void,iPlayableService*,int> m_event;
+
+	int m_is_stream;
 	
 		/* pvr */
 	int m_is_pvr, m_is_paused, m_timeshift_enabled, m_timeshift_active, m_timeshift_changed;
 	int m_first_program_info;
 	
-	std::string m_timeshift_file;
+	std::string m_timeshift_file, m_timeshift_file_next;
 	int m_timeshift_fd;
-	
 	ePtr<iDVBDemux> m_decode_demux;
 
 	int m_current_audio_stream;
@@ -227,9 +230,11 @@ private:
 	std::set<int> m_pids_active;
 
 	void updateTimeshiftPids();
-	void switchToLive();
+	virtual void switchToLive();
+
+	void resetTimeshift(int start);
 	void switchToTimeshift();
-	
+
 	void updateDecoder(bool sendSeekableStateChanged=false);
 	
 	int m_skipmode;
@@ -287,6 +292,8 @@ private:
 
 	ePtr<eConnection> m_video_event_connection;
 	void video_event(struct iTSMPEGDecoder::videoEvent);
+
+	virtual ePtr<iTsSource> createTsSource(eServiceReferenceDVB &ref);
 };
 
 class eStaticServiceDVBBouquetInformation: public iStaticServiceInformation