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

CVFD: make ShowText() use const char* to avoid ugly casts

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: e16b75b53d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-06-19 (Sun, 19 Jun 2011)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2011-06-19 20:26:11 +00:00
parent cb7db6381f
commit 06009ddb17
4 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/neutrino.cpp
View File

@@ -2074,7 +2074,7 @@ int CNeutrinoApp::run(int argc, char **argv)
CVFD::getInstance()->init(font.filename, font.name);
CVFD::getInstance()->Clear();
CVFD::getInstance()->ShowText((char *) g_Locale->getText(LOCALE_NEUTRINO_STARTING));
CVFD::getInstance()->ShowText(g_Locale->getText(LOCALE_NEUTRINO_STARTING));
//zapit start parameters
Z_start_arg ZapStart_arg;
@@ -3517,7 +3517,7 @@ void CNeutrinoApp::ExitRun(const bool /*write_si*/, int retcode)
printf("entering off state\n");
mode = mode_off;
//CVFD::getInstance()->ShowText((char *) g_Locale->getText(LOCALE_MAINMENU_SHUTDOWN));
//CVFD::getInstance()->ShowText(g_Locale->getText(LOCALE_MAINMENU_SHUTDOWN));
system("/etc/init.d/rcK");
system("/bin/sync");
@@ -3624,7 +3624,7 @@ void CNeutrinoApp::ExitRun(const bool /*write_si*/, int retcode)
funNotifier->changeNotify(NONEXISTANT_LOCALE, (void *) &fspeed);
delete funNotifier;
}
//CVFD::getInstance()->ShowText((char *) g_Locale->getText(LOCALE_MAINMENU_REBOOT));
//CVFD::getInstance()->ShowText(g_Locale->getText(LOCALE_MAINMENU_REBOOT));
delete frameBuffer;
#if 0 /* FIXME this next hack to test, until we find real crash on exit reason */