diff options
| -rw-r--r-- | config.c | 4 | ||||
| -rw-r--r-- | frontend.c | 4 | ||||
| -rw-r--r-- | setup_menu.c | 4 | ||||
| -rw-r--r-- | xine_input_vdr.c | 11 |
4 files changed, 5 insertions, 18 deletions
@@ -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.60 2008-04-13 22:37:52 phintuka Exp $ + * $Id: config.c,v 1.61 2008-04-14 13:19:45 phintuka Exp $ * */ @@ -454,7 +454,6 @@ config_t::config_t() { hud_osd = 0; unscaled_osd = 0; - unscaled_osd_opaque = 0; unscaled_osd_lowresvideo = 1; #if VDRVERSNUM < 10515 @@ -688,7 +687,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.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); else if (!strcasecmp(Name, "OSD.AlphaCorrection")) alpha_correction = atoi(Value); @@ -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.57 2008-04-13 22:32:44 phintuka Exp $ + * $Id: frontend.c,v 1.58 2008-04-14 13:19:45 phintuka Exp $ * */ @@ -813,8 +813,6 @@ int cXinelibThread::ConfigureOSD(void) strcpy(buf, "OSDSCALING "); if(xc.unscaled_osd) strcat(buf, " UnscaledAlways"); - if(xc.unscaled_osd_opaque) - strcat(buf, " UnscaledOpaque"); if(xc.unscaled_osd_lowresvideo) strcat(buf, " UnscaledLowRes"); diff --git a/setup_menu.c b/setup_menu.c index 0bbe7777..97355355 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.52 2008-04-13 22:37:53 phintuka Exp $ + * $Id: setup_menu.c,v 1.53 2008-04-14 13:19:45 phintuka Exp $ * */ @@ -911,8 +911,6 @@ void cMenuSetupOSD::Set(void) new cMenuEditBoolItem(tr("Unscaled OSD (no transparency)"), &newconfig.unscaled_osd)); if(!newconfig.unscaled_osd) { - Add(new cMenuEditBoolItem(tr(" When opaque OSD"), - &newconfig.unscaled_osd_opaque)); Add(ctrl_lowres = new cMenuEditBoolItem(tr(" When low-res video"), &newconfig.unscaled_osd_lowresvideo)); diff --git a/xine_input_vdr.c b/xine_input_vdr.c index 80278dd1..6ce2d667 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.135 2008-04-13 22:32:44 phintuka Exp $ + * $Id: xine_input_vdr.c,v 1.136 2008-04-14 13:19:45 phintuka Exp $ * */ @@ -313,7 +313,6 @@ typedef struct vdr_input_plugin_s { int video_width, video_height; int video_changed; int unscaled_osd; - int unscaled_osd_opaque; int unscaled_osd_lowresvideo; int osdhandle[MAX_OSD_OBJECT]; int64_t last_changed_vpts[MAX_OSD_OBJECT]; @@ -2082,7 +2081,6 @@ static int exec_osd_command(vdr_input_plugin_t *this, osd_command_t *cmd) int use_unscaled = 0; int rle_scaled = 0; - int semitransparent = 0; int xmove = 0, ymove = 0; int unscaled_supported = 1; @@ -2113,16 +2111,12 @@ static int exec_osd_command(vdr_input_plugin_t *this, osd_command_t *cmd) uint32_t *tmp = (uint32_t*)(cmd->palette + i); ov_event.object.overlay->color[i] = *tmp & 0xffffff; ov_event.object.overlay->trans[i] = (cmd->palette[i].alpha + 0x7)/0xf; - if(ov_event.object.overlay->trans[i] > 0 && - ov_event.object.overlay->trans[i] < 0xf) - semitransparent = 1; } if(!(this->stream->video_out->get_capabilities(this->stream->video_out) & VO_CAP_UNSCALED_OVERLAY)) unscaled_supported = 0; - else if(this->unscaled_osd || - (this->unscaled_osd_opaque && !semitransparent)) + else if(this->unscaled_osd) use_unscaled = 1; /* store osd for later rescaling (done if video size changes) */ @@ -3173,7 +3167,6 @@ static int handle_control_osdscaling(vdr_input_plugin_t *this, const char *cmd) { pthread_mutex_lock(&this->osd_lock); 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; pthread_mutex_unlock(&this->osd_lock); return CONTROL_OK; |