X-Git-Url: https://jasonwoof.com/gitweb/?p=vor.git;a=blobdiff_plain;f=sound.c;h=3794bef559e573b2bb9279b347dd98ca1395d6df;hp=d522955b0cc7dcf4c25c53f41dac2c8f4ce52f9f;hb=148882a3cc520f34616a1175ed157fe258d68dcc;hpb=46dacbe75dac20a1c6e1b61a2eb99ca25fc971ec

diff --git a/sound.c b/sound.c
index d522955..3794bef 100644
--- a/sound.c
+++ b/sound.c
@@ -1,15 +1,14 @@
-#include "sound.h"
+#include <SDL/SDL.h>
+#include <SDL/SDL_mixer.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+
+#include "args.h"
+#include "common.h"
 #include "config.h"
+#include "sound.h"
 
-extern int sound_flag, music_flag;
-
-#define TUNE_TITLE_PAGE		0
-#define TUNE_GAMEPLAY		1
-#define TUNE_HIGH_SCORE_ENTRY	2
-#define NUM_TUNES		3
-
-#define SOUND_BANG		0
-#define NUM_SOUNDS		4
 
 static Mix_Music *music[NUM_TUNES];
 static int music_volume[NUM_TUNES] = {128,128,128};
@@ -19,7 +18,7 @@ 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",
@@ -33,12 +32,11 @@ char *tune_file[] = {
 	"music/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) {
@@ -46,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,8 +68,7 @@ init_sound() {
 
 void
 play_sound(int i)  {
-	if(!sound_flag) return;
-	debug(printf ("play sound %d on first free channel\n",i));
+	if(!opt_sound) return;
 	Mix_PlayChannel(-1, wav[i], 0);
 }/*}}}*/
 
@@ -82,17 +77,12 @@ int playing=-1;
 
 void
 play_tune(int i) {/*{{{*/
-	if(!music_flag) return;
+	if(!opt_music) return;
 	if (playing==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]);