From b09ff6f00346a6aacf09930888523ab8a68115e2 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Mon, 5 Sep 2005 22:50:56 +0000
Subject: Add mmus2mid code from prboom. Use 'void *' for music handles. Pass
 length of data when registering music.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 75
---
 src/s_sound.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'src/s_sound.c')

diff --git a/src/s_sound.c b/src/s_sound.c
index 90b8ac06..8c4b571a 100644
--- a/src/s_sound.c
+++ b/src/s_sound.c
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*- 
 //-----------------------------------------------------------------------------
 //
-// $Id: s_sound.c 73 2005-09-05 20:32:18Z fraggle $
+// $Id: s_sound.c 75 2005-09-05 22:50:56Z fraggle $
 //
 // Copyright(C) 1993-1996 Id Software, Inc.
 // Copyright(C) 2005 Simon Howard
@@ -22,6 +22,10 @@
 // 02111-1307, USA.
 //
 // $Log$
+// Revision 1.6  2005/09/05 22:50:56  fraggle
+// Add mmus2mid code from prboom.  Use 'void *' for music handles.  Pass
+// length of data when registering music.
+//
 // Revision 1.5  2005/09/05 20:32:18  fraggle
 // Use the system-nonspecific sound code to assign the channel number used
 // by SDL.  Remove handle tagging stuff.
@@ -46,7 +50,7 @@
 
 
 static const char
-rcsid[] = "$Id: s_sound.c 73 2005-09-05 20:32:18Z fraggle $";
+rcsid[] = "$Id: s_sound.c 75 2005-09-05 22:50:56Z fraggle $";
 
 
 
@@ -685,7 +689,7 @@ S_ChangeMusic
 
     // load & register it
     music->data = (void *) W_CacheLumpNum(music->lumpnum, PU_MUSIC);
-    music->handle = I_RegisterSong(music->data);
+    music->handle = I_RegisterSong(music->data, W_LumpLength(music->lumpnum));
 
     // play it
     I_PlaySong(music->handle, looping);
-- 
cgit v1.2.3