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

gui/channellist.cpp: fix key pass to neutrino,

Browse Source 
after commit 14b5dda71c


Origin commit data
------------------
Branch: ni/coolstream
Commit: e61a66e4d6
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-11 (Sat, 11 Oct 2014)



------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2014-10-11 15:49:43 +04:00
parent e4f74753ee
commit 5554be03d0
1 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/gui/channellist.cpp
View File

@@ -697,11 +697,13 @@ int CChannelList::show()
loop = false; loop = false;
} }
} }
else if (!edit_state && (msg == CRCInput::RC_sat || msg == CRCInput::RC_favorites)) { else if (msg == CRCInput::RC_sat || msg == CRCInput::RC_favorites) {
int newmode = msg == CRCInput::RC_sat ? LIST_MODE_SAT : LIST_MODE_FAV; if (!edit_state) {
CNeutrinoApp::getInstance()->SetChannelMode(newmode); int newmode = msg == CRCInput::RC_sat ? LIST_MODE_SAT : LIST_MODE_FAV;
res = CHANLIST_CHANGE_MODE; CNeutrinoApp::getInstance()->SetChannelMode(newmode);
loop = false; res = CHANLIST_CHANGE_MODE;
loop = false;
}
} }
else if (!edit_state && msg == CRCInput::RC_setup) { else if (!edit_state && msg == CRCInput::RC_setup) {
fader.StopFade(); fader.StopFade();
@@ -765,17 +767,19 @@ int CChannelList::show()
dont_hide = true; dont_hide = true;
} }
} }
else if (!empty && msg == CRCInput::RC_ok ) { else if (msg == CRCInput::RC_ok ) {
if (move_state == beMoving) { if (!empty) {
finishMoveChannel(); if (move_state == beMoving) {
} else if (edit_state) { finishMoveChannel();
zapTo(selected); } else if (edit_state) {
actzap = true; zapTo(selected);
oldselected = selected; actzap = true;
paint(); // refresh zapped vs selected oldselected = selected;
} else if(SameTP()) { paint(); // refresh zapped vs selected
zapOnExit = true; } else if(SameTP()) {
loop=false; zapOnExit = true;
loop=false;
}
} }
} }
else if (!edit_state && ( msg == CRCInput::RC_spkr ) && new_zap_mode ) { else if (!edit_state && ( msg == CRCInput::RC_spkr ) && new_zap_mode ) {
@@ -836,11 +840,13 @@ int CChannelList::show()
} }
} }
} }
else if(!edit_state && CRCInput::isNumeric(msg)) { else if(CRCInput::isNumeric(msg)) {
//pushback key if... if (!edit_state) {
selected = oldselected; //pushback key if...
g_RCInput->postMsg( msg, data ); selected = oldselected;
loop = false; g_RCInput->postMsg( msg, data );
loop = false;
}
} }
else if (!empty && !edit_state && msg == CRCInput::RC_blue ) else if (!empty && !edit_state && msg == CRCInput::RC_blue )
{ {
@@ -899,7 +905,7 @@ int CChannelList::show()
paintHead(); paintHead();
paint(); paint();
} else if (msg > CRCInput::RC_MaxRC) { } else {
if ( CNeutrinoApp::getInstance()->handleMsg( msg, data ) & messages_return::cancel_all ) { if ( CNeutrinoApp::getInstance()->handleMsg( msg, data ) & messages_return::cancel_all ) {
loop = false; loop = false;
res = CHANLIST_CANCEL_ALL; res = CHANLIST_CANCEL_ALL;