Remove option to disable OSD downscaling (useless ...?)

8 files changed, 18 insertions, 51 deletions

diff --git a/config.c b/config.c
index ba937852..4d70725f 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.57 2008-03-28 22:17:17 phintuka Exp $
+ * $Id: config.c,v 1.58 2008-04-12 19:37:41 phintuka Exp $
  *
  */
 
@@ -454,7 +454,6 @@ config_t::config_t() {
   hud_osd              = 0;
 
   prescale_osd         = 1;
-  prescale_osd_downscale = 0;
   unscaled_osd         = 0;
   unscaled_osd_opaque  = 0;
   unscaled_osd_lowresvideo = 1;
@@ -695,7 +694,6 @@ bool config_t::SetupParse(const char *Name, const char *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.Downscale"))      prescale_osd_downscale = 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 bd8a382c..841963f1 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.41 2008-03-28 22:17:17 phintuka Exp $
+ * $Id: config.h,v 1.42 2008-04-12 19:37:41 phintuka Exp $
  *
  */
 
@@ -243,7 +243,6 @@ class config_t {
     int  osd_scaling;              // OSD scaling mode: off, nearest, bilinear
     int  hud_osd;                  // head up display OSD
     int  prescale_osd;
-    int  prescale_osd_downscale;
     int  unscaled_osd;
     int  unscaled_osd_opaque;
     int  unscaled_osd_lowresvideo;
diff --git a/device.c b/device.c
index 996fa7da..1cd903d1 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'xineliboutput.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c,v 1.55 2008-04-10 22:25:02 phelin Exp $
+ * $Id: device.c,v 1.56 2008-04-12 19:37:41 phintuka Exp $
  *
  */
 
@@ -414,14 +414,11 @@ void cXinelibDevice::MainThreadHook(void)
 // Configuration
 //
 
-void cXinelibDevice::ConfigureOSD(bool prescale_osd, bool unscaled_osd)
+void cXinelibDevice::ConfigureOSD(void)
 {
   TRACEF("cXinelibDevice::ConfigureOSD");
 
-  if(m_local)
-    m_local->ConfigureOSD(prescale_osd, unscaled_osd);
-  if(m_server)
-    m_server->ConfigureOSD(prescale_osd, unscaled_osd);
+  ForEach(m_clients, &cXinelibThread::ConfigureOSD);
 }
 
 void cXinelibDevice::ConfigurePostprocessing(const char *deinterlace_method, 
diff --git a/device.h b/device.h
index 6fcd8a6d..1aa02c81 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'xineliboutput.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h,v 1.32 2008-03-16 21:40:57 phintuka Exp $
+ * $Id: device.h,v 1.33 2008-04-12 19:37:41 phintuka Exp $
  *
  */
 
@@ -211,7 +211,7 @@ class cXinelibDevice : public cDevice
     cXinelibThread        *m_local;
 
   public:
-    void ConfigureOSD(bool prescale_osd, bool unscaled_osd);
+    void ConfigureOSD(void);
     void ConfigurePostprocessing(const char *deinterlace_method, 
 				 int audio_delay,
 				 int audio_compression, 
diff --git a/frontend.c b/frontend.c
index 9d267e4a..af929bc3 100644
--- a/frontend.c
+++ b/frontend.c
@@ -4,7 +4,7 @@
  * See the main source file 'xineliboutput.c' for copyright information and
  * how to reach the author.
  *
- * $Id: frontend.c,v 1.54 2008-04-10 20:21:45 phintuka Exp $
+ * $Id: frontend.c,v 1.55 2008-04-12 19:37:41 phintuka Exp $
  *
  */
 
@@ -781,7 +781,7 @@ bool cXinelibThread::PlayFile(const char *FileName, int Position,
 
 void cXinelibThread::Configure(void)
 {
-    ConfigureOSD(xc.prescale_osd, xc.unscaled_osd);
+    ConfigureOSD();
     ConfigurePostprocessing(xc.deinterlace_method, xc.audio_delay, 
 			    xc.audio_compression, xc.audio_equalizer,
 			    xc.audio_surround, xc.speaker_type);
@@ -803,13 +803,11 @@ void cXinelibThread::Configure(void)
 #endif
 }
 
-int cXinelibThread::ConfigureOSD(bool prescale_osd, bool unscaled_osd) 
+int cXinelibThread::ConfigureOSD(void) 
 {
   char buf[256];
-  sprintf(buf, "OSDSCALING %d", prescale_osd);
-  if(!xc.prescale_osd_downscale)
-    strcat(buf, " NoDownscale");
-  if(unscaled_osd)
+  sprintf(buf, "OSDSCALING %d", xc.prescale_osd);
+  if(xc.unscaled_osd)
     strcat(buf, " UnscaledAlways");
   if(xc.unscaled_osd_opaque)
     strcat(buf, " UnscaledOpaque");
diff --git a/frontend.h b/frontend.h
index ab362ee2..fffaae28 100644
--- a/frontend.h
+++ b/frontend.h
@@ -4,7 +4,7 @@
  * See the main source file 'xineliboutput.c' for copyright information and
  * how to reach the author.
  *
- * $Id: frontend.h,v 1.20 2008-04-03 08:08:27 phintuka Exp $
+ * $Id: frontend.h,v 1.21 2008-04-12 19:37:41 phintuka Exp $
  *
  */
 
@@ -115,7 +115,7 @@ class cXinelibThread : public cThread, public cListObject
   //
 
   public:
-    virtual int ConfigureOSD(bool prescale_osd=false, bool unscaled_osd=false);
+    virtual int ConfigureOSD(void);
     virtual int ConfigurePostprocessing(const char *deinterlace_method, 
 					int audio_delay, 
 					int audio_compression, 
diff --git a/setup_menu.c b/setup_menu.c
index bd3a7f42..36b410c9 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.50 2008-03-29 18:48:19 phintuka Exp $
+ * $Id: setup_menu.c,v 1.51 2008-04-12 19:37:41 phintuka Exp $
  *
  */
 
@@ -846,7 +846,6 @@ class cMenuSetupOSD : public cMenuSetupPage
     cOsdItem *ctrl_alpha_abs;
     cOsdItem *ctrl_unscaled;
     cOsdItem *ctrl_scale;
-    cOsdItem *ctrl_downscale;
     cOsdItem *ctrl_lowres;
 #if VDRVERSNUM < 10515
     cOsdItem *ctrl_spulang0;
@@ -878,7 +877,7 @@ cMenuSetupOSD::~cMenuSetupOSD()
   xc.alpha_correction = orig_alpha_correction;
   xc.alpha_correction_abs = orig_alpha_correction_abs;
 
-  cXinelibDevice::Instance().ConfigureOSD(xc.prescale_osd, xc.unscaled_osd);
+  cXinelibDevice::Instance().ConfigureOSD();
 }
 
 void cMenuSetupOSD::Set(void)
@@ -889,7 +888,6 @@ void cMenuSetupOSD::Set(void)
 
   ctrl_scaling = NULL;
   ctrl_scale = NULL;
-  ctrl_downscale = NULL;
   ctrl_unscaled = NULL;
   ctrl_lowres = NULL;
   ctrl_alpha = NULL;
@@ -912,10 +910,6 @@ void cMenuSetupOSD::Set(void)
   Add(ctrl_scale = 
       new cMenuEditBoolItem(tr("Scale OSD to video size"), 
 			    &newconfig.prescale_osd));
-  if(newconfig.prescale_osd)
-    Add(ctrl_downscale =
-	new cMenuEditBoolItem(tr("  Allow downscaling"), 
-			      &newconfig.prescale_osd_downscale));
   Add(ctrl_unscaled =
       new cMenuEditBoolItem(tr("Unscaled OSD (no transparency)"), 
 			    &newconfig.unscaled_osd));
@@ -980,13 +974,8 @@ eOSState cMenuSetupOSD::ProcessKey(eKeys Key)
   else if(item == ctrl_alpha_abs)
     xc.alpha_correction_abs = newconfig.alpha_correction_abs;
   else if(item == ctrl_unscaled || item == ctrl_scale)
-    cXinelibDevice::Instance().ConfigureOSD(newconfig.prescale_osd, 
-					    newconfig.unscaled_osd);
+    cXinelibDevice::Instance().ConfigureOSD();
 
-  if(newconfig.prescale_osd && !ctrl_downscale)
-    Set();
-  if(!newconfig.prescale_osd && ctrl_downscale)
-    Set();
   if(!newconfig.unscaled_osd && !ctrl_lowres)
     Set();
   if(newconfig.unscaled_osd && ctrl_lowres)
@@ -1016,7 +1005,6 @@ void cMenuSetupOSD::Store(void)
   SetupStore("OSD.HideMainMenu",    xc.hide_main_menu);
   SetupStore("OSD.LayersVisible",   xc.osd_mixer);
   SetupStore("OSD.Prescale",        xc.prescale_osd);
-  SetupStore("OSD.Downscale",       xc.prescale_osd_downscale);
   SetupStore("OSD.UnscaledAlways",  xc.unscaled_osd);
   SetupStore("OSD.UnscaledOpaque", xc.unscaled_osd_opaque);
   SetupStore("OSD.UnscaledLowRes", xc.unscaled_osd_lowresvideo);
diff --git a/xine_input_vdr.c b/xine_input_vdr.c
index 8f2096b0..c970e3c1 100644
--- a/xine_input_vdr.c
+++ b/xine_input_vdr.c
@@ -4,7 +4,7 @@
  * See the main source file 'xineliboutput.c' for copyright information and
  * how to reach the author.
  *
- * $Id: xine_input_vdr.c,v 1.132 2008-04-12 16:02:27 phintuka Exp $
+ * $Id: xine_input_vdr.c,v 1.133 2008-04-12 19:37:41 phintuka Exp $
  *
  */
 
@@ -313,7 +313,6 @@ typedef struct vdr_input_plugin_s {
   int video_width, video_height;
   int video_changed;
   int rescale_osd;
-  int rescale_osd_downscale;
   int unscaled_osd;
   int unscaled_osd_opaque;
   int unscaled_osd_lowresvideo;
@@ -2171,17 +2170,6 @@ static int exec_osd_command(vdr_input_plugin_t *this, osd_command_t *cmd)
 	    use_unscaled = 1;
 
 	if(!use_unscaled && this->rescale_osd) {
-
-	  if(!this->rescale_osd_downscale) {
-	    if(width_diff<0) {
-	      width_diff = 0;
-	      new_w = cmd->w;
-	    }
-	    if(height_diff<0) {
-	      height_diff = 0;
-	      new_h = cmd->h;
-	    }
-	  }
 	  if(height_diff || width_diff) {
 	    this->osddata[cmd->wnd].data = cmd->data;
 	    this->osddata[cmd->wnd].datalen = cmd->datalen;
@@ -3186,7 +3174,6 @@ static int handle_control_osdscaling(vdr_input_plugin_t *this, const char *cmd)
   pthread_mutex_lock(&this->osd_lock);
   if(1 == sscanf(cmd, "OSDSCALING %d", &tmp)) {
     this->rescale_osd = tmp ? 1 : 0;
-    this->rescale_osd_downscale = strstr(cmd, "NoDownscale") ? 0 : 1;
     this->unscaled_osd = strstr(cmd, "UnscaledAlways") ? 1 : 0;
     this->unscaled_osd_opaque = strstr(cmd, "UnscaledOpaque") ? 1 : 0;
     this->unscaled_osd_lowresvideo = strstr(cmd, "UnscaledLowRes") ? 1 : 0;