CMiscMenue: add entry for temporarily debug mode settings

Option "Level" overwrites assigned debug level output mode of Neutrino
start parameters, but only temporarily till change of options by user
or restart of Neutrino.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8a8748c5e7
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-03-08 (Sat, 08 Mar 2014)



------------------
This commit was generated by Migit
This commit is contained in:
2014-03-08 22:38:12 +01:00
parent a2176524d2
commit bae0f14f3f
8 changed files with 53 additions and 4 deletions

View File

@@ -317,6 +317,11 @@ date.Sun So
date.Thu Do date.Thu Do
date.Tue Di date.Tue Di
date.Wed Mi date.Wed Mi
debug Debug Ausgabe
debug.level Stufe
debug.level_1 normal
debug.level_2 informativ
debug.level_3 ausführlich
epg.saving Speichere EPG epg.saving Speichere EPG
epgextended.actors Darsteller epgextended.actors Darsteller
epgextended.director Regie epgextended.director Regie

View File

@@ -317,6 +317,11 @@ date.Sun Sun
date.Thu Thu date.Thu Thu
date.Tue Tue date.Tue Tue
date.Wed Wed date.Wed Wed
debug Debug Output
debug.level Level
debug.level_1 normal
debug.level_2 informative
debug.level_3 verbose
epg.saving Saving EPG epg.saving Saving EPG
epgextended.actors Actors epgextended.actors Actors
epgextended.director Director epgextended.director Director

View File

@@ -314,6 +314,11 @@ date.Sun Zo
date.Thu Do date.Thu Do
date.Tue Di date.Tue Di
date.Wed Wo date.Wed Wo
debug Debug Output
debug.level Level
debug.level_1 normaal
debug.level_2 informatieve
debug.level_3 verbose
epg.saving Opslaan EPG epg.saving Opslaan EPG
epgextended.actors Acteurs epgextended.actors Acteurs
epgextended.director Regisseur epgextended.director Regisseur

View File

@@ -316,6 +316,11 @@ date.Sun Ne
date.Thu Št date.Thu Št
date.Tue Ut date.Tue Ut
date.Wed St date.Wed St
debug Debug Output
debug.level Rovina
debug.level_1 normálne
debug.level_2 informatívny
debug.level_3 detail
epg.saving Uloženie EPG epg.saving Uloženie EPG
epgextended.actors Herci epgextended.actors Herci
epgextended.director Režisér epgextended.director Režisér

View File

@@ -35,7 +35,7 @@
#include <neutrino_menue.h> #include <neutrino_menue.h>
#include <system/setting_helpers.h> #include <system/setting_helpers.h>
#include <system/helpers.h> #include <system/helpers.h>
#include <system/debug.h>
#include <gui/miscsettings_menu.h> #include <gui/miscsettings_menu.h>
#include <gui/cec_setup.h> #include <gui/cec_setup.h>
#include <gui/filebrowser.h> #include <gui/filebrowser.h>
@@ -312,6 +312,13 @@ int CMiscMenue::showMiscSettingsMenu()
return res; return res;
} }
const CMenuOptionChooser::keyval DEBUG_MODE_OPTIONS[DEBUG_MODES] =
{
{ DEBUG_NORMAL , LOCALE_DEBUG_LEVEL_1 },
{ DEBUG_INFO , LOCALE_DEBUG_LEVEL_2 },
{ DEBUG_DEBUG , LOCALE_DEBUG_LEVEL_3 }
};
//general settings //general settings
void CMiscMenue::showMiscSettingsMenuGeneral(CMenuWidget *ms_general) void CMiscMenue::showMiscSettingsMenuGeneral(CMenuWidget *ms_general)
{ {
@@ -347,6 +354,12 @@ void CMiscMenue::showMiscSettingsMenuGeneral(CMenuWidget *ms_general)
mf = new CMenuForwarder(LOCALE_MPKEY_PLUGIN, true, g_settings.movieplayer_plugin, this, "movieplayer_plugin"); mf = new CMenuForwarder(LOCALE_MPKEY_PLUGIN, true, g_settings.movieplayer_plugin, this, "movieplayer_plugin");
mf->setHint("", LOCALE_MENU_HINT_MOVIEPLAYER_PLUGIN); mf->setHint("", LOCALE_MENU_HINT_MOVIEPLAYER_PLUGIN);
ms_general->addItem(mf); ms_general->addItem(mf);
//set debug level
ms_general->addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_DEBUG));
CMenuOptionChooser * md = new CMenuOptionChooser(LOCALE_DEBUG_LEVEL, &debug, DEBUG_MODE_OPTIONS, DEBUG_MODES, true);
// mc->setHint("", LOCALE_MENU_HINT_START_TOSTANDBY);
ms_general->addItem(md);
} }
#define VIDEOMENU_HDMI_CEC_MODE_OPTION_COUNT 2 #define VIDEOMENU_HDMI_CEC_MODE_OPTION_COUNT 2

View File

@@ -27,9 +27,15 @@
extern int debug; extern int debug;
#define DEBUG_NORMAL 0 enum
#define DEBUG_INFO 1 {
#define DEBUG_DEBUG 2 DEBUG_NORMAL , // 0
DEBUG_INFO , // 1
DEBUG_DEBUG , // 2
DEBUG_MODES // 3 count of available modes
};
void setDebugLevel( int level ); void setDebugLevel( int level );

View File

@@ -344,6 +344,11 @@ typedef enum
LOCALE_DATE_THU, LOCALE_DATE_THU,
LOCALE_DATE_TUE, LOCALE_DATE_TUE,
LOCALE_DATE_WED, LOCALE_DATE_WED,
LOCALE_DEBUG,
LOCALE_DEBUG_LEVEL,
LOCALE_DEBUG_LEVEL_1,
LOCALE_DEBUG_LEVEL_2,
LOCALE_DEBUG_LEVEL_3,
LOCALE_EPG_SAVING, LOCALE_EPG_SAVING,
LOCALE_EPGEXTENDED_ACTORS, LOCALE_EPGEXTENDED_ACTORS,
LOCALE_EPGEXTENDED_DIRECTOR, LOCALE_EPGEXTENDED_DIRECTOR,

View File

@@ -344,6 +344,11 @@ const char * locale_real_names[] =
"date.Thu", "date.Thu",
"date.Tue", "date.Tue",
"date.Wed", "date.Wed",
"debug",
"debug.level",
"debug.level_1",
"debug.level_2",
"debug.level_3",
"epg.saving", "epg.saving",
"epgextended.actors", "epgextended.actors",
"epgextended.director", "epgextended.director",