diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2010-11-24 16:15:02 +0100 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2010-11-24 16:15:02 +0100 |
| commit | 5c23ca59b7a3bb2d3a2bf3b7ffc78e1ffa170200 (patch) | |
| tree | 79462c6f5a741137e66772d69e6715b0d0a8709c /lib/service | |
| parent | 6a243eb89df7c0afd159a0820c897a8b5fcd8211 (diff) | |
| parent | 453fc1c6f82fa3b6ae983059eb55ad822860a5eb (diff) | |
| download | enigma2-5c23ca59b7a3bb2d3a2bf3b7ffc78e1ffa170200.tar.gz enigma2-5c23ca59b7a3bb2d3a2bf3b7ffc78e1ffa170200.zip | |
Merge branch 'bug_615_replace_rawfile' into m2ts_test
Diffstat (limited to 'lib/service')
| -rw-r--r-- | lib/service/servicedvb.cpp | 12 | ||||
| -rw-r--r-- | lib/service/servicedvb.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp index 1e58d848..0d617c30 100644 --- a/lib/service/servicedvb.cpp +++ b/lib/service/servicedvb.cpp @@ -1094,7 +1094,7 @@ void eDVBServicePlay::serviceEventTimeshift(int event) if (m_skipmode < 0) m_cue->seekTo(0, -1000); - ePtr<iDataSource> source = createDataSource(r); + ePtr<iTsSource> source = createTsSource(r); m_service_handler_timeshift.tuneExt(r, 1, source, r.path.c_str(), m_cue, 0, m_dvb_service); /* use the decoder demux for everything */ m_event((iPlayableService*)this, evUser+1); @@ -1124,7 +1124,7 @@ void eDVBServicePlay::serviceEventTimeshift(int event) m_service_handler_timeshift.free(); resetTimeshift(1); - ePtr<iDataSource> source = createDataSource(r); + ePtr<iTsSource> source = createTsSource(r); m_service_handler_timeshift.tuneExt(r, 1, source, m_timeshift_file_next.c_str(), m_cue, 0, m_dvb_service); /* use the decoder demux for everything */ m_event((iPlayableService*)this, evUser+1); @@ -1155,7 +1155,7 @@ RESULT eDVBServicePlay::start() m_event(this, evStart); m_first_program_info = 1; - ePtr<iDataSource> source = createDataSource(service); + ePtr<iTsSource> source = createTsSource(service); m_service_handler.tuneExt(service, m_is_pvr, source, service.path.c_str(), m_cue, false, m_dvb_service); if (m_is_pvr) @@ -2360,11 +2360,11 @@ void eDVBServicePlay::resetTimeshift(int start) m_timeshift_active = 0; } -ePtr<iDataSource> eDVBServicePlay::createDataSource(eServiceReferenceDVB &ref) +ePtr<iTsSource> eDVBServicePlay::createTsSource(eServiceReferenceDVB &ref) { eRawFile *f = new eRawFile(); f->open(ref.path.c_str()); - return ePtr<iDataSource>(f); + return ePtr<iTsSource>(f); } void eDVBServicePlay::switchToTimeshift() @@ -2379,7 +2379,7 @@ void eDVBServicePlay::switchToTimeshift() m_cue->seekTo(0, -1000); - ePtr<iDataSource> source = createDataSource(r); + ePtr<iTsSource> source = createTsSource(r); m_service_handler_timeshift.tuneExt(r, 1, source, m_timeshift_file.c_str(), m_cue, 0, m_dvb_service); /* use the decoder demux for everything */ eDebug("eDVBServicePlay::switchToTimeshift, in pause mode now."); diff --git a/lib/service/servicedvb.h b/lib/service/servicedvb.h index 23675bf6..3efc259d 100644 --- a/lib/service/servicedvb.h +++ b/lib/service/servicedvb.h @@ -290,7 +290,7 @@ protected: ePtr<eConnection> m_video_event_connection; void video_event(struct iTSMPEGDecoder::videoEvent); - virtual ePtr<iDataSource> createDataSource(eServiceReferenceDVB &ref); + virtual ePtr<iTsSource> createTsSource(eServiceReferenceDVB &ref); }; class eStaticServiceDVBBouquetInformation: public iStaticServiceInformation |