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

Merge remote-tracking branch 'test/cst-next'

Browse Source 
Conflicts:
	src/gui/osdlang_setup.cpp
This commit is contained in:
Stefan Seyfried
2015-02-19 14:10:26 +01:00
parent 51bbb756e8 d1ca82ab44
commit 48fdfc5e5e
23 changed files with 86 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/driver/rcinput.cpp
View File

@@ -646,7 +646,7 @@ void CRCInput::getMsg_us(neutrino_msg_t * msg, neutrino_msg_data_t * data, uint6
#ifdef KEYBOARD_INSTEAD_OF_REMOTE_CONTROL
if (FD_ISSET(fd_keyb, &rfds))
{
int trkey;
uint32_t trkey;
char key = 0;
read(fd_keyb, &key, sizeof(key));

6
src/driver/scanepg.cpp
View File

@@ -337,8 +337,10 @@ void CEpgScan::EnterStandby()
void CEpgScan::Next()
{
bool llocked = false, plocked = false;
bool llocked = false;
#ifdef ENABLE_PIP
bool plocked = false;
#endif
next_chid = 0;
if (!standby && CNeutrinoApp::getInstance()->getMode() == NeutrinoMessages::mode_standby)