X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsdl.c;h=8c0eff67376821d860115f1ee2be9ece494347f9;hb=681721dddc91bcdaef50002d1e861cc8d484e938;hp=7c38aa940d26fa1c45f5fc9639a9ca1fd7b17306;hpb=2ae6ae8ed951e87fcba7c363705cd6ddea8de91c;p=rocksndiamonds.git

diff --git a/src/libgame/sdl.c b/src/libgame/sdl.c
index 7c38aa94..8c0eff67 100644
--- a/src/libgame/sdl.c
+++ b/src/libgame/sdl.c
@@ -1,7 +1,7 @@
 /***********************************************************
 * Artsoft Retro-Game Library                               *
 *----------------------------------------------------------*
-* (c) 1994-2000 Artsoft Entertainment                      *
+* (c) 1994-2001 Artsoft Entertainment                      *
 *               Holger Schemel                             *
 *               Detmolder Strasse 189                      *
 *               33604 Bielefeld                            *
@@ -12,6 +12,7 @@
 ***********************************************************/
 
 #include "system.h"
+#include "sound.h"
 #include "misc.h"
 
 
@@ -24,8 +25,8 @@
 inline void SDLInitVideoDisplay(void)
 {
   /* initialize SDL video */
-  if (SDL_Init(SDL_INIT_VIDEO) < 0)
-    Error(ERR_EXIT, "SDL_Init() failed: %s", SDL_GetError());
+  if (SDL_InitSubSystem(SDL_INIT_VIDEO) < 0)
+    Error(ERR_EXIT, "SDL_InitSubSystem() failed: %s", SDL_GetError());
 
   /* set default SDL depth */
   video.default_depth = SDL_GetVideoInfo()->vfmt->BitsPerPixel;
@@ -61,16 +62,18 @@ inline void SDLInitVideoBuffer(DrawBuffer **backbuffer, DrawWindow **window,
 inline boolean SDLSetVideoMode(DrawBuffer **backbuffer, boolean fullscreen)
 {
   boolean success = TRUE;
-  int surface_flags = SDL_HWSURFACE | (fullscreen ? SDL_FULLSCREEN : 0);
+  int surface_flags_fullscreen = SURFACE_FLAGS | SDL_FULLSCREEN;
+  int surface_flags_window = SURFACE_FLAGS;
+  SDL_Surface *new_surface = NULL;
+
+  if (*backbuffer == NULL)
+    *backbuffer = CreateBitmapStruct();
 
   if (fullscreen && !video.fullscreen_enabled && video.fullscreen_available)
   {
     /* switch display to fullscreen mode, if available */
-    DrawWindow *window_old = *backbuffer;
-    DrawWindow *window_new = CreateBitmapStruct();
-
-    if ((window_new->surface = SDL_SetVideoMode(video.width, video.height,
-						video.depth, surface_flags))
+    if ((new_surface = SDL_SetVideoMode(video.width, video.height,
+					video.depth, surface_flags_fullscreen))
 	== NULL)
     {
       /* switching display to fullscreen mode failed */
@@ -82,23 +85,18 @@ inline boolean SDLSetVideoMode(DrawBuffer **backbuffer, boolean fullscreen)
     }
     else
     {
-      if (window_old)
-	FreeBitmap(window_old);
-      *backbuffer = window_new;
+      (*backbuffer)->surface = new_surface;
 
       video.fullscreen_enabled = TRUE;
       success = TRUE;
     }
   }
 
-  if ((!fullscreen && video.fullscreen_enabled) || !*backbuffer)
+  if ((!fullscreen && video.fullscreen_enabled) || new_surface == NULL)
   {
     /* switch display to window mode */
-    DrawWindow *window_old = *backbuffer;
-    DrawWindow *window_new = CreateBitmapStruct();
-
-    if ((window_new->surface = SDL_SetVideoMode(video.width, video.height,
-						video.depth, surface_flags))
+    if ((new_surface = SDL_SetVideoMode(video.width, video.height,
+					video.depth, surface_flags_window))
 	== NULL)
     {
       /* switching display to window mode failed -- should not happen */
@@ -108,9 +106,7 @@ inline boolean SDLSetVideoMode(DrawBuffer **backbuffer, boolean fullscreen)
     }
     else
     {
-      if (window_old)
-	FreeBitmap(window_old);
-      *backbuffer = window_new;
+      (*backbuffer)->surface = new_surface;
 
       video.fullscreen_enabled = FALSE;
       success = TRUE;
@@ -705,24 +701,40 @@ Bitmap *SDLLoadImage(char *filename)
 /* audio functions                                                           */
 /* ========================================================================= */
 
-inline boolean SDLOpenAudio(void)
+inline void SDLOpenAudio(void)
 {
-  if (SDL_Init(SDL_INIT_AUDIO) < 0)
+  if (SDL_InitSubSystem(SDL_INIT_AUDIO) < 0)
   {
-    Error(ERR_WARN, "SDL_Init() failed: %s", SDL_GetError());
-    return FALSE;
+    Error(ERR_WARN, "SDL_InitSubSystem() failed: %s", SDL_GetError());
+    return;
   }
 
-  if (Mix_OpenAudio(22050, AUDIO_S16, 2, 512) < 0)
+  if (Mix_OpenAudio(DEFAULT_AUDIO_SAMPLE_RATE, AUDIO_S16,
+		    AUDIO_STEREO_CHANNELS,
+		    DEFAULT_AUDIO_FRAGMENT_SIZE) < 0)
   {
     Error(ERR_WARN, "Mix_OpenAudio() failed: %s", SDL_GetError());
-    return FALSE;
+    return;
   }
 
-  Mix_Volume(-1, SDL_MIX_MAXVOLUME / 4);
-  Mix_VolumeMusic(SDL_MIX_MAXVOLUME / 4);
+  audio.sound_available = TRUE;
+  audio.music_available = TRUE;
+  audio.loops_available = TRUE;
+  audio.sound_enabled = TRUE;
+
+  /* determine number of available channels */
+  audio.channels = Mix_AllocateChannels(MIX_CHANNELS);
+
+  if (!audio.mods_available)	/* reserve first channel for music loops */
+  {
+    if (Mix_ReserveChannels(1) == 1)
+      audio.music_channel = 0;
+    else
+      audio.music_available = FALSE;
+  }
 
-  return TRUE;
+  Mix_Volume(-1, SOUND_MAX_VOLUME);
+  Mix_VolumeMusic(SOUND_MAX_VOLUME);
 }
 
 inline void SDLCloseAudio(void)
@@ -731,6 +743,7 @@ inline void SDLCloseAudio(void)
   Mix_HaltChannel(-1);
 
   Mix_CloseAudio();
+  SDL_QuitSubSystem(SDL_INIT_AUDIO);
 }
 
 #endif /* TARGET_SDL */