From 37b563d4cda91d1762f80f071a7b1eb1e64d5aa3 Mon Sep 17 00:00:00 2001
From: zicodxx <>
Date: Fri, 15 Jun 2007 08:10:19 +0000
Subject: [PATCH] complete removal of hmiplay-code usage

---
 CHANGELOG.txt   | 4 ++++
 SConstruct      | 4 ++--
 arch/sdl/digi.c | 3 +--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 503bfb910..1b4265359 100755
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,9 @@
 D2X-Rebirth Changelog
 
+20070615
+--------
+SConstruct, arch/sdl/digi.c: complete removal of hmiplay-code usage
+
 20070614
 --------
 2d/font.c, libmve/decoder16.c, main/object.c, main/piggy.c, main/polyobj.c, main/render.c, mem/mem.c: using size_t when it comes to integer to pointer conversions
diff --git a/SConstruct b/SConstruct
index 1ee53f9d1..245db4f05 100644
--- a/SConstruct
+++ b/SConstruct
@@ -253,14 +253,14 @@ arch_linux_sources = [
 common_sound_hmp2mid = [ 'misc/hmp2mid.c' ]
 arch_unix_sound_sdlmixer = [ 'arch/sdl/mixdigi.c', 'arch/sdl/mixmusic.c' ]
 arch_unix_sound_old = [ 'arch/sdl/digi.c'  ]
-arch_linux_sound_old = ['arch/linux/hmiplay.c' ]
+#arch_linux_sound_old = ['arch/linux/hmiplay.c' ]
 
 if (sdlmixer == 1):
 	common_sources += common_sound_hmp2mid
 	arch_unix_sources += arch_unix_sound_sdlmixer
 else:
 	arch_unix_sources += arch_unix_sound_old
-	arch_linux_sources += arch_linux_sound_old
+#	arch_linux_sources += arch_linux_sound_old
 
 # for windows
 arch_win32_sources = [
diff --git a/arch/sdl/digi.c b/arch/sdl/digi.c
index 1fafa53ed..1227e16a6 100755
--- a/arch/sdl/digi.c
+++ b/arch/sdl/digi.c
@@ -448,10 +448,9 @@ void digi_end_sound(int channel)
 
 #ifndef _WIN32
 // MIDI stuff follows.
-#if defined(__APPLE__) || defined(macintosh)
 void digi_set_midi_volume( int mvolume ) { }
 void digi_play_midi_song( char * filename, char * melodic_bank, char * drum_bank, int loop ) {}
-#endif
+
 void digi_stop_current_song()
 {
 #ifdef HMIPLAY