#include <lib/dvb/pmt.h>
#include <lib/dvb/eit.h>
+#include <lib/dvb/subtitle.h>
#include <lib/dvb/teletext.h>
+#include <lib/dvb/radiotext.h>
#include <lib/base/filepush.h>
+class eStaticServiceDVBInformation;
+class eStaticServiceDVBBouquetInformation;
+
class eServiceFactoryDVB: public iServiceHandler
{
-DECLARE_REF(eServiceFactoryDVB);
+ DECLARE_REF(eServiceFactoryDVB);
+ ePtr<eStaticServiceDVBInformation> m_StaticServiceDVBInfo;
+ ePtr<eStaticServiceDVBBouquetInformation> m_StaticServiceDVBBouquetInfo;
public:
eServiceFactoryDVB();
virtual ~eServiceFactoryDVB();
RESULT startEdit(ePtr<iMutableServiceList> &);
RESULT flushChanges();
- RESULT addService(eServiceReference &ref);
+ RESULT addService(eServiceReference &ref, eServiceReference before);
RESULT removeService(eServiceReference &ref);
RESULT moveService(eServiceReference &ref, int pos);
RESULT setListName(const std::string &name);
class eDVBServiceBase: public iFrontendInformation
{
protected:
- eDVBServicePMTHandler m_service_handler;
+ eDVBServicePMTHandler m_service_handler ;
public:
// iFrontendInformation
int getFrontendInfo(int w);
public iSeekableService, public Object, public iServiceInformation,
public iAudioTrackSelection, public iAudioChannelSelection,
public iSubserviceList, public iTimeshiftService,
- public iCueSheet, public iSubtitleOutput
+ public iCueSheet, public iSubtitleOutput, public iAudioDelay,
+ public iRadioText
{
DECLARE_REF(eDVBServicePlay);
public:
RESULT timeshift(ePtr<iTimeshiftService> &ptr);
RESULT cueSheet(ePtr<iCueSheet> &ptr);
RESULT subtitle(ePtr<iSubtitleOutput> &ptr);
+ RESULT audioDelay(ePtr<iAudioDelay> &ptr);
+ RESULT radioText(ePtr<iRadioText> &ptr);
// iPauseableService
RESULT pause();
int getCurrentChannel();
RESULT selectChannel(int i);
+ // iRadioText
+ std::string getRadioText(int i=0);
+
// iSubserviceList
int getNumberOfSubservices();
RESULT getSubservice(eServiceReference &subservice, unsigned int n);
RESULT enableSubtitles(eWidget *parent, PyObject *entry);
RESULT disableSubtitles(eWidget *parent);
PyObject *getSubtitleList();
+ PyObject *getCachedSubtitle();
+
+ // iAudioDelay
+ int getAC3Delay();
+ int getPCMDelay();
+ void setAC3Delay(int);
+ void setPCMDelay(int);
private:
friend class eServiceFactoryDVB;
ePtr<iTSMPEGDecoder> m_decoder;
int m_is_primary;
+ int m_have_video_pid;
/* in timeshift mode, we essentially have two channels, and thus pmt handlers. */
eDVBServicePMTHandler m_service_handler_timeshift;
ePtr<iDVBDemux> m_decode_demux;
- int m_current_audio_channel;
int m_current_audio_stream;
int selectAudioStream(int n);
void cutlistToCuesheet();
+ eSubtitleWidget *m_subtitle_widget;
+
/* teletext subtitles */
+ ePtr<eDVBTeletextParser> m_teletext_parser;
void newSubtitlePage(const eDVBTeletextSubtitlePage &p);
ePtr<eConnection> m_new_subtitle_page_connection;
-
- ePtr<eDVBTeletextParser> m_teletext_parser;
- eSubtitleWidget *m_subtitle_widget;
- eTimer m_subtitle_sync_timer;
std::list<eDVBTeletextSubtitlePage> m_subtitle_pages;
+ /* dvb subtitles */
+ ePtr<eDVBSubtitleParser> m_subtitle_parser;
+ void newDVBSubtitlePage(const eDVBSubtitlePage &p);
+ ePtr<eConnection> m_new_dvb_subtitle_page_connection;
+ std::list<eDVBSubtitlePage> m_dvb_subtitle_pages;
+
+ eTimer m_subtitle_sync_timer;
void checkSubtitleTiming();
+
+ /* radiotext */
+ ePtr<eDVBRadioTextParser> m_radiotext_parser;
+ ePtr<eConnection> m_radiotext_updated_connection;
+ void radioTextUpdated();
};
#endif