From 14d5930f6bf68b892e14d1edf4ccc13954fa7cd4 Mon Sep 17 00:00:00 2001 From: ghost Date: Tue, 15 Feb 2011 20:45:02 +0100 Subject: follow enigma2 bug #672 --- partnerbox/src/servicewebts/servicewebts.cpp | 18 +++++++++--------- vlcplayer/src/servicets/servicets.cpp | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/partnerbox/src/servicewebts/servicewebts.cpp b/partnerbox/src/servicewebts/servicewebts.cpp index 4c3c3e7..294aeb2 100644 --- a/partnerbox/src/servicewebts/servicewebts.cpp +++ b/partnerbox/src/servicewebts/servicewebts.cpp @@ -263,15 +263,6 @@ RESULT eServiceWebTS::start() ePtr rmgr; eDVBResourceManager::getInstance(rmgr); eDVBChannel dvbChannel(rmgr, 0); - if (m_destfd == -1) - { - m_destfd = ::open("/dev/misc/pvr", O_WRONLY); - if (m_destfd < 0) - { - eDebug("Cannot open /dev/misc/pvr"); - return -1; - } - } if (dvbChannel.getDemux(m_decodedemux, iDVBChannel::capDecode) != 0) { eDebug("Cannot allocate decode-demux"); return -1; @@ -280,6 +271,15 @@ RESULT eServiceWebTS::start() eDebug("Cannot allocate MPEGDecoder"); return -1; } + if (m_destfd == -1) + { + m_destfd = m_decodedemux->openPVR(O_WRONLY); + if (m_destfd < 0) + { + eDebug("openPVR failed!"); + return -1; + } + } //m_decoder->setVideoPID(m_vpid, eDVBVideo::MPEG2); //m_decoder->setAudioPID(m_apid, eDVBAudio::aMPEG); m_streamthread = new eStreamThreadWeb(); diff --git a/vlcplayer/src/servicets/servicets.cpp b/vlcplayer/src/servicets/servicets.cpp index 4309e96..b14bc53 100644 --- a/vlcplayer/src/servicets/servicets.cpp +++ b/vlcplayer/src/servicets/servicets.cpp @@ -253,15 +253,6 @@ RESULT eServiceTS::start() ePtr rmgr; eDVBResourceManager::getInstance(rmgr); eDVBChannel dvbChannel(rmgr, 0); - if (m_destfd == -1) - { - m_destfd = ::open("/dev/misc/pvr", O_WRONLY); - if (m_destfd < 0) - { - eDebug("Cannot open /dev/misc/pvr"); - return -1; - } - } if (dvbChannel.getDemux(m_decodedemux, iDVBChannel::capDecode) != 0) { eDebug("Cannot allocate decode-demux"); return -1; @@ -270,6 +261,15 @@ RESULT eServiceTS::start() eDebug("Cannot allocate MPEGDecoder"); return -1; } + if (m_destfd == -1) + { + m_destfd = m_decodedemux->openPVR(O_WRONLY); + if (m_destfd < 0) + { + eDebug("openPVR failed"); + return -1; + } + } m_decoder->setVideoPID(m_vpid, eDVBVideo::MPEG2); m_decoder->setAudioPID(m_apid, eDVBAudio::aMPEG); m_streamthread = new eStreamThread(); -- cgit