/*****************************************************************************
* sdl.c: SDL video output display method
*****************************************************************************
- * Copyright (C) 1998-2009 the VideoLAN team
+ * Copyright (C) 1998-2009 VLC authors and VideoLAN
* $Id$
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
* Laurent Aimar <fenrir _AT_ videolan _DOT_ org>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
#include <assert.h>
-#include <SDL/SDL.h>
+#include <SDL.h>
+
+#if !defined(_WIN32) && !defined(__OS2__)
+# ifdef X_DISPLAY_MISSING
+# error Xlib required due to XInitThreads
+# endif
+# include <vlc_xlib.h>
+#endif
/*****************************************************************************
* Module descriptor
"Force the SDL renderer to use a specific chroma format instead of " \
"trying to improve performances by using the most efficient one.")
-#define DRIVER_TEXT N_("SDL video driver name")
-#define DRIVER_LONGTEXT N_(\
- "Force a specific SDL video output driver.")
-
vlc_module_begin()
set_shortname("SDL")
set_category(CAT_VIDEO)
set_subcategory(SUBCAT_VIDEO_VOUT)
set_description(N_("Simple DirectMedia Layer video output"))
- set_capability("vout display", 60)
+ set_capability("vout display", 70)
add_shortcut("sdl")
- add_string("sdl-chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT, true)
-#ifdef HAVE_SETENV
- add_string("sdl-video-driver", NULL, NULL, DRIVER_TEXT, DRIVER_LONGTEXT, true)
-#endif
+ add_string("sdl-chroma", NULL, CHROMA_TEXT, CHROMA_LONGTEXT, true)
+ add_obsolete_string("sdl-video-driver") /* obsolete since 1.1.0 */
set_callbacks(Open, Close)
#if defined(__i386__) || defined(__x86_64__)
/* On i386, SDL is linked against svgalib */
- linked_with_a_crap_library_which_uses_atexit()
+ cannot_unload_broken_library()
#endif
vlc_module_end()
/*****************************************************************************
* Local prototypes
*****************************************************************************/
-static picture_t *Get (vout_display_t *);
-static void Display(vout_display_t *, picture_t *);
-static int Control(vout_display_t *, int, va_list);
-static void Manage(vout_display_t *);
+static picture_pool_t *Pool (vout_display_t *, unsigned);
+static void PictureDisplay(vout_display_t *, picture_t *, subpicture_t *);
+static int Control(vout_display_t *, int, va_list);
+static void Manage(vout_display_t *);
/* */
static int ConvertKey(SDLKey);
vout_display_t *vd = (vout_display_t *)object;
vout_display_sys_t *sys;
+#if !defined(_WIN32) && !defined(__OS2__)
+ if (!vlc_xlib_init (object))
+ return VLC_EGENERIC;
+#endif
+
/* XXX: check for conflicts with the SDL audio output */
vlc_mutex_lock(&sdl_lock);
return VLC_ENOMEM;
}
-#ifdef HAVE_SETENV
- char *psz_driver = var_CreateGetNonEmptyString(vd, "sdl-video-driver");
- if (psz_driver) {
- setenv("SDL_VIDEODRIVER", psz_driver, 1);
- free(psz_driver);
- }
-#endif
-
/* */
int sdl_flags = SDL_INIT_VIDEO;
-#ifndef WIN32
+#ifndef _WIN32
/* Win32 SDL implementation doesn't support SDL_INIT_EVENTTHREAD yet*/
sdl_flags |= SDL_INIT_EVENTTHREAD;
#endif
-#ifndef NDEBUG
/* In debug mode you may want vlc to dump a core instead of staying stuck */
sdl_flags |= SDL_INIT_NOPARACHUTE;
-#endif
/* Initialize library */
if (SDL_Init(sdl_flags) < 0) {
msg_Err(vd, "no video mode available");
goto error;
}
+ vout_display_DeleteWindow(vd, NULL);
sys->display = SDL_SetVideoMode(display_width, display_height,
sys->display_bpp, sys->display_flags);
/* */
vlc_fourcc_t forced_chroma = 0;
- char *psz_chroma = var_CreateGetNonEmptyString(vd, "sdl-chroma");
+ char *psz_chroma = var_InheritString(vd, "sdl-chroma");
if (psz_chroma) {
forced_chroma = vlc_fourcc_GetCodecFromString(VIDEO_ES, psz_chroma);
if (forced_chroma)
/* Try to open an overlay if requested */
sys->overlay = NULL;
- const bool is_overlay = var_CreateGetBool(vd, "overlay");
+ const bool is_overlay = var_InheritBool(vd, "overlay");
if (is_overlay) {
static const struct
{
vd->fmt = fmt;
vd->info = info;
- vd->get = Get;
+ vd->pool = Pool;
vd->prepare = NULL;
- vd->display = Display;
+ vd->display = PictureDisplay;
vd->control = Control;
vd->manage = Manage;
}
/**
- * Return a direct buffer
+ * Return a pool of direct buffers
*/
-static picture_t *Get(vout_display_t *vd)
+static picture_pool_t *Pool(vout_display_t *vd, unsigned count)
{
vout_display_sys_t *sys = vd->sys;
+ VLC_UNUSED(count);
if (!sys->pool) {
picture_resource_t rsc;
return NULL;
sys->pool = picture_pool_New(1, &picture);
- if (!sys->pool)
- return NULL;
}
- return picture_pool_Get(sys->pool);
+ return sys->pool;
}
/**
* Display a picture
*/
-static void Display(vout_display_t *vd, picture_t *p_pic)
+static void PictureDisplay(vout_display_t *vd, picture_t *p_pic, subpicture_t *p_subpicture)
{
vout_display_sys_t *sys = vd->sys;
}
picture_Release(p_pic);
+ VLC_UNUSED(p_subpicture);
}
case VOUT_DISPLAY_CHANGE_DISPLAY_SIZE: {
const vout_display_cfg_t *cfg = va_arg(args, const vout_display_cfg_t *);
- const bool is_forced = (bool)va_arg(args, int);
/* */
- if (is_forced)
- sys->display = SDL_SetVideoMode(cfg->display.width,
- cfg->display.height,
- sys->display_bpp, sys->display_flags);
+ sys->display = SDL_SetVideoMode(cfg->display.width,
+ cfg->display.height,
+ sys->display_bpp, sys->display_flags);
if (!sys->display) {
sys->display = SDL_SetVideoMode(vd->cfg->display.width,
vd->cfg->display.height,
}
case VOUT_DISPLAY_CHANGE_SOURCE_CROP:
- case VOUT_DISPLAY_CHANGE_ON_TOP:
+ case VOUT_DISPLAY_CHANGE_WINDOW_STATE:
/* I don't think it is possible to support with SDL:
* - crop
* - on top
const int y = (int64_t)(event.motion.y - sys->place.y) * vd->source.i_height / sys->place.height;
SDL_ShowCursor(1);
- if (x >= 0 && (unsigned)x < vd->source.i_width &&
- y >= 0 && (unsigned)y < vd->source.i_height)
- vout_display_SendEventMouseMoved(vd, x, y);
+ vout_display_SendEventMouseMoved(vd, x, y);
break;
}
projects / vlc / blobdiff