summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Gmeiner <christian.gmeiner@gmail.com>2010-04-22 19:17:21 +0200
committerChristian Gmeiner <christian.gmeiner@gmail.com>2010-04-22 19:17:21 +0200
commita8d409f5f8b8f146bc9a97dc2979932839e2c2ff (patch)
tree7ddff48f6c5f62f6d1c7904ab4546057daf1ded0
parent02ee4c3361c1242a949e611cc48866c1f327c42d (diff)
downloadvdr-plugin-dxr3-a8d409f5f8b8f146bc9a97dc2979932839e2c2ff.tar.gz
vdr-plugin-dxr3-a8d409f5f8b8f146bc9a97dc2979932839e2c2ff.tar.bz2
remove setting to hide main menu
-rw-r--r--dxr3.c9
-rw-r--r--settings.h3
2 files changed, 2 insertions, 10 deletions
diff --git a/dxr3.c b/dxr3.c
index 93fefee..4af5e92 100644
--- a/dxr3.c
+++ b/dxr3.c
@@ -48,7 +48,6 @@ cMenuSetupDxr3::cMenuSetupDxr3()
#endif
newUseDigitalOut = cSettings::instance()->useDigitalOut();
Add(new cMenuEditBoolItem(tr("Digital audio output"), &newUseDigitalOut));
- newHideMenu = cSettings::instance()->hideMenu();
Add(new cMenuEditBoolItem(tr("Hide main menu entry"), &newHideMenu));
newDxr3Card = cSettings::instance()->card();
Add(new cMenuEditIntItem(tr("Card number"), &newDxr3Card, 0, DXR3_MAX_CARDS - 1));
@@ -80,7 +79,6 @@ void cMenuSetupDxr3::Store()
SetupStore("ForceLetterBox", cSettings::instance()->forceLetterBox(newForceLetterBox));
SetupStore("UseWSS", cSettings::instance()->useWss(newUseWSS));
SetupStore("UseDigitalOut", cSettings::instance()->useDigitalOut(newUseDigitalOut));
- SetupStore("HideMenu", cSettings::instance()->hideMenu(newHideMenu));
SetupStore("Dxr3Card", cSettings::instance()->card(newDxr3Card));
// emit
@@ -166,10 +164,6 @@ bool cPluginDxr3::SetupParse(const char *Name, const char *Value)
cSettings::instance()->useWss(atoi(Value));
return true;
}
- if (!strcasecmp(Name, "HideMenu")) {
- cSettings::instance()->hideMenu(atoi(Value));
- return true;
- }
if (!strcasecmp(Name, "Brightness")) {
cSettings::instance()->brightness(atoi(Value));
return true;
@@ -189,8 +183,7 @@ bool cPluginDxr3::SetupParse(const char *Name, const char *Value)
// ==================================
const char* cPluginDxr3::MainMenuEntry()
{
- return cSettings::instance()->hideMenu() ?
- NULL : tr(MAINMENUENTRY);
+ return NULL;
}
// ==================================
diff --git a/settings.h b/settings.h
index 81d3d00..d185564 100644
--- a/settings.h
+++ b/settings.h
@@ -75,7 +75,7 @@ class cSettings : public Singleton<cSettings>
public:
cSettings() : useDigitalOut(0), card(0), forceLetterBox(0), videoMode(PAL),
brightness(500), contrast(500), saturation(500),
- hideMenu(0), useWss(0), loadFirmware(false), audioDriver(OSS),
+ useWss(0), loadFirmware(false), audioDriver(OSS),
ac3AudioMode(PCM_ENCAPSULATION) {}
bool processArgs(int argc, char *argv[]);
@@ -89,7 +89,6 @@ public:
Accessors<int> contrast;
Accessors<int> saturation;
- Accessors<int> hideMenu;
Accessors<int> useWss;
Accessors<bool> loadFirmware;
Accessors<AudioDriver> audioDriver;