diff options
| author | Petri Hintukainen <phintuka@users.sourceforge.net> | 2014-04-30 13:05:14 +0300 |
|---|---|---|
| committer | Petri Hintukainen <phintuka@users.sourceforge.net> | 2014-04-30 13:05:14 +0300 |
| commit | 21f34715ee7ff3ead66ff029ea0c3334c64e7213 (patch) | |
| tree | 7ca486281ea7868b15fb7107aee4b1e47afc04b2 /src | |
| parent | e27a23fa6f14dde0f26fd3aba249128b4d47e55e (diff) | |
| download | xine-lib-21f34715ee7ff3ead66ff029ea0c3334c64e7213.tar.gz xine-lib-21f34715ee7ff3ead66ff029ea0c3334c64e7213.tar.bz2 | |
cosmetics
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_out/video_out_sdl.c | 45 |
1 files changed, 22 insertions, 23 deletions
diff --git a/src/video_out/video_out_sdl.c b/src/video_out/video_out_sdl.c index a539f8827..5311147ca 100644 --- a/src/video_out/video_out_sdl.c +++ b/src/video_out/video_out_sdl.c @@ -64,7 +64,6 @@ #include <xine/xineutils.h> #include <xine/vo_scale.h> -#undef HAVE_X11 #ifdef HAVE_X11 #include <X11/Xlib.h> #endif @@ -274,32 +273,32 @@ static int sdl_redraw_needed (vo_driver_t *this_gen) { if (this->sc.frame_output_cb) { - if( _x_vo_scale_redraw_needed( &this->sc ) ) { + if( _x_vo_scale_redraw_needed( &this->sc ) ) { - sdl_compute_output_size (this); + sdl_compute_output_size (this); - ret = 1; - } + ret = 1; + } - return ret; + return ret; } else { - if( this->last_gui_width != this->sc.gui_width || - this->last_gui_height != this->sc.gui_height || - this->sc.force_redraw ) { + if( this->last_gui_width != this->sc.gui_width || + this->last_gui_height != this->sc.gui_height || + this->sc.force_redraw ) { - this->last_gui_width = this->sc.gui_width; - this->last_gui_height = this->sc.gui_height; + this->last_gui_width = this->sc.gui_width; + this->last_gui_height = this->sc.gui_height; - sdl_compute_output_size (this); + sdl_compute_output_size (this); - ret = 1; - } + ret = 1; + } - this->sc.force_redraw = 0; + this->sc.force_redraw = 0; - return ret; + return ret; } } @@ -493,14 +492,14 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi _x_vo_scale_init( &this->sc, 0, 0, config); if (visual) { - this->sc.frame_output_cb = visual->frame_output_cb; - this->sc.user_data = visual->user_data; + this->sc.frame_output_cb = visual->frame_output_cb; + this->sc.user_data = visual->user_data; - /* set SDL to use our existing X11/win32 window */ - if (visual->d){ - sprintf(SDL_windowhack,"SDL_WINDOWID=0x%x", (uint32_t) visual->d); - putenv(SDL_windowhack); - } + /* set SDL to use our existing X11/win32 window */ + if (visual->d) { + sprintf(SDL_windowhack,"SDL_WINDOWID=0x%x", (uint32_t) visual->d); + putenv(SDL_windowhack); + } } if ((SDL_Init (SDL_INIT_VIDEO)) < 0) { |