eDVBAllocatedFrontend::eDVBAllocatedFrontend(eDVBRegisteredFrontend *fe): m_fe(fe)
{
- m_fe->m_inuse++;
+ m_fe->inc_use();
}
eDVBAllocatedFrontend::~eDVBAllocatedFrontend()
{
- --m_fe->m_inuse;
+ m_fe->dec_use();
}
DEFINE_REF(eDVBAllocatedDemux);
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));
}
RESULT eDVBResourceManager::allocateChannel(const eDVBChannelID &channelid, eUsePtr<iDVBChannel> &channel)
{
/* first, check if a channel is already existing. */
-
+
+ if (m_cached_channel)
+ {
+ eDVBChannel *cache_chan = (eDVBChannel*)&(*m_cached_channel);
+ if(channelid==cache_chan->getChannelID())
+ {
+ eDebug("use cached_channel");
+ channel=m_cached_channel;
+ return 0;
+ }
+ m_cached_channel=0;
+ }
+
// eDebug("allocate channel.. %04x:%04x", channelid.transport_stream_id.get(), channelid.original_network_id.get());
for (std::list<active_channel>::iterator i(m_active_channels.begin()); i != m_active_channels.end(); ++i)
{
channel = 0;
return errChidNotFound;
}
- channel = ch;
+ m_cached_channel = channel = ch;
return 0;
}
{
ePtr<eDVBAllocatedFrontend> fe;
+ if (m_cached_channel)
+ m_cached_channel=0;
+
if (allocateFrontendByIndex(fe, frontend_index))
return errNoFrontend;
RESULT eDVBResourceManager::allocatePVRChannel(eUsePtr<iDVBPVRChannel> &channel)
{
ePtr<eDVBAllocatedDemux> demux;
-
+
+ if (m_cached_channel)
+ m_cached_channel=0;
+
eDVBChannel *ch;
ch = new eDVBChannel(this, 0);
if (i->m_channel_id == ignore)
{
eDVBChannel *channel = (eDVBChannel*) &(*i->m_channel);
- if (channel->getUseCount() == 1) // channel only used once..
+ if (channel == &(*m_cached_channel) ? channel->getUseCount() == 2 : channel->getUseCount() == 1) // channel only used once..
{
ePtr<iDVBFrontend> fe;
if (!i->m_channel->getFrontend(fe))
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);
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;
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 (relative)
{
pts_t now;
- if (getCurrentPosition(decoding_demux, now))
+ if (getCurrentPosition(decoding_demux, now, 0))
{
eDebug("seekTo: getCurrentPosition failed!");
return -1;