diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2010-11-10 20:26:17 +0100 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2010-11-10 20:26:17 +0100 |
| commit | 5ef54ea03e020f76be1aabeeff46453ca123a0f5 (patch) | |
| tree | 39fdd6180d2f826f6e960899fe22bbfdc9b65246 | |
| parent | 7d044888ef99903c5cb880cc5a83d03336726ea2 (diff) | |
| download | enigma2-5ef54ea03e020f76be1aabeeff46453ca123a0f5.tar.gz enigma2-5ef54ea03e020f76be1aabeeff46453ca123a0f5.zip | |
add possibility to pass the streaminfo file via tuneExt to tstools instance
| -rw-r--r-- | lib/dvb/pmt.cpp | 6 | ||||
| -rw-r--r-- | lib/dvb/pmt.h | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/lib/dvb/pmt.cpp b/lib/dvb/pmt.cpp index ba5a3ade..2ca226ae 100644 --- a/lib/dvb/pmt.cpp +++ b/lib/dvb/pmt.cpp @@ -676,10 +676,10 @@ void eDVBServicePMTHandler::SDTScanEvent(int event) int eDVBServicePMTHandler::tune(eServiceReferenceDVB &ref, int use_decode_demux, eCueSheet *cue, bool simulate, eDVBService *service) { ePtr<iDataSource> s; - return tuneExt(ref, use_decode_demux, s, cue, simulate, service); + return tuneExt(ref, use_decode_demux, s, NULL, cue, simulate, service); } -int eDVBServicePMTHandler::tuneExt(eServiceReferenceDVB &ref, int use_decode_demux, ePtr<iDataSource> &source, eCueSheet *cue, bool simulate, eDVBService *service) +int eDVBServicePMTHandler::tuneExt(eServiceReferenceDVB &ref, int use_decode_demux, ePtr<iDataSource> &source, const char *streaminfo_file, eCueSheet *cue, bool simulate, eDVBService *service) { RESULT res=0; m_reference = ref; @@ -764,7 +764,7 @@ int eDVBServicePMTHandler::tuneExt(eServiceReferenceDVB &ref, int use_decode_dem { m_pvr_channel->setCueSheet(cue); if (source) - m_pvr_channel->playSource(source); + m_pvr_channel->playSource(source, streaminfo_file); else m_pvr_channel->playFile(ref.path.c_str()); } diff --git a/lib/dvb/pmt.h b/lib/dvb/pmt.h index 0ea36e47..721a8fca 100644 --- a/lib/dvb/pmt.h +++ b/lib/dvb/pmt.h @@ -205,8 +205,11 @@ public: int getChannel(eUsePtr<iDVBChannel> &channel); void resetCachedProgram() { m_have_cached_program = false; } + /* deprecated interface */ int tune(eServiceReferenceDVB &ref, int use_decode_demux, eCueSheet *sg=0, bool simulate=false, eDVBService *service = 0); - int tuneExt(eServiceReferenceDVB &ref, int use_decode_demux, ePtr<iDataSource> &, eCueSheet *sg=0, bool simulate=false, eDVBService *service = 0); + + /* new interface */ + int tuneExt(eServiceReferenceDVB &ref, int use_decode_demux, ePtr<iDataSource> &, const char *streaminfo_file, eCueSheet *sg=0, bool simulate=false, eDVBService *service = 0); void free(); private: |