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/dvb/dvb.cpp | |
| 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/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); } |