diff options
Diffstat (limited to 'src/video_out/video_out_sdl.c')
| -rw-r--r-- | src/video_out/video_out_sdl.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/src/video_out/video_out_sdl.c b/src/video_out/video_out_sdl.c index b83a18dec..8d6a3e6f5 100644 --- a/src/video_out/video_out_sdl.c +++ b/src/video_out/video_out_sdl.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_sdl.c,v 1.25 2003/05/31 18:33:31 miguelfreitas Exp $ + * $Id: video_out_sdl.c,v 1.26 2003/08/04 03:47:11 miguelfreitas Exp $ * * video_out_sdl.c, Simple DirectMedia Layer * @@ -72,7 +72,8 @@ typedef struct sdl_driver_s sdl_driver_t; typedef struct sdl_frame_s { vo_frame_t vo_frame; - int width, height, ratio_code, format; + int width, height, format; + double ratio; SDL_Overlay * overlay; } sdl_frame_t; @@ -172,7 +173,7 @@ static void sdl_compute_output_size (sdl_driver_t *this) { static void sdl_update_frame_format (vo_driver_t *this_gen, vo_frame_t *frame_gen, uint32_t width, uint32_t height, - int ratio_code, int format, int flags) { + double ratio, int format, int flags) { sdl_driver_t *this = (sdl_driver_t *) this_gen; sdl_frame_t *frame = (sdl_frame_t *) frame_gen; @@ -230,7 +231,7 @@ static void sdl_update_frame_format (vo_driver_t *this_gen, SDL_LockYUVOverlay (frame->overlay); } - frame->ratio_code = ratio_code; + frame->ratio = ratio; } @@ -318,12 +319,12 @@ static void sdl_display_frame (vo_driver_t *this_gen, vo_frame_t *frame_gen) { if ( (frame->width != this->sc.delivered_width) || (frame->height != this->sc.delivered_height) - || (frame->ratio_code != this->sc.delivered_ratio_code) ) { + || (frame->ratio != this->sc.delivered_ratio) ) { printf("video_out_sdl: change frame format\n"); - this->sc.delivered_width = frame->width; - this->sc.delivered_height = frame->height; - this->sc.delivered_ratio_code = frame->ratio_code; + this->sc.delivered_width = frame->width; + this->sc.delivered_height = frame->height; + this->sc.delivered_ratio = frame->ratio; sdl_compute_ideal_size( this ); @@ -365,8 +366,8 @@ static int sdl_set_property (vo_driver_t *this_gen, sdl_driver_t *this = (sdl_driver_t *) this_gen; if ( property == VO_PROP_ASPECT_RATIO) { - if (value>=NUM_ASPECT_RATIOS) - value = ASPECT_AUTO; + if (value>=XINE_VO_ASPECT_NUM_RATIOS) + value = XINE_VO_ASPECT_AUTO; this->sc.user_ratio = value; printf("video_out_sdl: aspect ratio changed to %s\n", vo_scale_aspect_ratio_name(value)); @@ -595,6 +596,6 @@ static vo_info_t vo_info_sdl = { plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_VIDEO_OUT, 15, "sdl", XINE_VERSION_CODE, &vo_info_sdl, init_class }, + { PLUGIN_VIDEO_OUT, 16, "sdl", XINE_VERSION_CODE, &vo_info_sdl, init_class }, { PLUGIN_NONE, 0, "" , 0 , NULL, NULL} }; |