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 branch 'bug_538_ignore_global_actions_in_standby'
[enigma2.git]
/
lib
/
service
/
servicedvb.h
diff --git
a/lib/service/servicedvb.h
b/lib/service/servicedvb.h
index d7d05c7833e5cd6f1faf1480ad401a48e9d28048..dafaf35d68eb7bad40b5f7a2ec0bcb6ef2ef6bb4 100644
(file)
--- a/
lib/service/servicedvb.h
+++ b/
lib/service/servicedvb.h
@@
-38,7
+38,7
@@
class eBouquet;
class eDVBServiceList: public iListableService, public iMutableServiceList
{
class eDVBServiceList: public iListableService, public iMutableServiceList
{
-DECLARE_REF(eDVBServiceList);
+
DECLARE_REF(eDVBServiceList);
public:
virtual ~eDVBServiceList();
PyObject *getContent(const char* formatstr, bool sorted=false);
public:
virtual ~eDVBServiceList();
PyObject *getContent(const char* formatstr, bool sorted=false);
@@
-81,7
+81,7
@@
public:
PyObject *getAll(bool original); // a sum of getFrontendData/Status/TransponderData
};
PyObject *getAll(bool original); // a sum of getFrontendData/Status/TransponderData
};
-class eSubtitleWidget;
+class eSubtitleWidget;
class eDVBServicePlay: public eDVBServiceBase,
public iPlayableService, public iPauseableService,
class eDVBServicePlay: public eDVBServiceBase,
public iPlayableService, public iPauseableService,
@@
-91,7
+91,7
@@
class eDVBServicePlay: public eDVBServiceBase,
public iCueSheet, public iSubtitleOutput, public iAudioDelay,
public iRdsDecoder, public iStreamableService
{
public iCueSheet, public iSubtitleOutput, public iAudioDelay,
public iRdsDecoder, public iStreamableService
{
-DECLARE_REF(eDVBServicePlay);
+
DECLARE_REF(eDVBServicePlay);
public:
virtual ~eDVBServicePlay();
public:
virtual ~eDVBServicePlay();
@@
-114,13
+114,14
@@
public:
RESULT audioDelay(ePtr<iAudioDelay> &ptr);
RESULT rdsDecoder(ePtr<iRdsDecoder> &ptr);
RESULT keys(ePtr<iServiceKeys> &ptr) { ptr = 0; return -1; }
RESULT audioDelay(ePtr<iAudioDelay> &ptr);
RESULT rdsDecoder(ePtr<iRdsDecoder> &ptr);
RESULT keys(ePtr<iServiceKeys> &ptr) { ptr = 0; return -1; }
+ RESULT streamed(ePtr<iStreamedService> &ptr) { ptr = 0; return -1; }
// iPauseableService
RESULT pause();
RESULT unpause();
RESULT setSlowMotion(int ratio);
RESULT setFastForward(int ratio);
// iPauseableService
RESULT pause();
RESULT unpause();
RESULT setSlowMotion(int ratio);
RESULT setFastForward(int ratio);
-
+
// iSeekableService
RESULT getLength(pts_t &len);
RESULT seekTo(pts_t to);
// iSeekableService
RESULT getLength(pts_t &len);
RESULT seekTo(pts_t to);
@@
-128,7
+129,6
@@
public:
RESULT getPlayPosition(pts_t &pos);
RESULT setTrickmode(int trick=0);
RESULT isCurrentlySeekable();
RESULT getPlayPosition(pts_t &pos);
RESULT setTrickmode(int trick=0);
RESULT isCurrentlySeekable();
- RESULT seekChapter(int chapter);
// iServiceInformation
RESULT getName(std::string &name);
// iServiceInformation
RESULT getName(std::string &name);
@@
-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();
@@
-183,6
+184,7
@@
public:
// iStreamableService
RESULT stream(ePtr<iStreamableService> &ptr);
PyObject *getStreamingData();
// iStreamableService
RESULT stream(ePtr<iStreamableService> &ptr);
PyObject *getStreamingData();
+
private:
friend class eServiceFactoryDVB;
eServiceReference m_reference;
private:
friend class eServiceFactoryDVB;
eServiceReference m_reference;
@@
-209,16
+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, bool final_seek=false);
/* timeshift */
ePtr<iDVBTSRecorder> m_record;
/* timeshift */
ePtr<iDVBTSRecorder> m_record;
@@
-226,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 */
@@
-273,7
+279,7
@@
private:
ePtr<eConnection> m_new_dvb_subtitle_page_connection;
std::list<eDVBSubtitlePage> m_dvb_subtitle_pages;
ePtr<eConnection> m_new_dvb_subtitle_page_connection;
std::list<eDVBSubtitlePage> m_dvb_subtitle_pages;
- e
Timer
m_subtitle_sync_timer;
+ e
Ptr<eTimer>
m_subtitle_sync_timer;
void checkSubtitleTiming();
/* radiotext */
void checkSubtitleTiming();
/* radiotext */
@@
-283,7
+289,6
@@
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);
- struct iTSMPEGDecoder::videoEvent m_videoEventData;
};
class eStaticServiceDVBBouquetInformation: public iStaticServiceInformation
};
class eStaticServiceDVBBouquetInformation: public iStaticServiceInformation
@@
-294,7
+299,7
@@
public:
eServiceReference &getPlayableService() { return m_playable_service; }
RESULT getName(const eServiceReference &ref, std::string &name);
int getLength(const eServiceReference &ref);
eServiceReference &getPlayableService() { return m_playable_service; }
RESULT getName(const eServiceReference &ref, std::string &name);
int getLength(const eServiceReference &ref);
- int isPlayable(const eServiceReference &ref, const eServiceReference &ignore);
+ int isPlayable(const eServiceReference &ref, const eServiceReference &ignore
, bool simulate=false
);
RESULT getEvent(const eServiceReference &ref, ePtr<eServiceEvent> &ptr, time_t start_time);
};
RESULT getEvent(const eServiceReference &ref, ePtr<eServiceEvent> &ptr, time_t start_time);
};