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

Remove global c_SMSKeyInput

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1915 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: a73ea424b9
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2011-11-26 (Sat, 26 Nov 2011)
This commit is contained in:
[CST] Focus
2011-11-26 11:28:17 +00:00
parent 385e644233
commit 70204c7dce
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/channellist.cpp
View File

@@ -70,7 +70,6 @@
extern CBouquetList * bouquetList; /* neutrino.cpp */ extern CBouquetList * bouquetList; /* neutrino.cpp */
extern CRemoteControl * g_RemoteControl; /* neutrino.cpp */ extern CRemoteControl * g_RemoteControl; /* neutrino.cpp */
extern SMSKeyInput * c_SMSKeyInput;
extern CPictureViewer * g_PicViewer; extern CPictureViewer * g_PicViewer;
extern CBouquetList * TVbouquetList; extern CBouquetList * TVbouquetList;
extern CBouquetList * TVsatList; extern CBouquetList * TVsatList;
@@ -832,10 +831,11 @@ int CChannelList::show()
} }
else if(g_settings.sms_channel) { else if(g_settings.sms_channel) {
unsigned char smsKey = 0; unsigned char smsKey = 0;
c_SMSKeyInput->setTimeout(CHANNEL_SMSKEY_TIMEOUT); SMSKeyInput smsInput;
smsInput.setTimeout(CHANNEL_SMSKEY_TIMEOUT);
do { do {
smsKey = c_SMSKeyInput->handleMsg(msg); smsKey = smsInput.handleMsg(msg);
//printf("SMS new key: %c\n", smsKey); //printf("SMS new key: %c\n", smsKey);
g_RCInput->getMsg_ms(&msg, &data, CHANNEL_SMSKEY_TIMEOUT-100); g_RCInput->getMsg_ms(&msg, &data, CHANNEL_SMSKEY_TIMEOUT-100);
} while ((msg >= CRCInput::RC_1) && (msg <= CRCInput::RC_9)); } while ((msg >= CRCInput::RC_1) && (msg <= CRCInput::RC_9));
@@ -872,7 +872,7 @@ int CChannelList::show()
showChannelLogo(); showChannelLogo();
} }
} }
c_SMSKeyInput->resetOldKey(); smsInput.resetOldKey();
} }
} }
} }

2
src/neutrino.cpp
View File

@@ -224,7 +224,6 @@ CBouquetList * RADIOallList;
CPlugins * g_PluginList; CPlugins * g_PluginList;
CRemoteControl * g_RemoteControl; CRemoteControl * g_RemoteControl;
SMSKeyInput * c_SMSKeyInput;
CPictureViewer * g_PicViewer; CPictureViewer * g_PicViewer;
CCAMMenuHandler * g_CamHandler; CCAMMenuHandler * g_CamHandler;
@@ -1849,7 +1848,6 @@ int CNeutrinoApp::run(int argc, char **argv)
dprintf( DEBUG_NORMAL, "menue setup\n"); dprintf( DEBUG_NORMAL, "menue setup\n");
c_SMSKeyInput = new SMSKeyInput();
//Main settings //Main settings
CMenuWidget mainMenu (LOCALE_MAINMENU_HEAD , NEUTRINO_ICON_MAINMENU/*, 22*/); CMenuWidget mainMenu (LOCALE_MAINMENU_HEAD , NEUTRINO_ICON_MAINMENU/*, 22*/);
CMenuWidget mainSettings (LOCALE_MAINSETTINGS_HEAD , NEUTRINO_ICON_SETTINGS); CMenuWidget mainSettings (LOCALE_MAINSETTINGS_HEAD , NEUTRINO_ICON_SETTINGS);