From: Holger Schemel <info@artsoft.org>
Date: Sun, 12 May 2002 19:11:32 +0000 (+0200)
Subject: rnd-20020512-2-src
X-Git-Tag: 2.1.0^2~22
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=e4467a70cdf808b36d10965bdf6316f0cbc35214;p=rocksndiamonds.git

rnd-20020512-2-src
---

diff --git a/src/libgame/sound.c b/src/libgame/sound.c
index ceeee147..cb7dc63d 100644
--- a/src/libgame/sound.c
+++ b/src/libgame/sound.c
@@ -773,15 +773,26 @@ static void HandleSoundRequest(SoundControl snd_ctrl)
     SendSoundControlToMixerProcess(&snd_ctrl);
     return;
   }
-#elif defined(TARGET_SDL)
+#endif
+
   for (i=0; i<audio.num_channels; i++)
+  {
+    if (!mixer[i].active)
+      continue;
+
+    if (i != audio.music_channel &&
+	DelayReached(&mixer[i].playing_starttime, SOUND_LOOP_EXPIRATION_TIME))
+    {
+      Mixer_StopChannel(i);
+      continue;
+    }
+
+#if defined(TARGET_SDL)
+
     if (!Mix_Playing(i))
       Mixer_StopChannel(i);
+
 #elif defined(TARGET_ALLEGRO)
-  for (i=0; i<audio.num_channels; i++)
-  {
-    if (!mixer[i].active || IS_LOOP(mixer[i]))
-      continue;
 
     mixer[i].playing_pos = voice_get_position(mixer[i].voice);
     mixer[i].volume = voice_get_volume(mixer[i].voice);
@@ -789,8 +800,9 @@ static void HandleSoundRequest(SoundControl snd_ctrl)
     /* sound sample has completed playing or was completely faded out */
     if (mixer[i].playing_pos == -1 || mixer[i].volume == 0)
       Mixer_StopChannel(i);
-  }
+
 #endif /* TARGET_ALLEGRO */
+  }
 
   if (IS_RELOADING(snd_ctrl))		/* load new sound or music files */
   {
diff --git a/src/libgame/sound.h b/src/libgame/sound.h
index db99a81d..5350c143 100644
--- a/src/libgame/sound.h
+++ b/src/libgame/sound.h
@@ -65,6 +65,9 @@
 #define AUDIO_FORMAT_LE				(1 << 2)
 #define AUDIO_FORMAT_BE				(1 << 3)
 
+/* expiration time (in milliseconds) for sound loops */
+#define SOUND_LOOP_EXPIRATION_TIME		200
+
 #if defined(TARGET_SDL)
 /* one second fading interval == 1000 ticks (milliseconds) */
 #define SOUND_FADING_INTERVAL			1000