mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 08:21:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

zapit/src/zapit.cpp: use CMD_ZAPTO_EPG to call ZapForEpg();

Browse Source 
do not lock frontends in ZapForEpg() for standby mode
This commit is contained in:
[CST] Focus
2013-10-10 18:49:41 +04:00
parent 4ac5c40c5f
commit 7c20ba490b
2 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/zapit/include/zapit/zapit.h
View File

@@ -212,7 +212,7 @@ class CZapit : public OpenThreads::Thread
bool ParseCommand(CBasicMessage::Header &rmsg, int connfd); bool ParseCommand(CBasicMessage::Header &rmsg, int connfd);
bool ZapIt(const t_channel_id channel_id, bool for_update = false, bool startplayback = true); bool ZapIt(const t_channel_id channel_id, bool for_update = false, bool startplayback = true);
bool ZapForRecord(const t_channel_id channel_id); bool ZapForRecord(const t_channel_id channel_id);
bool ZapForEpg(const t_channel_id channel_id); bool ZapForEpg(const t_channel_id channel_id, bool standby);
bool ChangeAudioPid(uint8_t index); bool ChangeAudioPid(uint8_t index);
void SetRadioMode(); void SetRadioMode();
void SetTVMode(); void SetTVMode();

47
src/zapit/src/zapit.cpp
View File

@@ -681,7 +681,7 @@ bool CZapit::ZapForRecord(const t_channel_id channel_id)
return true; return true;
} }
bool CZapit::ZapForEpg(const t_channel_id channel_id) bool CZapit::ZapForEpg(const t_channel_id channel_id, bool instandby)
{ {
CZapitChannel* newchannel; CZapitChannel* newchannel;
bool transponder_change; bool transponder_change;
@@ -695,24 +695,35 @@ bool CZapit::ZapForEpg(const t_channel_id channel_id)
/* executed async in zapit thread, race possible with record lock/allocate */ /* executed async in zapit thread, race possible with record lock/allocate */
CFEManager::getInstance()->Lock(); CFEManager::getInstance()->Lock();
CFEManager::getInstance()->lockFrontend(live_fe); /* no need to lock fe in standby mode,
epg scan should care to not call this if recording running */
if (!instandby) {
CFEManager::getInstance()->lockFrontend(live_fe);
#ifdef ENABLE_PIP #ifdef ENABLE_PIP
if (pip_fe && pip_fe != live_fe) if (pip_fe && pip_fe != live_fe)
CFEManager::getInstance()->lockFrontend(pip_fe); CFEManager::getInstance()->lockFrontend(pip_fe);
#endif #endif
}
CFrontend * frontend = CFEManager::getInstance()->allocateFE(newchannel); CFrontend * frontend = CFEManager::getInstance()->allocateFE(newchannel);
CFEManager::getInstance()->unlockFrontend(live_fe); if (!instandby) {
CFEManager::getInstance()->unlockFrontend(live_fe);
#ifdef ENABLE_PIP #ifdef ENABLE_PIP
if (pip_fe && pip_fe != live_fe) if (pip_fe && pip_fe != live_fe)
CFEManager::getInstance()->unlockFrontend(pip_fe); CFEManager::getInstance()->unlockFrontend(pip_fe);
#endif #endif
}
CFEManager::getInstance()->Unlock(); CFEManager::getInstance()->Unlock();
if(frontend == NULL) { if(frontend == NULL) {
ERROR("Cannot get frontend\n"); ERROR("Cannot get frontend\n");
return false; return false;
} }
/* sort of hack. epg scan in standby can use any frontend,
and break check in record code ie */
if (instandby)
live_channel_id = newchannel->getChannelID();
if(!TuneChannel(frontend, newchannel, transponder_change, false)) if(!TuneChannel(frontend, newchannel, transponder_change, false))
return false; return false;
#if 0 #if 0
@@ -1021,15 +1032,6 @@ bool CZapit::ParseCommand(CBasicMessage::Header &rmsg, int connfd)
else if(msgZaptoServiceID.pip) else if(msgZaptoServiceID.pip)
msgResponseZapComplete.zapStatus = StartPip(msgZaptoServiceID.channel_id); msgResponseZapComplete.zapStatus = StartPip(msgZaptoServiceID.channel_id);
#endif #endif
else if(msgZaptoServiceID.epg) {
msgResponseZapComplete.zapStatus = 0;
CBasicServer::send_data(connfd, &msgResponseZapComplete, sizeof(msgResponseZapComplete));
bool ret = ZapForEpg(msgZaptoServiceID.channel_id);
if (!ret)
msgZaptoServiceID.channel_id = 0;
SendEvent(CZapitClient::EVT_BACK_ZAP_COMPLETE, &msgZaptoServiceID.channel_id, sizeof(t_channel_id));
break;
}
else else
msgResponseZapComplete.zapStatus = ZapTo(msgZaptoServiceID.channel_id, (rmsg.cmd == CZapitMessages::CMD_ZAPTO_SUBSERVICEID)); msgResponseZapComplete.zapStatus = ZapTo(msgZaptoServiceID.channel_id, (rmsg.cmd == CZapitMessages::CMD_ZAPTO_SUBSERVICEID));
@@ -1037,6 +1039,19 @@ bool CZapit::ParseCommand(CBasicMessage::Header &rmsg, int connfd)
break; break;
} }
case CZapitMessages::CMD_ZAPTO_EPG:
{
CZapitMessages::responseZapComplete msgResponseZapComplete;
CZapitMessages::commandZaptoEpg msg;
CBasicServer::receive_data(connfd, &msg, sizeof(msg));
msgResponseZapComplete.zapStatus = 0;
CBasicServer::send_data(connfd, &msgResponseZapComplete, sizeof(msgResponseZapComplete));
bool ret = ZapForEpg(msg.channel_id, msg.standby);
if (!ret)
msg.channel_id = 0;
SendEvent(CZapitClient::EVT_BACK_ZAP_COMPLETE, &msg.channel_id, sizeof(t_channel_id));
break;
}
case CZapitMessages::CMD_ZAPTO_SERVICEID_NOWAIT: case CZapitMessages::CMD_ZAPTO_SERVICEID_NOWAIT:
case CZapitMessages::CMD_ZAPTO_SUBSERVICEID_NOWAIT: { case CZapitMessages::CMD_ZAPTO_SUBSERVICEID_NOWAIT: {
CZapitMessages::commandZaptoServiceID msgZaptoServiceID; CZapitMessages::commandZaptoServiceID msgZaptoServiceID;