diff options
| author | James Courtier-Dutton <jcdutton@users.sourceforge.net> | 2002-03-05 20:39:05 +0000 |
|---|---|---|
| committer | James Courtier-Dutton <jcdutton@users.sourceforge.net> | 2002-03-05 20:39:05 +0000 |
| commit | 0ee66af23049eba5ff2aa82f80e316ec3ddb59d2 (patch) | |
| tree | fe2520d5cb31c708298a6aa91485ecb505704260 | |
| parent | 99a4dbf75cc3f7a40354b6c6596f4ea7aa373c52 (diff) | |
| download | xine-lib-0ee66af23049eba5ff2aa82f80e316ec3ddb59d2.tar.gz xine-lib-0ee66af23049eba5ff2aa82f80e316ec3ddb59d2.tar.bz2 | |
Add video out get_property function call
----------------------------------------------------------------------
CVS patchset: 1536
CVS date: 2002/03/05 20:39:05
| -rw-r--r-- | include/xine.h.tmpl.in | 17 | ||||
| -rw-r--r-- | src/dxr3/dxr3_vo_core.c | 5 | ||||
| -rw-r--r-- | src/xine-engine/video_out.h | 11 |
3 files changed, 26 insertions, 7 deletions
diff --git a/include/xine.h.tmpl.in b/include/xine.h.tmpl.in index fc2091e50..8972871d2 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.82 2002/02/25 01:23:41 guenter Exp $ + * $Id: xine.h.tmpl.in,v 1.83 2002/03/05 20:39:05 jcdutton Exp $ * */ @@ -316,13 +316,24 @@ int xine_check_version(int major, int minor, int sub); * ask video driver how many frames it can allocate * \sa vo_driver_t */ -#define VO_PROP_MAX_NUM_FRAMES 11 +#define VO_PROP_MAX_NUM_FRAMES 11 +/** + * \def VO_PROP_VO_TYPE + * ask video driver what type it is. E.g. dxr3 + * \sa vo_driver_t + */ +#define VO_PROP_VO_TYPE 12 + +/* VO_PROP_VO_TYPES */ +#define VO_TYPE_UNKNOWN 0 +#define VO_TYPE_DXR3 1 + /** * \def VO_NUM_PROPERTIES * Number of available properties property. * \sa vo_driver_t */ -#define VO_NUM_PROPERTIES 12 +#define VO_NUM_PROPERTIES 13 /** @} end of video_prop */ diff --git a/src/dxr3/dxr3_vo_core.c b/src/dxr3/dxr3_vo_core.c index 029175424..538eed248 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.15 2002/02/25 23:44:05 jcdutton Exp $ + * $Id: dxr3_vo_core.c,v 1.16 2002/03/05 20:39:05 jcdutton Exp $ * ************************************************************************* * core functions common to both Standard and RT-Encoding vo plugins * @@ -249,6 +249,9 @@ int dxr3_get_property (vo_driver_t *this_gen, int property) case VO_PROP_TVMODE: break; + case VO_PROP_VO_TYPE: + val = VO_TYPE_DXR3; + break; default: val = 0; fprintf(stderr, "dxr3_vo: property %d not implemented!\n", property); diff --git a/src/xine-engine/video_out.h b/src/xine-engine/video_out.h index 4cfc7b0e4..e1571184c 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.45 2002/02/25 01:23:41 guenter Exp $ + * $Id: video_out.h,v 1.46 2002/03/05 20:39:05 jcdutton Exp $ * * * xine version of video_out.h @@ -189,8 +189,13 @@ struct vo_instance_s { #define VO_PROP_ZOOM_FACTOR 8 #define VO_PROP_PAN_SCAN 9 #define VO_PROP_TVMODE 10 -#define VO_PROP_MAX_NUM_FRAMES 11 -#define VO_NUM_PROPERTIES 12 +#define VO_PROP_MAX_NUM_FRAMES 11 +#define VO_PROP_VO_TYPE 12 +#define VO_NUM_PROPERTIES 13 + +/* Video out types */ +#define VO_TYPE_UNKNOWN 0 +#define VO_TYPE_DXR3 1 /* zoom specific constants FIXME: generate this from xine.tmpl.in */ #define VO_ZOOM_STEP 100 |