comparison libvo/vo_sdl.c @ 14857:29a09f111b41

Remove -noxv and -forcexv command line options and replace them by suboptions to -vo sdl. Renamed noxv to nohwaccel to better reflect the meaning of the option. Updated manual page. Original patch by < ods15 at ods15 dot dyndns dot org> Modified by me.

14856:7b1198123519

#include "x11_common.h"
#endif

#include "input/input.h"
#include "input/mouse.h"

extern int verbose;
int sdl_noxv;
int sdl_forcexv;

static vo_info_t info = 
{
	"SDL YUV/RGB/BGR renderer (SDL v1.1.7+ only!)",
	"sdl",

}

static uint32_t preinit(const char *arg)
{
    struct sdl_priv_s *priv = &sdl_priv;

    priv->rgbsurface = NULL;
    priv->overlay = NULL;
    priv->surface = NULL;

    if(verbose > 2) printf("SDL: Opening Plugin\n");

    if(arg) setenv("SDL_VIDEODRIVER", arg, 1);

    /* does the user want SDL to try and force Xv */
    if(sdl_forcexv)	setenv("SDL_VIDEO_X11_NODIRECTCOLOR", "1", 1);

    /* does the user want to disable Xv and use software scaling instead */
    if(sdl_noxv) setenv("SDL_VIDEO_YUV_HWACCEL", "0", 1);

    /* default to no fullscreen mode, we'll set this as soon we have the avail. modes */
    priv->fullmode = -2;

    priv->fullmodes = NULL;

14857:29a09f111b41

#include "x11_common.h"
#endif

#include "input/input.h"
#include "input/mouse.h"
#include "subopt-helper.h"

extern int verbose;

static vo_info_t info = 
{
	"SDL YUV/RGB/BGR renderer (SDL v1.1.7+ only!)",
	"sdl",

}

static uint32_t preinit(const char *arg)
{
    struct sdl_priv_s *priv = &sdl_priv;
    char * sdl_driver;
    int sdl_hwaccel;
    int sdl_forcexv;
    opt_t subopts[] = {
	    {"forcexv", OPT_ARG_BOOL,  &sdl_forcexv, NULL, 0},
	    {"hwaccel", OPT_ARG_BOOL,  &sdl_hwaccel, NULL, 0},
	    {"driver",  OPT_ARG_MSTRZ, &sdl_driver,  NULL, 0},
	    {NULL, 0, NULL, NULL, 0}
    };

    sdl_forcexv = 1;
    sdl_hwaccel = 1;
    sdl_driver = strdup("x11");

    if (subopt_parse(arg, subopts) != 0) return -1;

    priv->rgbsurface = NULL;
    priv->overlay = NULL;
    priv->surface = NULL;

    if(verbose > 2) printf("SDL: Opening Plugin\n");

    if(sdl_driver) setenv("SDL_VIDEODRIVER", sdl_driver, 1);
    free(sdl_driver);

    /* does the user want SDL to try and force Xv */
    if(sdl_forcexv)	setenv("SDL_VIDEO_X11_NODIRECTCOLOR", "1", 1);
    else setenv("SDL_VIDEO_X11_NODIRECTCOLOR", "0", 1);

    /* does the user want to disable Xv and use software scaling instead */
    if(sdl_hwaccel) setenv("SDL_VIDEO_YUV_HWACCEL", "1", 1);
    else setenv("SDL_VIDEO_YUV_HWACCEL", "0", 1);

    /* default to no fullscreen mode, we'll set this as soon we have the avail. modes */
    priv->fullmode = -2;

    priv->fullmodes = NULL;