diff options
| author | Guenter Bartsch <guenter@users.sourceforge.net> | 2002-02-25 01:23:41 +0000 |
|---|---|---|
| committer | Guenter Bartsch <guenter@users.sourceforge.net> | 2002-02-25 01:23:41 +0000 |
| commit | f8725da8cdb8f536f9bc6ee7e6e5ca2a1e9ee68c (patch) | |
| tree | 0edbe17003d735943dae0472216dab698e39bebe /src/xine-engine/video_out.h | |
| parent | 8a295be88848187e9b30638990d194d3717e2554 (diff) | |
| download | xine-lib-f8725da8cdb8f536f9bc6ee7e6e5ca2a1e9ee68c.tar.gz xine-lib-f8725da8cdb8f536f9bc6ee7e6e5ca2a1e9ee68c.tar.bz2 | |
*phew* Xv video output driver works now, zoom feature has been stripped down a little. Code is cleaned up, identifiers should be consistent with xshm driver (as far as possible)
CVS patchset: 1516
CVS date: 2002/02/25 01:23:41
Diffstat (limited to 'src/xine-engine/video_out.h')
| -rw-r--r-- | src/xine-engine/video_out.h | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/xine-engine/video_out.h b/src/xine-engine/video_out.h index e7a020c14..4cfc7b0e4 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.44 2002/02/18 17:30:40 guenter Exp $ + * $Id: video_out.h,v 1.45 2002/02/25 01:23:41 guenter Exp $ * * * xine version of video_out.h @@ -88,6 +88,10 @@ struct vo_frame_s { int top_field_first; int repeat_first_field; + /* pan/scan offset */ + int pan_scan_x; + int pan_scan_y; + /* additional information to be able to duplicate frames: */ int width, height; int ratio; /* aspect ratio, codes see below */ @@ -182,18 +186,16 @@ struct vo_instance_s { #define VO_PROP_BRIGHTNESS 5 #define VO_PROP_COLORKEY 6 #define VO_PROP_AUTOPAINT_COLORKEY 7 -#define VO_PROP_ZOOM_X 8 -#define VO_PROP_ZOOM_Y 9 -#define VO_PROP_OFFSET_X 10 -#define VO_PROP_OFFSET_Y 11 -#define VO_PROP_TVMODE 12 -#define VO_PROP_MAX_NUM_FRAMES 13 -#define VO_NUM_PROPERTIES 14 +#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 /* zoom specific constants FIXME: generate this from xine.tmpl.in */ #define VO_ZOOM_STEP 100 #define VO_ZOOM_MAX 400 -#define VO_ZOOM_MIN -85 +#define VO_ZOOM_MIN 100 /* number of colors in the overlay palette. Currently limited to 256 at most, because some alphablend functions use an 8-bit index into |