git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'remotes/origin/bug_620_dvdburn_absolutepaths'
[enigma2.git]
/
lib
/
service
/
servicedvb.h
diff --git
a/lib/service/servicedvb.h
b/lib/service/servicedvb.h
index 6eba5064f57978334cda2061c26655e12440cfce..3efc259de4d8612a94a2fc88c361aa089fbb6669 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;
@@
-210,17
+211,16
@@
private:
Signal2<void,iPlayableService*,int> m_event;
/* pvr */
Signal2<void,iPlayableService*,int> m_event;
/* pvr */
- int m_is_pvr, m_is_paused, m_timeshift_enabled, m_timeshift_active;
+ int m_is_pvr, m_is_paused, m_timeshift_enabled, m_timeshift_active
, m_timeshift_changed
;
int m_first_program_info;
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;
int selectAudioStream(int n = -1);
ePtr<iDVBDemux> m_decode_demux;
int m_current_audio_stream;
int selectAudioStream(int n = -1);
- RESULT setFastForward_internal(int ratio);
+ RESULT setFastForward_internal(int ratio
, bool final_seek=false
);
/* timeshift */
ePtr<iDVBTSRecorder> m_record;
/* timeshift */
ePtr<iDVBTSRecorder> m_record;
@@
-228,11
+228,15
@@
private:
void updateTimeshiftPids();
void switchToLive();
void updateTimeshiftPids();
void switchToLive();
+
+ void resetTimeshift(int start);
void switchToTimeshift();
void switchToTimeshift();
-
- void updateDecoder();
+
+ void updateDecoder(
bool sendSeekableStateChanged=false
);
int m_skipmode;
int m_skipmode;
+ int m_fastforward;
+ int m_slowmotion;
/* cuesheet */
/* cuesheet */
@@
-285,6
+289,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