diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2011-01-28 12:45:16 +0100 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2011-01-28 12:45:16 +0100 |
| commit | c9839b5bbd097c884d979e43531ddbbcca9fa162 (patch) | |
| tree | 74ba38e3c76d01dc07bd72dc8a7d3c600ccb9941 /lib/dvb/pmt.cpp | |
| parent | 44fb836216b0873cbd2de53029cbe6cd56f24ee1 (diff) | |
| download | enigma2-master-2011.02.tar.gz enigma2-master-2011.02.zip | |
no more use proprietary /dev/misc/pvr .. use linux tv api /dev/dvb/adapterX/dvrXmaster-2011.02
this needs new hardware drivers!!
fixed bug #672
Diffstat (limited to 'lib/dvb/pmt.cpp')
| -rw-r--r-- | lib/dvb/pmt.cpp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/lib/dvb/pmt.cpp b/lib/dvb/pmt.cpp index ca56141b..dc2a8856 100644 --- a/lib/dvb/pmt.cpp +++ b/lib/dvb/pmt.cpp @@ -43,8 +43,15 @@ void eDVBServicePMTHandler::channelStateChanged(iDVBChannel *channel) && (state == iDVBChannel::state_ok) && (!m_demux)) { if (m_channel) - if (m_channel->getDemux(m_demux, (!m_use_decode_demux) ? 0 : iDVBChannel::capDecode)) + { + if (m_pvr_demux_tmp) + { + m_demux = m_pvr_demux_tmp; + m_pvr_demux_tmp = NULL; + } + else if (m_channel->getDemux(m_demux, (!m_use_decode_demux) ? 0 : iDVBChannel::capDecode)) eDebug("Allocating %s-decoding a demux for now tuned-in channel failed.", m_use_decode_demux ? "" : "non-"); + } serviceEvent(eventTuned); @@ -792,7 +799,10 @@ int eDVBServicePMTHandler::tuneExt(eServiceReferenceDVB &ref, int use_decode_dem if (m_pvr_channel) { m_pvr_channel->setCueSheet(cue); - if (source) + + if (m_pvr_channel->getDemux(m_pvr_demux_tmp, (!m_use_decode_demux) ? 0 : iDVBChannel::capDecode)) + eDebug("Allocating %s-decoding a demux for PVR channel failed.", m_use_decode_demux ? "" : "non-"); + else if (source) m_pvr_channel->playSource(source, streaminfo_file); else m_pvr_channel->playFile(ref.path.c_str()); |