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

Merge remote-tracking branch 'tuxbox/master'

Browse Source 
* needs compile fixes
* needs additional tests, of course :-)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 13ab1ebc8a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2016-10-22 11:37:40 +02:00
parent c0910d6be4 a41206902f
commit 3f75ef5f47
346 changed files with 13372 additions and 6088 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/driver/rcinput.cpp
View File

@@ -328,7 +328,8 @@ int CRCInput::messageLoop( bool anyKeyCancels, int timeout )
( msg == CRCInput::RC_home ) ||
( msg == CRCInput::RC_ok ) )
doLoop = false;
else if((msg == CRCInput::RC_sat) || (msg == CRCInput::RC_favorites)) {
else if (CNeutrinoApp::getInstance()->listModeKey(msg)) {
// do nothing
}
else
{
@@ -881,6 +882,16 @@ void CRCInput::getMsg_us(neutrino_msg_t * msg, neutrino_msg_data_t * data, uint6
*msg = NeutrinoMessages::EVT_SET_VOLUME;
*data = *(char*) p;
break;
case NeutrinoMessages::RECORD_START :
*msg = NeutrinoMessages::RECORD_START;
*data = (unsigned long) p;
dont_delete_p = true;
break;
case NeutrinoMessages::RECORD_STOP :
*msg = NeutrinoMessages::RECORD_STOP;
*data = (unsigned long) p;
dont_delete_p = true;
break;
default:
printf("[neutrino] event INITID_HTTPD - unknown eventID 0x%x\n", emsg.eventID );
}
@@ -1181,7 +1192,7 @@ void CRCInput::getMsg_us(neutrino_msg_t * msg, neutrino_msg_data_t * data, uint6
case NeutrinoMessages::EVT_NEXTEPG:
{
CSectionsdClient::CurrentNextInfo *cn = (CSectionsdClient::CurrentNextInfo *) p;
delete cn;
delete [] cn;
p = NULL;
break;
}