mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-30 17:01:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make CISendMessage CS specific and make it static while at it. It is

Browse Source 
not used elsewhere.
Exchange header from init_cs.h to cs_api.h.
Use new API functions to init and register messenger to CS specific
parts.



git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@593 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
nightshad
2010-05-20 09:37:37 +00:00
parent ef636b89c1
commit 26d5f2e5dc
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/neutrino.cpp
View File

@@ -126,7 +126,7 @@
#include <timerdclient/timerdmsg.h> #include <timerdclient/timerdmsg.h>
#include <zapit/satconfig.h> #include <zapit/satconfig.h>
#include <init_cs.h> #include <cs_api.h>
#include <video_cs.h> #include <video_cs.h>
#include <audio_cs.h> #include <audio_cs.h>
#include <zapit/frontend_c.h> #include <zapit/frontend_c.h>
@@ -2345,16 +2345,18 @@ CPipSetup * g_Pip0;
extern CVideoSettings * videoSettings; extern CVideoSettings * videoSettings;
//extern CMenuOptionStringChooser* tzSelect; //extern CMenuOptionStringChooser* tzSelect;
void CISendMessage(uint32_t msg, uint32_t data) static void CSSendMessage(uint32_t msg, uint32_t data)
{ {
g_RCInput->postMsg(msg, data); if (g_RCInput)
g_RCInput->postMsg(msg, data);
} }
int CNeutrinoApp::run(int argc, char **argv) int CNeutrinoApp::run(int argc, char **argv)
{ {
CmdParser(argc, argv); CmdParser(argc, argv);
init_cs_api(); cs_api_init();
cs_register_messenger(CSSendMessage);
CHintBox * hintBox; CHintBox * hintBox;
@@ -2646,7 +2648,6 @@ int CNeutrinoApp::run(int argc, char **argv)
hintBox->hide(); hintBox->hide();
delete hintBox; delete hintBox;
cDvbCi::getInstance()->SetHook(CISendMessage);
RealRun(mainMenu); RealRun(mainMenu);
ExitRun(true); ExitRun(true);
@@ -4746,7 +4747,8 @@ void stop_daemons(bool stopall)
powerManager->Close(); powerManager->Close();
delete powerManager; delete powerManager;
} }
shutdown_cs_api(); cs_deregister_messenger();
cs_api_exit();
} }
} }