diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2010-11-24 18:06:03 +0100 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2010-11-24 18:06:03 +0100 |
| commit | 01da0bdcc7d4043dbab99ad19443e5860c72da79 (patch) | |
| tree | 0cc197b699cd13646d7c6b294c204d056abcf27d /lib/dvb/dvb.cpp | |
| parent | 30d08880e13f81aa3aa6cb163e2037d1b98e20e4 (diff) | |
| parent | ed545659e30ea7796e2e7acd06e766cc82efb486 (diff) | |
| download | enigma2-01da0bdcc7d4043dbab99ad19443e5860c72da79.tar.gz enigma2-01da0bdcc7d4043dbab99ad19443e5860c72da79.zip | |
Merge branch 'master' into obi/master
Diffstat (limited to 'lib/dvb/dvb.cpp')
| -rw-r--r-- | lib/dvb/dvb.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp index c980ac5a..414ab8da 100644 --- a/lib/dvb/dvb.cpp +++ b/lib/dvb/dvb.cpp @@ -1753,7 +1753,7 @@ RESULT eDVBChannel::getCurrentFrontendParameters(ePtr<iDVBFrontendParameters> &p RESULT eDVBChannel::playFile(const char *file) { eRawFile *f = new eRawFile(); - ePtr<iDataSource> source = f; + ePtr<iTsSource> source = f; if (f->open(file) < 0) { @@ -1764,7 +1764,7 @@ RESULT eDVBChannel::playFile(const char *file) return playSource(source, file); } -RESULT eDVBChannel::playSource(ePtr<iDataSource> &source, const char *streaminfo_file) +RESULT eDVBChannel::playSource(ePtr<iTsSource> &source, const char *streaminfo_file) { ASSERT(!m_frontend); if (m_pvr_thread) @@ -1826,7 +1826,7 @@ void eDVBChannel::stopSource() } if (m_pvr_fd_dst >= 0) ::close(m_pvr_fd_dst); - ePtr<iDataSource> d; + ePtr<iTsSource> d; m_tstools.setSource(d); } |