mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 16:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'check/next-cc'

Browse Source
This commit is contained in:
Stefan Seyfried
2014-01-05 18:31:31 +01:00
parent 1cf6ff39e4 c79c3e7cd7
commit 56a7262d5d
28 changed files with 563 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/neutrino.cpp
View File

@@ -110,6 +110,7 @@
#include <system/setting_helpers.h>
#include <system/settings.h>
#include <system/helpers.h>
#include <system/sysload.h>
#include <timerdclient/timerdmsg.h>
@@ -809,10 +810,10 @@ int CNeutrinoApp::loadSetup(const char * fname)
//-------------------------------------------
// this is as the current neutrino usermen
const char* usermenu_default[SNeutrinoSettings::BUTTON_MAX]={
"2,3,4,13", // RED
"6", // GREEN
"7", // YELLOW
"12,11,20,21,19,14,15" // BLUE
"2,3,4,13", // RED
"6", // GREEN
"7", // YELLOW
"12,11,20,21,19,14,15" // BLUE
};
char txt1[81];
std::string txt2;
@@ -2085,6 +2086,8 @@ fprintf(stderr, "[neutrino start] %d -> %5ld ms\n", __LINE__, time_monotonic_ms
g_audioMute->AudioMute(current_muted, true);
SHTDCNT::getInstance()->init();
cSysLoad::getInstance();
TIMER_STOP("################################## after all ##################################");
RealRun(personalize.getWidget(0)/**main**/);