rnd-20001129-2-src

[rocksndiamonds.git] / src / init.c

diff --git a/src/init.c b/src/init.c
index b95b99c290fa5c81e620e2dee5e2da680b7174e6..851eaa5e9370a63c610ca102f3924166bb86af22 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -35,10 +35,6 @@ struct PictureFileInfo
   boolean picture_with_mask;
 };
 
-#ifndef TARGET_SDL
-static int sound_process_id = 0;
-#endif
-
 static void InitPlayerInfo(void);
 static void InitLevelInfo(void);
 static void InitNetworkServer(void);
@@ -146,34 +142,7 @@ void InitSound()
 {
   int i;
 
-  if (sound_status == SOUND_OFF)
-    return;
-
-#if defined(TARGET_SDL)
-  if (InitAudio())
-  {
-    sound_status = SOUND_AVAILABLE;
-    sound_loops_allowed = TRUE;
-  }
-  else
-  {
-    sound_status = SOUND_OFF;
-  }
-#else /* !TARGET_SDL */
-
-#if defined(PLATFORM_UNIX)
-  if ((sound_status = CheckAudio(sound_device_name)) == SOUND_OFF)
-    return;
-
-#ifdef VOXWARE
-  sound_loops_allowed = TRUE;
-#endif
-
-#else /* !PLATFORM_UNIX */
-  sound_loops_allowed = TRUE;
-
-#endif /* !PLATFORM_UNIX */
-#endif /* !TARGET_SDL */
+  OpenAudio(&audio);
 
   for(i=0; i<NUM_SOUNDS; i++)
   {
@@ -181,8 +150,8 @@ void InitSound()
 
     if (!LoadSound(&Sound[i]))
     {
-      sound_status = SOUND_OFF;
-      sound_loops_allowed = FALSE;
+      audio.sound_available = FALSE;
+      audio.loops_available = FALSE;
       return;
     }
   }
@@ -190,35 +159,35 @@ void InitSound()
 
 void InitSoundServer()
 {
-  if (sound_status == SOUND_OFF)
+  if (!audio.sound_available)
     return;
 
 #if !defined(TARGET_SDL)
 #if defined(PLATFORM_UNIX)
 
-  if (pipe(sound_pipe)<0)
+  if (pipe(audio.soundserver_pipe) < 0)
   {
     Error(ERR_WARN, "cannot create pipe - no sounds");
-    sound_status = SOUND_OFF;
+    audio.sound_available = FALSE;
     return;
   }
 
-  if ((sound_process_id = fork()) < 0)
+  if ((audio.soundserver_pid = fork()) < 0)
   {       
     Error(ERR_WARN, "cannot create sound server process - no sounds");
-    sound_status = SOUND_OFF;
+    audio.sound_available = FALSE;
     return;
   }
 
-  if (!sound_process_id)       /* we are child */
+  if (audio.soundserver_pid == 0)      /* we are child */
   {
     SoundServer();
 
     /* never reached */
     exit(0);
   }
-  else                         /* we are parent */
-    close(sound_pipe[0]);      /* no reading from pipe needed */
+  else                                 /* we are parent */
+    close(audio.soundserver_pipe[0]); /* no reading from pipe needed */
 
 #else /* !PLATFORM_UNIX */
 
@@ -1809,10 +1778,10 @@ void CloseAllAndExit(int exit_value)
   StopSounds();
   FreeSounds(NUM_SOUNDS);
 #else
-  if (sound_process_id)
+  if (audio.soundserver_pid)
   {
     StopSounds();
-    kill(sound_process_id, SIGTERM);
+    kill(audio.soundserver_pid, SIGTERM);
     FreeSounds(NUM_SOUNDS);
   }
 #endif