Mercurial > mplayer.hg
changeset 10945:c4634177933a
initial MorphOS/Amiga (GeekGadgets) support
author | alex |
---|---|
date | Fri, 26 Sep 2003 18:08:10 +0000 |
parents | e2be5ab1d6e3 |
children | d27635d109f2 |
files | configure libvo/vo_sdl.c |
diffstat | 2 files changed, 13 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Fri Sep 26 12:38:55 2003 +0000 +++ b/configure Fri Sep 26 18:08:10 2003 +0000 @@ -68,6 +68,7 @@ darwin() { issystem "Darwin" ; return "$?" ; } gnu() { issystem "GNU" ; return "$?" ; } mingw32() { issystem "MINGW32" ; return "$?" ; } +morphos() { issystem "MorphOS" ; return "$?" ; } # arch test boolean functions # x86/x86pc is used by QNX @@ -383,6 +384,9 @@ MINGW32*) system_name=MINGW32 ;; + MorphOS) + system_name=MorphOS + ;; *) system_name="$system_name-UNKNOWN" ;; @@ -430,6 +434,7 @@ openbsd) system_name=OpenBSD ;; sunos) system_name=SunOS ;; qnx) system_name=QNX ;; + morphos) system_name=MorphOS ;; esac # We need to convert underscores so that values like k6-2 and pentium-mmx can be passed host_arch=`echo $_target | cut -d '-' -f 1 | tr '_' '-'`
--- a/libvo/vo_sdl.c Fri Sep 26 12:38:55 2003 +0000 +++ b/libvo/vo_sdl.c Fri Sep 26 18:08:10 2003 +0000 @@ -448,7 +448,7 @@ #ifdef SDL_NOHWSURFACE if(verbose) printf("SDL: using software-surface\n"); priv->sdlflags = SDL_SWSURFACE|SDL_RESIZABLE|SDL_ASYNCBLIT|SDL_ANYFORMAT; - priv->sdlfullflags = SDL_SWSURFACE|SDL_FULLSCREEN|SDL_DOUBLEBUF|SDL_ASYNCBLIT|SDL_ANYFORMAT; + priv->sdlfullflags = SDL_SWSURFACE|SDL_FULLSCREEN|SDL_ASYNCBLIT|SDL_ANYFORMAT; #else /*if((strcmp(priv->driver, "dga") == 0) && (priv->mode)) { if(verbose) printf("SDL: using software-surface\n"); @@ -458,12 +458,15 @@ else { */ if(verbose) printf("SDL: using hardware-surface\n"); priv->sdlflags = SDL_HWSURFACE|SDL_RESIZABLE|SDL_ASYNCBLIT|SDL_HWACCEL/*|SDL_ANYFORMAT*/; - priv->sdlfullflags = SDL_HWSURFACE|SDL_FULLSCREEN|SDL_DOUBLEBUF|SDL_ASYNCBLIT|SDL_HWACCEL/*|SDL_ANYFORMAT*/; + priv->sdlfullflags = SDL_HWSURFACE|SDL_FULLSCREEN|SDL_ASYNCBLIT|SDL_HWACCEL/*|SDL_ANYFORMAT*/; //} #endif - + +#ifndef AMIGA + sdl->sdlfullflags |= SDL_DOUBLEBUF; if (vo_doublebuffering) priv->sdlflags |= SDL_DOUBLEBUF; +#endif /* Setup Keyrepeats (500/30 are defaults) */ SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, 100 /*SDL_DEFAULT_REPEAT_INTERVAL*/); @@ -895,9 +898,8 @@ ||(strcmp(priv->driver, "windib") == 0) ||(strcmp(priv->driver, "directx") == 0) ||(strcmp(priv->driver, "Quartz") == 0) - ||((strcmp(priv->driver, "aalib") == 0) - && priv->X) - ||(strcmp(priv->driver, "Quartz") == 0)) { + ||(strcmp(priv->driver, "cgx") == 0) + ||((strcmp(priv->driver, "aalib") == 0) && priv->X)){ if(verbose) printf("SDL: setting windowed mode\n"); set_video_mode(priv->dstwidth, priv->dstheight, priv->bpp, priv->sdlflags); }