Removed prescale_osd (replaced by osd_scaling)

3 files changed, 3 insertions, 10 deletions

diff --git a/config.c b/config.c
index e60d2e3b..70fd92d7 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'xineliboutput.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c,v 1.59 2008-04-13 22:14:31 phintuka Exp $
+ * $Id: config.c,v 1.60 2008-04-13 22:37:52 phintuka Exp $
  *
  */
 
@@ -453,7 +453,6 @@ config_t::config_t() {
   osd_scaling          = OSD_SCALING_NEAREST;
   hud_osd              = 0;
 
-  prescale_osd         = 1;
   unscaled_osd         = 0;
   unscaled_osd_opaque  = 0;
   unscaled_osd_lowresvideo = 1;
@@ -688,7 +687,6 @@ bool config_t::SetupParse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "OSD.HideMainMenu"))   hide_main_menu = atoi(Value);
   else if (!strcasecmp(Name, "OSD.LayersVisible"))  osd_mixer = atoi(Value);
   else if (!strcasecmp(Name, "OSD.Scaling"))        osd_scaling = atoi(Value);
-  else if (!strcasecmp(Name, "OSD.Prescale"))       prescale_osd = atoi(Value);
   else if (!strcasecmp(Name, "OSD.UnscaledAlways")) unscaled_osd = atoi(Value);
   else if (!strcasecmp(Name, "OSD.UnscaledOpaque")) unscaled_osd_opaque = atoi(Value);
   else if (!strcasecmp(Name, "OSD.UnscaledLowRes")) unscaled_osd_lowresvideo = atoi(Value);
diff --git a/config.h b/config.h
index 68503d9c..ab0c58a5 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'xineliboutput.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h,v 1.43 2008-04-13 22:14:31 phintuka Exp $
+ * $Id: config.h,v 1.44 2008-04-13 22:37:52 phintuka Exp $
  *
  */
 
@@ -242,7 +242,6 @@ class config_t {
     int  osd_mixer;                // show multiple OSD layers
     int  osd_scaling;              // OSD scaling mode: off, nearest, bilinear
     int  hud_osd;                  // head up display OSD
-    int  prescale_osd;
     int  unscaled_osd;
     int  unscaled_osd_opaque;
     int  unscaled_osd_lowresvideo;
diff --git a/setup_menu.c b/setup_menu.c
index 36b410c9..0bbe7777 100644
--- a/setup_menu.c
+++ b/setup_menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'xineliboutput.c' for copyright information and
  * how to reach the author.
  *
- * $Id: setup_menu.c,v 1.51 2008-04-12 19:37:41 phintuka Exp $
+ * $Id: setup_menu.c,v 1.52 2008-04-13 22:37:53 phintuka Exp $
  *
  */
 
@@ -907,9 +907,6 @@ void cMenuSetupOSD::Set(void)
   Add(new cMenuEditStraI18nItem(tr("Show all layers"), &newconfig.osd_mixer, 
 			OSD_MIXER_count, xc.s_osdMixers));
 #endif
-  Add(ctrl_scale = 
-      new cMenuEditBoolItem(tr("Scale OSD to video size"), 
-			    &newconfig.prescale_osd));
   Add(ctrl_unscaled =
       new cMenuEditBoolItem(tr("Unscaled OSD (no transparency)"), 
 			    &newconfig.unscaled_osd));
@@ -1004,7 +1001,6 @@ void cMenuSetupOSD::Store(void)
   SetupStore("OSD.Scaling",         xc.osd_scaling);
   SetupStore("OSD.HideMainMenu",    xc.hide_main_menu);
   SetupStore("OSD.LayersVisible",   xc.osd_mixer);
-  SetupStore("OSD.Prescale",        xc.prescale_osd);
   SetupStore("OSD.UnscaledAlways",  xc.unscaled_osd);
   SetupStore("OSD.UnscaledOpaque", xc.unscaled_osd_opaque);
   SetupStore("OSD.UnscaledLowRes", xc.unscaled_osd_lowresvideo);