mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-30 00:41:17 +02:00
*neutrino channellist: style
- scope of some variables limited git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1692 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
@@ -321,7 +321,6 @@ int CChannelList::doChannelMenu(void)
|
|||||||
int select = -1;
|
int select = -1;
|
||||||
static int old_selected = 0;
|
static int old_selected = 0;
|
||||||
char cnt[5];
|
char cnt[5];
|
||||||
t_channel_id channel_id;
|
|
||||||
bool enabled = true;
|
bool enabled = true;
|
||||||
|
|
||||||
if(!bouquetList || g_settings.minimode)
|
if(!bouquetList || g_settings.minimode)
|
||||||
@@ -353,7 +352,7 @@ int CChannelList::doChannelMenu(void)
|
|||||||
if(select >= 0) {
|
if(select >= 0) {
|
||||||
signed int bouquet_id = 0, old_bouquet_id = 0, new_bouquet_id = 0;
|
signed int bouquet_id = 0, old_bouquet_id = 0, new_bouquet_id = 0;
|
||||||
old_selected = select;
|
old_selected = select;
|
||||||
channel_id = chanlist[selected]->channel_id;
|
t_channel_id channel_id = chanlist[selected]->channel_id;
|
||||||
switch(select) {
|
switch(select) {
|
||||||
case 0: {
|
case 0: {
|
||||||
hide();
|
hide();
|
||||||
@@ -786,8 +785,7 @@ int CChannelList::show()
|
|||||||
zapOnExit = true;
|
zapOnExit = true;
|
||||||
loop = false;
|
loop = false;
|
||||||
}
|
}
|
||||||
else if(g_settings.sms_channel) {
|
else if(g_settings.sms_channel) {
|
||||||
uint32_t i;
|
|
||||||
unsigned char smsKey = 0;
|
unsigned char smsKey = 0;
|
||||||
c_SMSKeyInput->setTimeout(CHANNEL_SMSKEY_TIMEOUT);
|
c_SMSKeyInput->setTimeout(CHANNEL_SMSKEY_TIMEOUT);
|
||||||
|
|
||||||
@@ -798,6 +796,7 @@ int CChannelList::show()
|
|||||||
} while ((msg >= CRCInput::RC_1) && (msg <= CRCInput::RC_9));
|
} while ((msg >= CRCInput::RC_1) && (msg <= CRCInput::RC_9));
|
||||||
|
|
||||||
if (msg == CRCInput::RC_timeout || msg == CRCInput::RC_nokey) {
|
if (msg == CRCInput::RC_timeout || msg == CRCInput::RC_nokey) {
|
||||||
|
uint32_t i;
|
||||||
for(i = selected+1; i < chanlist.size(); i++) {
|
for(i = selected+1; i < chanlist.size(); i++) {
|
||||||
char firstCharOfTitle = chanlist[i]->name.c_str()[0];
|
char firstCharOfTitle = chanlist[i]->name.c_str()[0];
|
||||||
if(tolower(firstCharOfTitle) == smsKey) {
|
if(tolower(firstCharOfTitle) == smsKey) {
|
||||||
|
Reference in New Issue
Block a user