diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2009-08-11 19:28:41 +0200 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2009-08-11 19:28:41 +0200 |
| commit | cbfa5ce869fed89e2ac9d2ec762ca6210317add2 (patch) | |
| tree | e01d9636c7a21d897d94fde766b93cf1b261b511 /lib/service | |
| parent | 5d70fb1fa8db9464b4721f1beeb9f7e421b8308d (diff) | |
| parent | aabe98bebb2aa90435f5124c6151d718d18dfcd5 (diff) | |
| download | enigma2-cbfa5ce869fed89e2ac9d2ec762ca6210317add2.tar.gz enigma2-cbfa5ce869fed89e2ac9d2ec762ca6210317add2.zip | |
Merge branch 'master' of git.opendreambox.org:/git/enigma2
Diffstat (limited to 'lib/service')
| -rw-r--r-- | lib/service/servicedvb.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp index d04039df..c4e31487 100644 --- a/lib/service/servicedvb.cpp +++ b/lib/service/servicedvb.cpp @@ -2355,6 +2355,7 @@ void eDVBServicePlay::updateDecoder() Py_DECREF(subs); } } + m_decoder->play(); /* pids will be set later */ } if (m_cue) m_cue->setDecodingDemux(m_decode_demux, m_decoder); @@ -2431,13 +2432,7 @@ void eDVBServicePlay::updateDecoder() m_decoder->setRadioPic(radio_pic); } -/* if (!m_is_primary) - m_decoder->setTrickmode(); - else */ if (m_is_paused) - m_decoder->pause(); - else - m_decoder->play(); - + m_decoder->set(); m_decoder->setAudioChannel(achannel); /* don't worry about non-existing services, nor pvr services */ |