From 9f05f75a4b39c2ccc3658fd12ea96d96a8b2a6b5 Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Sat, 26 Nov 2011 11:28:17 +0000
Subject: [PATCH] Remove global c_SMSKeyInput

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: https://github.com/neutrino-images/ni-neutrino/commit/a73ea424b997ded3854c607307e8a0d7990bf77f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2011-11-26 (Sat, 26 Nov 2011)



------------------
This commit was generated by Migit
---
 src/gui/channellist.cpp | 8 ++++----
 src/neutrino.cpp        | 2 --
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp
index 3cb02e8cb..2b99c0e77 100644
--- a/src/gui/channellist.cpp
+++ b/src/gui/channellist.cpp
@@ -70,7 +70,6 @@
 
 extern CBouquetList * bouquetList;       /* neutrino.cpp */
 extern CRemoteControl * g_RemoteControl; /* neutrino.cpp */
-extern SMSKeyInput * c_SMSKeyInput;
 extern CPictureViewer * g_PicViewer;
 extern CBouquetList   * TVbouquetList;
 extern CBouquetList   * TVsatList;
@@ -832,10 +831,11 @@ int CChannelList::show()
 			}
 			else if(g_settings.sms_channel) { 				
 				unsigned char smsKey = 0;
-				c_SMSKeyInput->setTimeout(CHANNEL_SMSKEY_TIMEOUT);
+				SMSKeyInput smsInput;
+				smsInput.setTimeout(CHANNEL_SMSKEY_TIMEOUT);
 
 				do {
-					smsKey = c_SMSKeyInput->handleMsg(msg);
+					smsKey = smsInput.handleMsg(msg);
 					//printf("SMS new key: %c\n", smsKey);
 					g_RCInput->getMsg_ms(&msg, &data, CHANNEL_SMSKEY_TIMEOUT-100);
 				} while ((msg >= CRCInput::RC_1) && (msg <= CRCInput::RC_9));
@@ -872,7 +872,7 @@ int CChannelList::show()
 							showChannelLogo();
 						}
 					}
-					c_SMSKeyInput->resetOldKey();
+					smsInput.resetOldKey();
 				}
 			}
 		}
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index 1df283bf0..d8e85ba95 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -224,7 +224,6 @@ CBouquetList   * RADIOallList;
 
 CPlugins       * g_PluginList;
 CRemoteControl * g_RemoteControl;
-SMSKeyInput * c_SMSKeyInput;
 CPictureViewer * g_PicViewer;
 CCAMMenuHandler * g_CamHandler;
 
@@ -1849,7 +1848,6 @@ int CNeutrinoApp::run(int argc, char **argv)
 
 	dprintf( DEBUG_NORMAL, "menue setup\n");
 
-	c_SMSKeyInput = new SMSKeyInput();
 	//Main settings
 	CMenuWidget    mainMenu            (LOCALE_MAINMENU_HEAD                 , NEUTRINO_ICON_MAINMENU/*,   22*/);
 	CMenuWidget    mainSettings        (LOCALE_MAINSETTINGS_HEAD             , NEUTRINO_ICON_SETTINGS);