mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 16:31:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

src/gui/channellist.cpp: stop RECMODE_TSHIFT in play mode

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: abea6d83d6
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-08-19 (Wed, 19 Aug 2015)


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

------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2015-08-19 17:58:08 +02:00
parent 955c4f222a
commit 87cbe1b226
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/gui/channellist.cpp
View File

@@ -656,17 +656,23 @@ int CChannelList::show()
} }
} }
else if(!edit_state && !empty && msg == CRCInput::RC_stop ) { //stop recording else if(!edit_state && !empty && msg == CRCInput::RC_stop ) { //stop recording
//if(CRecordManager::getInstance()->RecordingStatus((*chanlist)[selected]->getChannelID())) if(CRecordManager::getInstance()->RecordingStatus((*chanlist)[selected]->getChannelID())){
int recmode = CRecordManager::getInstance()->GetRecordMode((*chanlist)[selected]->getChannelID()); int recmode = CRecordManager::getInstance()->GetRecordMode((*chanlist)[selected]->getChannelID());
bool timeshift = recmode & CRecordManager::RECMODE_TSHIFT; bool timeshift = recmode & CRecordManager::RECMODE_TSHIFT;
bool tsplay = CMoviePlayerGui::getInstance().timeshift; bool tsplay = CMoviePlayerGui::getInstance().timeshift;
if (recmode && !(timeshift && tsplay)) if (recmode && !(timeshift && tsplay))
{
if (CRecordManager::getInstance()->AskToStop((*chanlist)[selected]->getChannelID()))
{ {
CRecordManager::getInstance()->Stop((*chanlist)[selected]->getChannelID()); if (CRecordManager::getInstance()->AskToStop((*chanlist)[selected]->getChannelID()))
calcSize(); {
paintBody(); CRecordManager::getInstance()->Stop((*chanlist)[selected]->getChannelID());
calcSize();
paintBody();
}
}else{
// stop TSHIFT: go to play mode
g_RCInput->postMsg (msg, data);
res = CHANLIST_CANCEL_ALL;
loop = false;
} }
} }
} }