git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add "TEXT" key for subtitles in MediaPlayer
[enigma2.git]
/
lib
/
service
/
servicedvb.h
diff --git
a/lib/service/servicedvb.h
b/lib/service/servicedvb.h
index 789edbea701b396e088a12450a8e238747f49ef3..85e97ea127a884370787b4be9bcb7a94f16269c7 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();
@@
-271,7
+272,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 */