Sound Unit Test buildable on Mac

Makefile

@@ -47,14 +47,18 @@ DEBUG_OBJ=
 BASE_DEFS += -DHAVE_OPENAL
 
 ifeq ($(UNAME),Darwin)
-BASE_LIBS += -lalut
-BASE_LIBS += -framework OpenAL
+AUDIO_LIBS += -lalut
+AUDIO_LIBS += -L/opt/local/lib
+AUDIO_LIBS += -I/opt/local/include
+AUDIO_LIBS += -framework OpenAL
 BASE_LIBS += -framework OpenGL
 BASE_LIBS += -framework GLUT
 else
-BASE_LIBS += -lopenal
+AUDIO_LIBS += -lopenal
 endif
 
+BASE_LIBS += $(AUDIO_LIBS)
+
 # libferit, File transfer via HTTP/FTP/etc support
 LIBFERIT_LIB=/usr/local/lib/libferit.so
 LIBFERIT=$(shell if test -e $(LIBFERIT_LIB) > /dev/null; then echo yes; fi)
@@ -512,8 +516,11 @@ Network.test:
 Sound.test:
 	mkdir -p $(BUILD_TEST_DIR)
 	$(CC) $(TEST_FLAGS) -DUNIT_TEST_SOUND \
-		-DUSING_OPENAL -lopenal \
+		-DUSING_OPENAL -DHAVE_OPENAL $(AUDIO_LIBS) \
 		src/Sound.cpp -o $(BUILD_TEST_DIR)/Sound.test
+ifeq ($(UNAME),Darwin)
+	install_name_tool -change libalut.0.1.0.dylib /opt/local/lib/libalut.0.1.0.dylib $(BUILD_TEST_DIR)/Sound.test
+endif
 
 #################################################################
 

src/Sound.cpp

@@ -301,13 +301,13 @@ int main(int argc, char* argv[])
 	{
 		snd.init();
 		printf("Loading %s\n", argv[1]);
-		ret = snd.addFile(argv[1], &id, SoundFlagsNone);
+		ret = snd.addFile(argv[1], &id, snd.SoundFlagsNone);
 		printf("Load returned %i\n", ret);
 		printf("Playing %u::%s\n", id, argv[1]);
 		snd.play(id);
 
 		printf("Waiting...\n");
-		sleep(5);
+		sleep(1);
 
 		f = fopen(argv[1], "rb");
 
@@ -323,14 +323,14 @@ int main(int argc, char* argv[])
 			fclose(f);
 
 			printf("Loading buffer of %s\n", argv[1]);
-			ret = snd.addFile(buf, &id, SoundFlagsNone);
+			ret = snd.addWave(buf, &id, snd.SoundFlagsNone);
 			printf("Load returned %i\n", ret);
 			printf("Playing buffer of %u::%s\n", id, argv[1]);
 			snd.play(id);
 
 			delete [] buf;
 			printf("Waiting...\n");
-			sleep(5);
+			sleep(1);
 		}
 	}
 	else