rename the dxr3 vo_types to something more useful

we should now have correct menu highlight placements on 16:9 tv
if only I had such a thingy to test ;)

CVS patchset: 2232
CVS date: 2002/07/08 19:52:01

4 files changed, 13 insertions, 11 deletions

diff --git a/src/dxr3/dxr3_decode_spu.c b/src/dxr3/dxr3_decode_spu.c
index 13fa20b8b..2a02c3595 100644
--- a/src/dxr3/dxr3_decode_spu.c
+++ b/src/dxr3/dxr3_decode_spu.c
@@ -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: dxr3_decode_spu.c,v 1.9 2002/07/05 17:32:01 mroi Exp $
+ * $Id: dxr3_decode_spu.c,v 1.10 2002/07/08 19:52:01 mroi Exp $
  */
  
 /* dxr3 spu decoder plugin.
@@ -321,7 +321,7 @@ static void dxr3_spudec_decode_data(spu_decoder_t *this_gen, buf_element_t *buf)
   if (this->aspect == XINE_ASPECT_RATIO_ANAMORPHIC && this->xine->spu_channel_user == -1 &&
       !this->pan_scan && this->xine->spu_channel_letterbox >= 0 &&
       this->xine->video_driver->get_property(this->xine->video_driver, VO_PROP_VO_TYPE) ==
-      VO_TYPE_DXR3_TVOUT) {
+      VO_TYPE_DXR3_LETTERBOXED) {
     /* Use the letterbox version of the subpicture for tv out. */
     spu_channel = this->xine->spu_channel_letterbox;
   }
@@ -407,7 +407,7 @@ static int dxr3_present(xine_t *xine)
 #ifdef LOG_SPU
     printf("dxr3_decode_spu: dxr3 presence test: info = %d\n", info);
 #endif
-    if ((info != VO_TYPE_DXR3_TVOUT) && (info != VO_TYPE_DXR3_OVERLAY))
+    if ((info != VO_TYPE_DXR3_LETTERBOXED) && (info != VO_TYPE_DXR3_WIDE))
       return 0;
   }
   return 1;
@@ -530,7 +530,7 @@ static int dxr3_spudec_copy_nav_to_btn(dxr3_spudec_t *this, int32_t mode, em8300
     btn->bottom = button_ptr->y_end;
     if (this->aspect == XINE_ASPECT_RATIO_ANAMORPHIC && !this->pan_scan &&
         this->xine->video_driver->get_property(this->xine->video_driver, VO_PROP_VO_TYPE) ==
-        VO_TYPE_DXR3_TVOUT) {
+        VO_TYPE_DXR3_LETTERBOXED) {
       /* modify button areas for anamorphic menus on tv out */
       int top_black_bar = this->height / 8;
       btn->top = btn->top * 3 / 4 + top_black_bar;
diff --git a/src/dxr3/dxr3_decode_video.c b/src/dxr3/dxr3_decode_video.c
index 5d8490966..e5fef25f0 100644
--- a/src/dxr3/dxr3_decode_video.c
+++ b/src/dxr3/dxr3_decode_video.c
@@ -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: dxr3_decode_video.c,v 1.10 2002/07/05 17:32:01 mroi Exp $
+ * $Id: dxr3_decode_video.c,v 1.11 2002/07/08 19:52:01 mroi Exp $
  */
  
 /* dxr3 video decoder plugin.
@@ -519,7 +519,7 @@ static int dxr3_present(xine_t *xine)
 #ifdef LOG_VID
     printf("dxr3_decode_video: dxr3 presence test: info = %d\n", info);
 #endif
-    if ((info != VO_TYPE_DXR3_TVOUT) && (info != VO_TYPE_DXR3_OVERLAY))
+    if ((info != VO_TYPE_DXR3_LETTERBOXED) && (info != VO_TYPE_DXR3_WIDE))
       return 0;
   }
   return 1;
diff --git a/src/dxr3/video_out_dxr3.c b/src/dxr3/video_out_dxr3.c
index a5df4c084..4f24bbd60 100644
--- a/src/dxr3/video_out_dxr3.c
+++ b/src/dxr3/video_out_dxr3.c
@@ -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_dxr3.c,v 1.37 2002/07/08 17:07:18 mroi Exp $
+ * $Id: video_out_dxr3.c,v 1.38 2002/07/08 19:52:02 mroi Exp $
  */
  
 /* mpeg1 encoding video out plugin for the dxr3.  
@@ -665,7 +665,9 @@ static int dxr3_get_property(vo_driver_t *this_gen, int property)
   case VO_PROP_TVMODE:
     return 0;
   case VO_PROP_VO_TYPE:
-    return this->overlay_enabled ? VO_TYPE_DXR3_OVERLAY : VO_TYPE_DXR3_TVOUT;
+    if (this->overlay_enabled && is_fullscreen(this)) return VO_TYPE_DXR3_LETTERBOXED;
+    if (this->overlay_enabled || this->widescreen_enabled) return VO_TYPE_DXR3_WIDE;
+    return VO_TYPE_DXR3_LETTERBOXED;
   }
   printf("video_out_dxr3: property %d not implemented.\n", property);
   return 0;
diff --git a/src/xine-engine/video_out.h b/src/xine-engine/video_out.h
index dbd98cbc6..a83e25d92 100644
--- a/src/xine-engine/video_out.h
+++ b/src/xine-engine/video_out.h
@@ -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.h,v 1.53 2002/06/28 16:55:37 mroi Exp $
+ * $Id: video_out.h,v 1.54 2002/07/08 19:52:01 mroi Exp $
  *
  *
  * xine version of video_out.h 
@@ -193,8 +193,8 @@ struct vo_instance_s {
 
 /* Video out types */
 #define VO_TYPE_UNKNOWN               0
-#define VO_TYPE_DXR3_TVOUT            1
-#define VO_TYPE_DXR3_OVERLAY          2
+#define VO_TYPE_DXR3_LETTERBOXED      1
+#define VO_TYPE_DXR3_WIDE             2
 
 /* zoom specific constants FIXME: generate this from xine.tmpl.in */
 #define VO_ZOOM_STEP        100