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 'master' of git.opendreambox.org:/git/enigma2
[enigma2.git]
/
lib
/
service
/
servicedvb.h
diff --git
a/lib/service/servicedvb.h
b/lib/service/servicedvb.h
index 789edbea701b396e088a12450a8e238747f49ef3..43e4690f8b3509395d21c58f607ed1f390741d67 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();
@@
-113,6
+113,7
@@
public:
RESULT subtitle(ePtr<iSubtitleOutput> &ptr);
RESULT audioDelay(ePtr<iAudioDelay> &ptr);
RESULT rdsDecoder(ePtr<iRdsDecoder> &ptr);
RESULT subtitle(ePtr<iSubtitleOutput> &ptr);
RESULT audioDelay(ePtr<iAudioDelay> &ptr);
RESULT rdsDecoder(ePtr<iRdsDecoder> &ptr);
+ RESULT keys(ePtr<iServiceKeys> &ptr) { ptr = 0; return -1; }
// iPauseableService
RESULT pause();
// iPauseableService
RESULT pause();
@@
-217,6
+218,7
@@
private:
int m_current_audio_stream;
int selectAudioStream(int n = -1);
int m_current_audio_stream;
int selectAudioStream(int n = -1);
+ RESULT setFastForward_internal(int ratio);
/* timeshift */
ePtr<iDVBTSRecorder> m_record;
/* timeshift */
ePtr<iDVBTSRecorder> m_record;
@@
-271,7
+273,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 */
@@
-281,7
+283,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
@@
-292,7
+293,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);
};