1 files changed, 14 insertions, 23 deletions

diff --git a/src/video_out/video_out_xvmc.c b/src/video_out/video_out_xvmc.c
index e1e6aa2f3..95c40320f 100644
--- a/src/video_out/video_out_xvmc.c
+++ b/src/video_out/video_out_xvmc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000-2002 the xine project
+ * Copyright (C) 2000-2003 the xine project
  *
  * This file is part of xine, a free video player.
  *
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: video_out_xvmc.c,v 1.3 2003/10/22 20:38:10 komadori Exp $
+ * $Id: video_out_xvmc.c,v 1.4 2003/10/23 15:17:07 mroi Exp $
  * 
  * video_out_xvmc.c, X11 video motion compensation extension interface for xine
  *
@@ -1211,12 +1211,12 @@ static int xvmc_set_property (vo_driver_t *this_gen,
       break;
     case VO_PROP_ZOOM_X:
 
-      if ((value >= VO_ZOOM_MIN) && (value <= VO_ZOOM_MAX)) {
+      if ((value >= XINE_VO_ZOOM_MIN) && (value <= XINE_VO_ZOOM_MAX)) {
         this->props[property].value = value;
         printf ("video_out_xv: VO_PROP_ZOOM_X = %d\n",
 		this->props[property].value);
 
-	this->sc.zoom_factor_x = (double)value / (double)VO_ZOOM_STEP;
+	this->sc.zoom_factor_x = (double)value / (double)XINE_VO_ZOOM_STEP;
 
 	xvmc_compute_ideal_size (this);
 
@@ -1225,12 +1225,12 @@ static int xvmc_set_property (vo_driver_t *this_gen,
       break;
     case VO_PROP_ZOOM_Y:
 
-      if ((value >= VO_ZOOM_MIN) && (value <= VO_ZOOM_MAX)) {
+      if ((value >= XINE_VO_ZOOM_MIN) && (value <= XINE_VO_ZOOM_MAX)) {
         this->props[property].value = value;
         printf ("video_out_xv: VO_PROP_ZOOM_Y = %d\n",
 		this->props[property].value);
 
-	this->sc.zoom_factor_y = (double)value / (double)VO_ZOOM_STEP;
+	this->sc.zoom_factor_y = (double)value / (double)XINE_VO_ZOOM_STEP;
 
 	xvmc_compute_ideal_size (this);
 
@@ -1407,7 +1407,6 @@ static void xvmc_dispose (vo_driver_t *this_gen) {
 }
 
 static void xvmc_check_capability (xvmc_driver_t *this,
-				 uint32_t capability,
 				 int property, XvAttribute attr,
 				 int base_id, char *str_prop,
 				 char *config_name,
@@ -1416,12 +1415,10 @@ static void xvmc_check_capability (xvmc_driver_t *this,
   int         int_default;
   cfg_entry_t *entry;
 
-  this->capabilities |= capability;
-
   /*
    * some Xv drivers (Gatos ATI) report some ~0 as max values, this is confusing.
    */
-  if (VO_CAP_COLORKEY && (attr.max_value == ~0))
+  if (attr.max_value == ~0)
     attr.max_value = 2147483615;
 
   this->props[property].min  = attr.min_value;
@@ -1454,7 +1451,7 @@ static void xvmc_check_capability (xvmc_driver_t *this,
 
     xvmc_set_property (&this->vo_driver, property, entry->num_value);
 
-    if (capability == VO_CAP_COLORKEY) {
+    if (strcmp(str_prop, "XV_COLORKEY") == 0) {
       this->use_colorkey = 1;
       this->colorkey = entry->num_value;
     }
@@ -1598,39 +1595,33 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi
     for(k = 0; k < nattr; k++) {
       if((attr[k].flags & XvSettable) && (attr[k].flags & XvGettable)) {
 	if(!strcmp(attr[k].name, "XV_HUE")) {
-	  xvmc_check_capability (this, VO_CAP_HUE,
-				 VO_PROP_HUE, attr[k],
+	  xvmc_check_capability (this, VO_PROP_HUE, attr[k],
 				 class->adaptor_info[class->adaptor_num].base_id, "XV_HUE",
 				 NULL, NULL);
 
 	} else if(!strcmp(attr[k].name, "XV_SATURATION")) {
-	  xvmc_check_capability (this, VO_CAP_SATURATION,
-				 VO_PROP_SATURATION, attr[k],
+	  xvmc_check_capability (this, VO_PROP_SATURATION, attr[k],
 				 class->adaptor_info[class->adaptor_num].base_id, "XV_SATURATION",
 				 NULL, NULL);
 
 	} else if(!strcmp(attr[k].name, "XV_BRIGHTNESS")) {
-	  xvmc_check_capability (this, VO_CAP_BRIGHTNESS,
-				 VO_PROP_BRIGHTNESS, attr[k],
+	  xvmc_check_capability (this, VO_PROP_BRIGHTNESS, attr[k],
 				 class->adaptor_info[class->adaptor_num].base_id, "XV_BRIGHTNESS",
 				 NULL, NULL);
 
 	} else if(!strcmp(attr[k].name, "XV_CONTRAST")) {
-	  xvmc_check_capability (this, VO_CAP_CONTRAST,
-				 VO_PROP_CONTRAST, attr[k],
+	  xvmc_check_capability (this, VO_PROP_CONTRAST, attr[k],
 				 class->adaptor_info[class->adaptor_num].base_id, "XV_CONTRAST",
 				 NULL, NULL);
 
 	} else if(!strcmp(attr[k].name, "XV_COLORKEY")) {
-	  xvmc_check_capability (this, VO_CAP_COLORKEY,
-				 VO_PROP_COLORKEY, attr[k],
+	  xvmc_check_capability (this, VO_PROP_COLORKEY, attr[k],
 				 class->adaptor_info[class->adaptor_num].base_id, "XV_COLORKEY",
 				 "video.xv_colorkey",
 				 _("Colorkey used for Xv video overlay"));
 
 	} else if(!strcmp(attr[k].name, "XV_AUTOPAINT_COLORKEY")) {
-	  xvmc_check_capability (this, VO_CAP_AUTOPAINT_COLORKEY,
-				 VO_PROP_AUTOPAINT_COLORKEY, attr[k],
+	  xvmc_check_capability (this, VO_PROP_AUTOPAINT_COLORKEY, attr[k],
 				 class->adaptor_info[class->adaptor_num].base_id, "XV_AUTOPAINT_COLORKEY",
 				 NULL, NULL);