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

1 files changed, 1 insertions, 14 deletions

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;