projects
/
vuplus_dvbapp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix malfunction of recording path
[vuplus_dvbapp]
/
lib
/
service
/
servicedvb.h
diff --git
a/lib/service/servicedvb.h
b/lib/service/servicedvb.h
index
e3c7fd5
..
7ded16a
100644
(file)
--- a/
lib/service/servicedvb.h
+++ b/
lib/service/servicedvb.h
@@
-159,9
+159,10
@@
public:
// iTimeshiftService
RESULT startTimeshift();
// iTimeshiftService
RESULT startTimeshift();
- RESULT stopTimeshift();
+ RESULT stopTimeshift(
bool swToLive=true
);
int isTimeshiftActive();
RESULT activateTimeshift();
int isTimeshiftActive();
RESULT activateTimeshift();
+ RESULT setNextPlaybackFile(const char *fn);
// iCueSheet
PyObject *getCutList();
// iCueSheet
PyObject *getCutList();
@@
-184,7
+185,7
@@
public:
RESULT stream(ePtr<iStreamableService> &ptr);
PyObject *getStreamingData();
RESULT stream(ePtr<iStreamableService> &ptr);
PyObject *getStreamingData();
-pr
ivate
:
+pr
otected
:
friend class eServiceFactoryDVB;
eServiceReference m_reference;
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;
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();
/* events */
void gotNewEvent();
@@
-208,14
+210,15
@@
private:
void serviceEvent(int event);
void serviceEventTimeshift(int event);
Signal2<void,iPlayableService*,int> m_event;
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;
/* 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;
int m_timeshift_fd;
-
ePtr<iDVBDemux> m_decode_demux;
int m_current_audio_stream;
ePtr<iDVBDemux> m_decode_demux;
int m_current_audio_stream;
@@
-227,10
+230,12
@@
private:
std::set<int> m_pids_active;
void updateTimeshiftPids();
std::set<int> m_pids_active;
void updateTimeshiftPids();
- void switchToLive();
+ virtual void switchToLive();
+
+ void resetTimeshift(int start);
void switchToTimeshift();
void switchToTimeshift();
-
- void updateDecoder();
+
+ void updateDecoder(
bool sendSeekableStateChanged=false
);
int m_skipmode;
int m_fastforward;
int m_skipmode;
int m_fastforward;
@@
-287,6
+292,8
@@
private:
ePtr<eConnection> m_video_event_connection;
void video_event(struct iTSMPEGDecoder::videoEvent);
ePtr<eConnection> m_video_event_connection;
void video_event(struct iTSMPEGDecoder::videoEvent);
+
+ virtual ePtr<iTsSource> createTsSource(eServiceReferenceDVB &ref);
};
class eStaticServiceDVBBouquetInformation: public iStaticServiceInformation
};
class eStaticServiceDVBBouquetInformation: public iStaticServiceInformation