diff options
| author | Michael Roitzsch <mroi@users.sourceforge.net> | 2002-06-28 16:55:37 +0000 |
|---|---|---|
| committer | Michael Roitzsch <mroi@users.sourceforge.net> | 2002-06-28 16:55:37 +0000 |
| commit | 8364fd8a79b718e9d44e3f59dc010bf1f64fc076 (patch) | |
| tree | a8b60623d9b085b89c265379214fe95d5435a179 | |
| parent | 82ba2008c4fb5917144ddac396fc911b79cb2309 (diff) | |
| download | xine-lib-8364fd8a79b718e9d44e3f59dc010bf1f64fc076.tar.gz xine-lib-8364fd8a79b718e9d44e3f59dc010bf1f64fc076.tar.bz2 | |
new video out types to distinguish between dxr3 overlay and tv mode
CVS patchset: 2172
CVS date: 2002/06/28 16:55:37
| -rw-r--r-- | src/dxr3/video_out_dxr3.c | 5 | ||||
| -rw-r--r-- | src/xine-engine/video_out.h | 7 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/dxr3/video_out_dxr3.c b/src/dxr3/video_out_dxr3.c index 75c003cb0..ff46991b0 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.32 2002/06/25 14:41:53 mroi Exp $ + * $Id: video_out_dxr3.c,v 1.33 2002/06/28 16:55:37 mroi Exp $ */ /* mpeg1 encoding video out plugin for the dxr3. @@ -652,7 +652,7 @@ static int dxr3_get_property(vo_driver_t *this_gen, int property) case VO_PROP_TVMODE: return 0; case VO_PROP_VO_TYPE: - return VO_TYPE_DXR3; + return this->overlay_enabled ? VO_TYPE_DXR3_OVERLAY : VO_TYPE_DXR3_TVOUT; } printf("video_out_dxr3: property %d not implemented.\n", property); return 0; @@ -689,6 +689,7 @@ static int dxr3_set_property(vo_driver_t *this_gen, int property, int value) printf("video_out_dxr3: setting aspect ratio to anamorphic\n"); #endif if (!this->overlay_enabled || fullscreen) + /* FIXME: Is it necessary to switch to anamorphic mode in fullscreen? */ val = EM8300_ASPECTRATIO_16_9; else /* The overlay window can adapt to the ratio */ val = EM8300_ASPECTRATIO_4_3; diff --git a/src/xine-engine/video_out.h b/src/xine-engine/video_out.h index bdfb51b08..dbd98cbc6 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.52 2002/03/25 01:02:51 miguelfreitas Exp $ + * $Id: video_out.h,v 1.53 2002/06/28 16:55:37 mroi Exp $ * * * xine version of video_out.h @@ -192,8 +192,9 @@ struct vo_instance_s { #define VO_NUM_PROPERTIES 13 /* Video out types */ -#define VO_TYPE_UNKNOWN 0 -#define VO_TYPE_DXR3 1 +#define VO_TYPE_UNKNOWN 0 +#define VO_TYPE_DXR3_TVOUT 1 +#define VO_TYPE_DXR3_OVERLAY 2 /* zoom specific constants FIXME: generate this from xine.tmpl.in */ #define VO_ZOOM_STEP 100 |