projects
/
vuplus_dvbapp
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a6b9e53
)
dvb.cpp: small fix for playSource
author
ghost
<andreas.monzner@multimedia-labs.de>
Wed, 10 Nov 2010 17:18:32 +0000
(18:18 +0100)
committer
ghost
<andreas.monzner@multimedia-labs.de>
Wed, 10 Nov 2010 17:18:32 +0000
(18:18 +0100)
lib/dvb/dvb.cpp
patch
|
blob
|
history
diff --git
a/lib/dvb/dvb.cpp
b/lib/dvb/dvb.cpp
index
21ebecf
..
640f327
100644
(file)
--- a/
lib/dvb/dvb.cpp
+++ b/
lib/dvb/dvb.cpp
@@
-1752,14
+1752,6
@@
RESULT eDVBChannel::getCurrentFrontendParameters(ePtr<iDVBFrontendParameters> &p
RESULT eDVBChannel::playFile(const char *file)
{
RESULT eDVBChannel::playFile(const char *file)
{
- ASSERT(!m_frontend);
- if (m_pvr_thread)
- {
- m_pvr_thread->stop();
- delete m_pvr_thread;
- m_pvr_thread = 0;
- }
-
eRawFile *f = new eRawFile();
ePtr<iDataSource> source = f;
eRawFile *f = new eRawFile();
ePtr<iDataSource> source = f;
@@
-1774,6
+1766,14
@@
RESULT eDVBChannel::playFile(const char *file)
RESULT eDVBChannel::playSource(ePtr<iDataSource> &source, const char *priv)
{
RESULT eDVBChannel::playSource(ePtr<iDataSource> &source, const char *priv)
{
+ ASSERT(!m_frontend);
+ if (m_pvr_thread)
+ {
+ m_pvr_thread->stop();
+ delete m_pvr_thread;
+ m_pvr_thread = 0;
+ }
+
m_tstools.setSource(source, priv);
/* DON'T EVEN THINK ABOUT FIXING THIS. FIX THE ATI SOURCES FIRST,
m_tstools.setSource(source, priv);
/* DON'T EVEN THINK ABOUT FIXING THIS. FIX THE ATI SOURCES FIRST,