void eEPGCache::DVBChannelRunning(iDVBChannel *chan)
{
- singleLock s(channel_map_lock);
channelMapIterator it =
m_knownChannels.find(chan);
if ( it == m_knownChannels.end() )
{
eDebug("[eEPGCache] remove channel %p", chan);
messages.send(Message(Message::leaveChannel, chan));
- while(!it->second->canDelete())
- usleep(1000);
- delete it->second;
+ pthread_mutex_lock(&it->second->channel_active);
+ singleLock s(channel_map_lock);
m_knownChannels.erase(it);
+ pthread_mutex_unlock(&it->second->channel_active);
+ delete it->second;
+ it->second=0;
// -> gotMessage -> abortEPG
break;
}
default: // ignore all other events
return;
}
- it->second->prevChannelState = state;
+ if (it->second)
+ it->second->prevChannelState = state;
}
}
}
#ifdef ENABLE_PRIVATE_EPG
CONNECT(startPrivateTimer.timeout, eEPGCache::channel_data::startPrivateReader);
#endif
+ pthread_mutex_init(&channel_active, 0);
}
bool eEPGCache::channel_data::finishEPG()
void eEPGCache::channel_data::startChannel()
{
+ pthread_mutex_lock(&channel_active);
updateMap::iterator It = cache->channelLastUpdated.find( channel->getChannelID() );
int update = ( It != cache->channelLastUpdated.end() ? ( UPDATE_INTERVAL - ( (eDVBLocalTimeHandler::getInstance()->nowTime()-It->second) * 1000 ) ) : ZAP_DELAY );
if (m_PrivateConn)
m_PrivateConn=0;
#endif
+ pthread_mutex_unlock(&channel_active);
}
void eEPGCache::channel_data::readData( const __u8 *data)
DECLARE_REF(eEPGCache)
struct channel_data: public Object
{
+ pthread_mutex_t channel_active;
channel_data(eEPGCache*);
eEPGCache *cache;
eTimer abortTimer, zapTimer;
std::set<__u8> seenPrivateSections;
void readPrivateData(const __u8 *data);
void startPrivateReader();
- bool canDelete() { return !isRunning && !m_PrivateConn; }
-#else
- bool canDelete() { return !isRunning; }
#endif
#ifdef ENABLE_MHW_EPG
std::vector<mhw_channel_name_t> m_channels;