diff options
| -rw-r--r-- | include/xine.h.tmpl.in | 10 | ||||
| -rw-r--r-- | src/dxr3/dxr3_vo_core.c | 13 | ||||
| -rw-r--r-- | src/xine-engine/video_out.h | 7 |
3 files changed, 22 insertions, 8 deletions
diff --git a/include/xine.h.tmpl.in b/include/xine.h.tmpl.in index a0ca6943a..b6e39d6e5 100644 --- a/include/xine.h.tmpl.in +++ b/include/xine.h.tmpl.in @@ -28,7 +28,7 @@ \endverbatim */ /* - * $Id: xine.h.tmpl.in,v 1.52 2001/11/04 11:53:07 siggi Exp $ + * $Id: xine.h.tmpl.in,v 1.53 2001/11/10 06:20:39 mlampard Exp $ * */ @@ -291,11 +291,17 @@ int xine_check_version(int major, int minor, int sub); */ #define VO_PROP_OFFSET_Y 10 /** + * \def VO_PROP_OFFSET_Y + * Change TVmode property. + * \sa vo_driver_t + */ +#define VO_PROP_TVMODE 11 +/** * \def VO_NUM_PROPERTIES * Number of available properties property. * \sa vo_driver_t */ -#define VO_NUM_PROPERTIES 11 +#define VO_NUM_PROPERTIES 12 /** @} end of video_prop */ diff --git a/src/dxr3/dxr3_vo_core.c b/src/dxr3/dxr3_vo_core.c index 320d50cd5..c98658f97 100644 --- a/src/dxr3/dxr3_vo_core.c +++ b/src/dxr3/dxr3_vo_core.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_vo_core.c,v 1.6 2001/11/09 07:20:44 mlampard Exp $ + * $Id: dxr3_vo_core.c,v 1.7 2001/11/10 06:20:39 mlampard Exp $ * ************************************************************************* * core functions common to both Standard and RT-Encoding vo plugins * @@ -237,6 +237,7 @@ int dxr3_get_property (vo_driver_t *this_gen, int property) break; case VO_PROP_ZOOM_X: case VO_PROP_ZOOM_Y: + case VO_PROP_TVMODE: break; default: @@ -317,7 +318,12 @@ int dxr3_set_property (vo_driver_t *this_gen, if (ioctl(this->fd_control, EM8300_IOCTL_SET_ASPECTRATIO, &this->aspectratio)) fprintf(stderr, "dxr3_vo: failed to set aspect ratio (%s)\n", strerror(errno)); - }else if(value==0){ /* Use meta-z to cycle TV formats */ + } + } + break; + + case VO_PROP_TVMODE: { + /* Use meta-v to cycle TV formats */ static int newmode; newmode++; if (newmode>EM8300_VIDEOMODE_LAST) @@ -331,9 +337,10 @@ int dxr3_set_property (vo_driver_t *this_gen, fprintf(stderr, "NTSC\n"); if (ioctl(this->fd_control, EM8300_IOCTL_SET_VIDEOMODE, &newmode)) fprintf(stderr, "dxr3_vo: setting video mode failed."); - } } break; + default: + break; } if (bcs_changed){ diff --git a/src/xine-engine/video_out.h b/src/xine-engine/video_out.h index bd690464d..eb6b1f84e 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.25 2001/11/04 11:53:08 siggi Exp $ + * $Id: video_out.h,v 1.26 2001/11/10 06:20:39 mlampard Exp $ * * * xine version of video_out.h @@ -174,8 +174,9 @@ struct vo_instance_s { #define VO_PROP_ZOOM_X 7 #define VO_PROP_ZOOM_Y 8 #define VO_PROP_OFFSET_X 9 -#define VO_PROP_OFFSET_Y 10 -#define VO_NUM_PROPERTIES 11 +#define VO_PROP_OFFSET_Y 10 +#define VO_PROP_TVMODE 11 +#define VO_NUM_PROPERTIES 12 /* zoom specific constants FIXME: generate this from xine.tmpl.in */ #define VO_ZOOM_STEP 100 |