X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Flibgame%2Fsound.c;h=cb7dc63d92f96da122b9b2f22c22725ee912b324;hb=e4467a70cdf808b36d10965bdf6316f0cbc35214;hp=ceeee1477b532295520d29efda50b861118f410c;hpb=77570cca460afce38d688221214f93f0c6d0a8c9;p=rocksndiamonds.git

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 */
   {