diff options
author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-12-27 18:24:55 +0000 |
---|---|---|
committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-12-27 18:24:55 +0000 |
commit | 1ea97db5f08e85e7a9da249e2061b33b93dc8e79 (patch) | |
tree | f6794d8e6a010fd6074456defefaf26f3435093c | |
parent | d72c009401632028813067c3d3e3d128a2b86845 (diff) | |
download | xine-lib-1ea97db5f08e85e7a9da249e2061b33b93dc8e79.tar.gz xine-lib-1ea97db5f08e85e7a9da249e2061b33b93dc8e79.tar.bz2 |
Add VO_PROP_OUTPUT_* to some other video output drivers (where trivial).
-rw-r--r-- | src/video_out/video_out_directfb.c | 14 | ||||
-rw-r--r-- | src/video_out/video_out_fb.c | 14 | ||||
-rw-r--r-- | src/video_out/video_out_sdl.c | 8 | ||||
-rw-r--r-- | src/video_out/video_out_syncfb.c | 12 | ||||
-rw-r--r-- | src/video_out/video_out_vidix.c | 12 | ||||
-rw-r--r-- | src/video_out/video_out_xcbshm.c | 8 | ||||
-rw-r--r-- | src/video_out/video_out_xcbxv.c | 12 | ||||
-rw-r--r-- | src/video_out/video_out_xvmc.c | 12 | ||||
-rw-r--r-- | src/video_out/video_out_xxmc.c | 12 |
9 files changed, 102 insertions, 2 deletions
diff --git a/src/video_out/video_out_directfb.c b/src/video_out/video_out_directfb.c index 3aa5bf66a..9786049b4 100644 --- a/src/video_out/video_out_directfb.c +++ b/src/video_out/video_out_directfb.c @@ -922,7 +922,19 @@ static int directfb_get_property (vo_driver_t *this_gen, int property) { case VO_PROP_WINDOW_HEIGHT: return this->sc.gui_height; - + + case VO_PROP_OUTPUT_WIDTH: + return this->cur_frame->sc.output_width; + + case VO_PROP_OUTPUT_HEIGHT: + return this->cur_frame->sc.output_height; + + case VO_PROP_OUTPUT_XOFFSET: + return this->cur_frame->sc.output_xoffset; + + case VO_PROP_OUTPUT_YOFFSET: + return this->cur_frame->sc.output_yoffset; + case VO_PROP_MAX_NUM_FRAMES: return (this->type & DLTF_VIDEO) ? 8 : 15; diff --git a/src/video_out/video_out_fb.c b/src/video_out/video_out_fb.c index 2f7fd2d57..95060a4d8 100644 --- a/src/video_out/video_out_fb.c +++ b/src/video_out/video_out_fb.c @@ -612,7 +612,19 @@ static int fb_get_property(vo_driver_t *this_gen, int property) case VO_PROP_WINDOW_HEIGHT: return this->sc.gui_height; - + + case VO_PROP_OUTPUT_WIDTH: + return this->cur_frame->sc.output_width; + + case VO_PROP_OUTPUT_HEIGHT: + return this->cur_frame->sc.output_height; + + case VO_PROP_OUTPUT_XOFFSET: + return this->cur_frame->sc.output_xoffset; + + case VO_PROP_OUTPUT_YOFFSET: + return this->cur_frame->sc.output_yoffset; + default: xprintf(this->xine, XINE_VERBOSITY_DEBUG, "video_out_fb: tried to get unsupported property %d\n", property); diff --git a/src/video_out/video_out_sdl.c b/src/video_out/video_out_sdl.c index f4f645e8c..6705b4176 100644 --- a/src/video_out/video_out_sdl.c +++ b/src/video_out/video_out_sdl.c @@ -360,6 +360,14 @@ static int sdl_get_property (vo_driver_t *this_gen, int property) { return this->sc.gui_width; case VO_PROP_WINDOW_HEIGHT: return this->sc.gui_height; + case VO_PROP_OUTPUT_WIDTH: + return this->sc.output_width; + case VO_PROP_OUTPUT_HEIGHT: + return this->sc.output_height; + case VO_PROP_OUTPUT_XOFFSET: + return this->sc.output_xoffset; + case VO_PROP_OUTPUT_YOFFSET: + return this->sc.output_yoffset; case VO_PROP_ASPECT_RATIO: return this->sc.user_ratio; } diff --git a/src/video_out/video_out_syncfb.c b/src/video_out/video_out_syncfb.c index 86be3422e..b1fadbd58 100644 --- a/src/video_out/video_out_syncfb.c +++ b/src/video_out/video_out_syncfb.c @@ -670,6 +670,18 @@ static int syncfb_get_property(vo_driver_t* this_gen, int property) case VO_PROP_WINDOW_HEIGHT: this->props[property].value = this->sc.gui_height; break; + case VO_PROP_OUTPUT_WIDTH: + this->props[property].value = this->sc.output_width; + break; + case VO_PROP_OUTPUT_HEIGHT: + this->props[property].value = this->sc.output_height; + break; + case VO_PROP_OUTPUT_XOFFSET: + this->props[property].value = this->sc.output_xoffset; + break; + case VO_PROP_OUTPUT_YOFFSET: + this->props[property].value = this->sc.output_yoffset; + break; } return this->props[property].value; diff --git a/src/video_out/video_out_vidix.c b/src/video_out/video_out_vidix.c index 21e361d93..9e3f870b1 100644 --- a/src/video_out/video_out_vidix.c +++ b/src/video_out/video_out_vidix.c @@ -700,6 +700,18 @@ static int vidix_get_property (vo_driver_t *this_gen, int property) { case VO_PROP_WINDOW_HEIGHT: this->props[property].value = this->sc.gui_height; break; + case VO_PROP_OUTPUT_WIDTH: + this->props[property].value = this->sc.output_width; + break; + case VO_PROP_OUTPUT_HEIGHT: + this->props[property].value = this->sc.output_height; + break; + case VO_PROP_OUTPUT_XOFFSET: + this->props[property].value = this->sc.output_xoffset; + break; + case VO_PROP_OUTPUT_YOFFSET: + this->props[property].value = this->sc.output_yoffset; + break; } lprintf ("video_out_vidix: property #%d = %d\n", property, diff --git a/src/video_out/video_out_xcbshm.c b/src/video_out/video_out_xcbshm.c index 725889d62..c9b83bb24 100644 --- a/src/video_out/video_out_xcbshm.c +++ b/src/video_out/video_out_xcbshm.c @@ -732,6 +732,14 @@ static int xshm_get_property (vo_driver_t *this_gen, int property) { return this->sc.gui_width; case VO_PROP_WINDOW_HEIGHT: return this->sc.gui_height; + case VO_PROP_OUTPUT_WIDTH: + return this->cur_frame->sc.output_width; + case VO_PROP_OUTPUT_HEIGHT: + return this->cur_frame->sc.output_height; + case VO_PROP_OUTPUT_XOFFSET: + return this->cur_frame->sc.output_xoffset; + case VO_PROP_OUTPUT_YOFFSET: + return this->cur_frame->sc.output_yoffset; default: xprintf(this->xine, XINE_VERBOSITY_DEBUG, "video_out_xcbshm: tried to get unsupported property %d\n", property); diff --git a/src/video_out/video_out_xcbxv.c b/src/video_out/video_out_xcbxv.c index 5b44ea12d..eef61e4ea 100644 --- a/src/video_out/video_out_xcbxv.c +++ b/src/video_out/video_out_xcbxv.c @@ -771,6 +771,18 @@ static int xv_get_property (vo_driver_t *this_gen, int property) { case VO_PROP_WINDOW_HEIGHT: this->props[property].value = this->sc.gui_height; break; + case VO_PROP_OUTPUT_WIDTH: + this->props[property].value = this->sc.output_width; + break; + case VO_PROP_OUTPUT_HEIGHT: + this->props[property].value = this->sc.output_height; + break; + case VO_PROP_OUTPUT_XOFFSET: + this->props[property].value = this->sc.output_xoffset; + break; + case VO_PROP_OUTPUT_YOFFSET: + this->props[property].value = this->sc.output_yoffset; + break; } lprintf("video_out_xcbxv: property #%d = %d\n", property, this->props[property].value); diff --git a/src/video_out/video_out_xvmc.c b/src/video_out/video_out_xvmc.c index 31d4c053d..d943c61b4 100644 --- a/src/video_out/video_out_xvmc.c +++ b/src/video_out/video_out_xvmc.c @@ -1002,6 +1002,18 @@ static int xvmc_get_property (vo_driver_t *this_gen, int property) { case VO_PROP_WINDOW_HEIGHT: this->props[property].value = this->sc.gui_height; break; + case VO_PROP_OUTPUT_WIDTH: + this->props[property].value = this->sc.output_width; + break; + case VO_PROP_OUTPUT_HEIGHT: + this->props[property].value = this->sc.output_height; + break; + case VO_PROP_OUTPUT_XOFFSET: + this->props[property].value = this->sc.output_xoffset; + break; + case VO_PROP_OUTPUT_YOFFSET: + this->props[property].value = this->sc.output_yoffset; + break; } return this->props[property].value; diff --git a/src/video_out/video_out_xxmc.c b/src/video_out/video_out_xxmc.c index 2b27c3982..28679e95d 100644 --- a/src/video_out/video_out_xxmc.c +++ b/src/video_out/video_out_xxmc.c @@ -1760,6 +1760,18 @@ static int xxmc_get_property (vo_driver_t *this_gen, int property) { case VO_PROP_WINDOW_HEIGHT: this->props[property].value = this->sc.gui_height; break; + case VO_PROP_OUTPUT_WIDTH: + this->props[property].value = this->sc.output_width; + break; + case VO_PROP_OUTPUT_HEIGHT: + this->props[property].value = this->sc.output_height; + break; + case VO_PROP_OUTPUT_XOFFSET: + this->props[property].value = this->sc.output_xoffset; + break; + case VO_PROP_OUTPUT_YOFFSET: + this->props[property].value = this->sc.output_yoffset; + break; } lprintf("video_out_xxmc: property #%d = %d\n", property, this->props[property].value); |