#include <SDL.h>
-#ifndef WIN32
+#if !defined(WIN32) && !defined(__OS2__)
# ifdef X_DISPLAY_MISSING
# error Xlib required due to XInitThreads
# endif
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)
+ 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__)
* Local prototypes
*****************************************************************************/
static picture_pool_t *Pool (vout_display_t *, unsigned);
-static void PictureDisplay(vout_display_t *, picture_t *);
+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 *);
vout_display_t *vd = (vout_display_t *)object;
vout_display_sys_t *sys;
-#ifndef WIN32
+#if !defined(WIN32) && !defined(__OS2__)
if (!vlc_xlib_init (object))
return VLC_EGENERIC;
#endif
/* 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) {
/* */
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
{
/**
* Display a picture
*/
-static void PictureDisplay(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);
}