X-Git-Url: https://jasonwoof.com/gitweb/?p=vor.git;a=blobdiff_plain;f=sound.c;h=0dc94efd366f6ca3b1047ffdab88b75d96f58b9d;hp=7f369ae79a11c619cefcdf0c3b32dad43972c730;hb=1d9107a3d43b3f57087edee14f1eaf7c1f3db54e;hpb=841f94c4182f8dff0253db9bae4922c3c9039a5f

diff --git a/sound.c b/sound.c
index 7f369ae..0dc94ef 100644
--- a/sound.c
+++ b/sound.c
@@ -18,26 +18,25 @@ int audio_rate;
 Uint16 audio_format;
 int audio_channels;
 
-char *add_path(char *);
+char *add_data_path(char *);
 char *wav_file[] = {
-	"sounds/booom.wav",
-	"sounds/cboom.wav",
-	"sounds/boom.wav",
-	"sounds/bzboom.wav"
+	"booom.wav",
+	"cboom.wav",
+	"boom.wav",
+	"bzboom.wav"
 };
 
 char *tune_file[] = {
-	"music/magic.mod",
-	"music/getzznew.mod",
-	"music/4est_fulla3s.mod"
+	"magic.mod",
+	"getzznew.mod",
+	"4est_fulla3s.mod"
 };
 
+// Return 1 if the sound is ready to roll, and 0 if not.
 int
 init_sound() {
-	// Return 1 if the sound is ready to roll, and 0 if not.
-
 	int i;
-	debug(printf ("Initialise sound\n"));
+	char *s;
 
 	// Initialise output with SDL_mixer
 	if (Mix_OpenAudio(MIX_DEFAULT_FREQUENCY, AUDIO_S16, MIX_DEFAULT_CHANNELS, 4096) < 0) {
@@ -45,25 +44,23 @@ init_sound() {
 	return 0;
 	}
 
-	debug(
-			// What kind of sound did we get?  Ah who cares. As long as it can play
-			// some basic bangs and simple music.
-			Mix_QuerySpec(&audio_rate, &audio_format, &audio_channels);
-			printf("Opened audio at %d Hz %d bit %s\n", audio_rate,
-				(audio_format&0xFF),
-				(audio_channels > 1) ? "stereo" : "mono");
-			) 
-
 	// Preload all the tunes into memory
 	for (i=0; i<NUM_TUNES; i++) {
-		if (!(music[i] = Mix_LoadMUS(add_path(tune_file[i])))) {
-			printf ("Failed to load %s\n",add_path(tune_file[i]));
+		s = add_data_path(tune_file[i]);
+		if(s) {
+			music[i] = Mix_LoadMUS(s);
+			if(!music[i]) printf("Failed to load %s.\n", s);
+			free(s);
 		}
 	}
 
 	// Preload all the wav files into memory
 	for (i=0; i<NUM_SOUNDS; i++) {
-		wav[i] = Mix_LoadWAV(add_path(wav_file[i]));
+		s = add_data_path(wav_file[i]);
+		if(s) {
+			wav[i] = Mix_LoadWAV(s);
+			free(s);
+		}
 	}
 
 	return 1;
@@ -72,7 +69,6 @@ init_sound() {
 void
 play_sound(int i)  {
 	if(!opt_sound) return;
-	debug(printf ("play sound %d on first free channel\n",i));
 	Mix_PlayChannel(-1, wav[i], 0);
 }/*}}}*/
 
@@ -86,12 +82,7 @@ play_tune(int i) {/*{{{*/
 	return;
 	if (playing) {
 		Mix_FadeOutMusic(1500);
-		debug(printf("Stop playing %d\n",playing));
 	}
-	debug(
-			printf ("Play music %d\n",i);
-			printf ("volume %d\n",music_volume[i]);
-			)
 	Mix_FadeInMusic(music[i],-1,2000);
 	Mix_VolumeMusic(music_volume[i]);