src/neutrino.cpp:-fix zapto timer in TimeshiftOnly mode or if haveFreeFrontend

Origin commit data
------------------
Branch: ni/coolstream
Commit: 294f0876c0
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-10-30 (Tue, 30 Oct 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2012-10-30 20:43:52 +01:00
parent 3df02e3741
commit 4a6289ebac

View File

@@ -2627,20 +2627,24 @@ _repeat:
#endif #endif
return res; return res;
} }
else if( msg == NeutrinoMessages::ZAPTO) { else if( msg == NeutrinoMessages::ZAPTO) {
CTimerd::EventInfo * eventinfo = (CTimerd::EventInfo *) data; CTimerd::EventInfo * eventinfo = (CTimerd::EventInfo *) data;
if(recordingstatus==0) { if (eventinfo->channel_id != CZapit::getInstance()->GetCurrentChannelID()){
bool isTVMode = CServiceManager::getInstance()->IsChannelTVChannel(eventinfo->channel_id); /* FIXME zapto if recordingstatus == 1 && haveFreeFrontend == 0 on same transponder and check for twin box in loop and independet mode */
if( (recordingstatus == 0) || (recordingstatus && CRecordManager::getInstance()->TimeshiftOnly()) || (recordingstatus && CFEManager::getInstance()->haveFreeFrontend()) ) {
bool isTVMode = CServiceManager::getInstance()->IsChannelTVChannel(eventinfo->channel_id);
dvbsub_stop(); dvbsub_stop();
if ((!isTVMode) && (mode != mode_radio)) { if ((!isTVMode) && (mode != mode_radio)) {
radioMode(false); radioMode(false);
}
else if (isTVMode && (mode != mode_tv)) {
tvMode(false);
}
channelList->zapTo_ChannelID(eventinfo->channel_id);
} }
else if (isTVMode && (mode != mode_tv)) {
tvMode(false);
}
channelList->zapTo_ChannelID(eventinfo->channel_id);
} }
delete[] (unsigned char*) data; delete[] (unsigned char*) data;
return messages_return::handled; return messages_return::handled;