git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bouquets and lamedb now stored in /etc/enigma2 (CONFIGDIR/enigma2)
[enigma2.git]
/
lib
/
dvb
/
dvb.cpp
diff --git
a/lib/dvb/dvb.cpp
b/lib/dvb/dvb.cpp
index 8feb3c184f4094293bd07c14f4d3d6ec75f686bc..c310d49d978eb323a7a14af1822973f78204b470 100644
(file)
--- a/
lib/dvb/dvb.cpp
+++ b/
lib/dvb/dvb.cpp
@@
-18,12
+18,12
@@
DEFINE_REF(eDVBAllocatedFrontend);
eDVBAllocatedFrontend::eDVBAllocatedFrontend(eDVBRegisteredFrontend *fe): m_fe(fe)
{
eDVBAllocatedFrontend::eDVBAllocatedFrontend(eDVBRegisteredFrontend *fe): m_fe(fe)
{
- m_fe->
m_inuse++
;
+ m_fe->
inc_use()
;
}
eDVBAllocatedFrontend::~eDVBAllocatedFrontend()
{
}
eDVBAllocatedFrontend::~eDVBAllocatedFrontend()
{
-
--m_fe->m_inuse
;
+
m_fe->dec_use()
;
}
DEFINE_REF(eDVBAllocatedDemux);
}
DEFINE_REF(eDVBAllocatedDemux);
@@
-200,8
+200,6
@@
void eDVBResourceManager::addAdapter(iDVBAdapter *adapter)
if (!adapter->getFrontend(frontend, i))
{
if (!adapter->getFrontend(frontend, i))
{
- frontend->setTone(iDVBFrontend::toneOff);
- frontend->setVoltage(iDVBFrontend::voltageOff);
frontend->setSEC(m_sec);
m_frontend.push_back(new eDVBRegisteredFrontend(frontend, adapter));
}
frontend->setSEC(m_sec);
m_frontend.push_back(new eDVBRegisteredFrontend(frontend, adapter));
}
@@
-365,6
+363,9
@@
RESULT eDVBResourceManager::allocateRawChannel(eUsePtr<iDVBChannel> &channel, in
{
ePtr<eDVBAllocatedFrontend> fe;
{
ePtr<eDVBAllocatedFrontend> fe;
+ if (m_cached_channel)
+ m_cached_channel=0;
+
if (allocateFrontendByIndex(fe, frontend_index))
return errNoFrontend;
if (allocateFrontendByIndex(fe, frontend_index))
return errNoFrontend;
@@
-379,7
+380,10
@@
RESULT eDVBResourceManager::allocateRawChannel(eUsePtr<iDVBChannel> &channel, in
RESULT eDVBResourceManager::allocatePVRChannel(eUsePtr<iDVBPVRChannel> &channel)
{
ePtr<eDVBAllocatedDemux> demux;
RESULT eDVBResourceManager::allocatePVRChannel(eUsePtr<iDVBPVRChannel> &channel)
{
ePtr<eDVBAllocatedDemux> demux;
-
+
+ if (m_cached_channel)
+ m_cached_channel=0;
+
eDVBChannel *ch;
ch = new eDVBChannel(this, 0);
eDVBChannel *ch;
ch = new eDVBChannel(this, 0);
@@
-676,7
+680,7
@@
RESULT eDVBChannel::playFile(const char *file)
return -ENODEV;
}
return -ENODEV;
}
- m_pvr_fd_src = open(file, O_RDONLY);
+ m_pvr_fd_src = open(file, O_RDONLY
|O_LARGEFILE
);
if (m_pvr_fd_src < 0)
{
eDebug("can't open PVR m_pvr_fd_src file %s (%m)", file);
if (m_pvr_fd_src < 0)
{
eDebug("can't open PVR m_pvr_fd_src file %s (%m)", file);
@@
-698,7
+702,7
@@
RESULT eDVBChannel::getLength(pts_t &len)
return m_tstools.calcLen(len);
}
return m_tstools.calcLen(len);
}
-RESULT eDVBChannel::getCurrentPosition(iDVBDemux *decoding_demux, pts_t &pos)
+RESULT eDVBChannel::getCurrentPosition(iDVBDemux *decoding_demux, pts_t &pos
, int mode
)
{
if (!decoding_demux)
return -1;
{
if (!decoding_demux)
return -1;
@@
-714,7
+718,8
@@
RESULT eDVBChannel::getCurrentPosition(iDVBDemux *decoding_demux, pts_t &pos)
pts_t now;
pts_t now;
- r = decoding_demux->getSTC(now);
+ /* TODO: this is a gross hack. */
+ r = decoding_demux->getSTC(now, mode ? 128 : 0);
if (r)
{
if (r)
{
@@
-749,7
+754,7
@@
RESULT eDVBChannel::seekTo(iDVBDemux *decoding_demux, int relative, pts_t &pts)
if (relative)
{
pts_t now;
if (relative)
{
pts_t now;
- if (getCurrentPosition(decoding_demux, now))
+ if (getCurrentPosition(decoding_demux, now
, 0
))
{
eDebug("seekTo: getCurrentPosition failed!");
return -1;
{
eDebug("seekTo: getCurrentPosition failed!");
return -1;