1 files changed, 55 insertions, 16 deletions

diff --git a/dxr3.c b/dxr3.c
index 9af376a..e821b36 100644
--- a/dxr3.c
+++ b/dxr3.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: dxr3.c,v 1.1.2.27 2006/06/08 15:10:01 scop Exp $
+ * $Id: dxr3.c,v 1.1.2.28 2007/04/03 15:37:14 scop Exp $
  *
  */
 
@@ -40,7 +40,8 @@ eOSState cDxr3OsdItem::ProcessKey(eKeys Key)
 	    break;
 
 	case DXR3_FORCE_LETTER_BOX:
-	    cDxr3ConfigData::Instance().SetForceLetterBox(!cDxr3ConfigData::Instance().GetForceLetterBox());
+	    cDxr3ConfigData::Instance().SetForceLetterBox(
+		!cDxr3ConfigData::Instance().GetForceLetterBox());
 	    break;
 
 	case DXR3_ANALOG_OUT:
@@ -58,7 +59,8 @@ eOSState cDxr3OsdItem::ProcessKey(eKeys Key)
 	    break;
 
 	case DXR3_AC3_OUT:
-	    cDxr3ConfigData::Instance().SetAc3OutPut(!cDxr3ConfigData::Instance().GetAc3OutPut());
+	    cDxr3ConfigData::Instance().SetAc3OutPut(
+		!cDxr3ConfigData::Instance().GetAc3OutPut());
 	    if (cDxr3Device::InstanceP())
 		cDxr3Device::InstanceP()->Reset();
 	    break;
@@ -72,38 +74,60 @@ eOSState cDxr3OsdItem::ProcessKey(eKeys Key)
 // setup menu
 cMenuSetupDxr3::cMenuSetupDxr3(void)
 {
-    newUseDigitalOut = cDxr3ConfigData::Instance().GetUseDigitalOut();
-    Add(new cMenuEditBoolItem(tr("Digital audio output"), &newUseDigitalOut));
-    newDxr3Card = cDxr3ConfigData::Instance().GetDxr3Card();
-    Add(new cMenuEditIntItem(tr("Card number"),
-			     &newDxr3Card, 0, DXR3_MAX_CARDS - 1));
+    newBrightness = cDxr3ConfigData::Instance().GetBrightness();
+    Add(new cMenuEditIntItem(tr("Brightness"),
+			     &newBrightness, 0, 999));
+    newContrast = cDxr3ConfigData::Instance().GetContrast();
+    Add(new cMenuEditIntItem(tr("Contrast"),
+			     &newContrast, 0, 999));
+    newSaturation = cDxr3ConfigData::Instance().GetSaturation();
+    Add(new cMenuEditIntItem(tr("Saturation"),
+			     &newSaturation, 0, 999));
     newVideoMode = (int) cDxr3ConfigData::Instance().GetVideoMode();
     menuVideoModes[0] = tr("PAL");
     menuVideoModes[1] = tr("PAL60");
     menuVideoModes[2] = tr("NTSC");
     Add(new cMenuEditStraItem(tr("Video mode"),
 			      &newVideoMode, 3, menuVideoModes));
-    newHideMenu = cDxr3ConfigData::Instance().GetHideMenu();
-    Add(new cMenuEditBoolItem(tr("Hide main menu entry"), &newHideMenu));
+    newUseDigitalOut = cDxr3ConfigData::Instance().GetUseDigitalOut();
+    Add(new cMenuEditBoolItem(tr("Digital audio output"), &newUseDigitalOut));
     newOsdFlushRate = cDxr3ConfigData::Instance().GetOsdFlushRate();
     Add(new cMenuEditIntItem(tr("OSD flush rate (ms)"),
 			     &newOsdFlushRate, 0, 255));
+    newHideMenu = cDxr3ConfigData::Instance().GetHideMenu();
+    Add(new cMenuEditBoolItem(tr("Hide main menu entry"), &newHideMenu));
+    newDxr3Card = cDxr3ConfigData::Instance().GetDxr3Card();
+    Add(new cMenuEditIntItem(tr("Card number"),
+			     &newDxr3Card, 0, DXR3_MAX_CARDS - 1));
 }
 
 // ==================================
 // save menu values
 void cMenuSetupDxr3::Store(void)
 {
-    SetupStore("UseDigitalOut",
-	       cDxr3ConfigData::Instance().SetUseDigitalOut(newUseDigitalOut));
-    SetupStore("Dxr3Card",
-	       cDxr3ConfigData::Instance().SetDxr3Card(newDxr3Card));
+    SetupStore("Brightness",
+	       cDxr3ConfigData::Instance().SetBrightness(newBrightness));
+    SetupStore("Contrast",
+	       cDxr3ConfigData::Instance().SetContrast(newContrast));
+    SetupStore("Saturation",
+	       cDxr3ConfigData::Instance().SetSaturation(newSaturation));
     SetupStore("Dxr3VideoMode",
 	       cDxr3ConfigData::Instance().SetVideoMode((eVideoMode) newVideoMode));
-    SetupStore("HideMenu",
-	       cDxr3ConfigData::Instance().SetHideMenu(newHideMenu));
+    SetupStore("UseDigitalOut",
+	       cDxr3ConfigData::Instance().SetUseDigitalOut(newUseDigitalOut));
     SetupStore("OsdFlushRate",
 	       cDxr3ConfigData::Instance().SetOsdFlushRate(newOsdFlushRate));
+    SetupStore("HideMenu",
+	       cDxr3ConfigData::Instance().SetHideMenu(newHideMenu));
+    SetupStore("Dxr3Card",
+	       cDxr3ConfigData::Instance().SetDxr3Card(newDxr3Card));
+
+    // Apply (some of the) settings
+    cDxr3Interface::Instance().SetBrightness(newBrightness);
+    cDxr3Interface::Instance().SetContrast(newContrast);
+    cDxr3Interface::Instance().SetSaturation(newSaturation);
+    if (cDxr3Device::InstanceP())
+	cDxr3Device::InstanceP()->Reset();
 }
 
 // ==================================
@@ -214,6 +238,21 @@ bool cPluginDxr3::SetupParse(const char *Name, const char *Value)
 	cDxr3ConfigData::Instance().SetOsdFlushRate(atoi(Value));
 	return true;
     }
+    if (!strcasecmp(Name, "Brightness"))
+    {
+	cDxr3ConfigData::Instance().SetBrightness(atoi(Value));
+	return true;
+    }
+    if (!strcasecmp(Name, "Contrast"))
+    {
+	cDxr3ConfigData::Instance().SetContrast(atoi(Value));
+	return true;
+    }
+    if (!strcasecmp(Name, "Saturation"))
+    {
+	cDxr3ConfigData::Instance().SetSaturation(atoi(Value));
+	return true;
+    }
 
     return false;
 }