X-Git-Url: https://jasonwoof.com/gitweb/?p=vor.git;a=blobdiff_plain;f=sound.c;h=1a695350c412bcb79ba231908887145034d2b347;hp=7a2ad22d5ff22a6b8a0172d3b1ce039e0725a66e;hb=2b5dd5bc0eb1739dd744de6f565d0f3a7ae02c95;hpb=f8b249157652f109467064877561955910f98fc1

diff --git a/sound.c b/sound.c
index 7a2ad22..1a69535 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 opt_sound, opt_music;
-
-#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};
@@ -38,7 +37,6 @@ init_sound() {
 	// Return 1 if the sound is ready to roll, and 0 if not.
 
 	int i;
-	debug(printf ("Initialise sound\n"));
 
 	// Initialise output with SDL_mixer
 	if (Mix_OpenAudio(MIX_DEFAULT_FREQUENCY, AUDIO_S16, MIX_DEFAULT_CHANNELS, 4096) < 0) {
@@ -46,15 +44,6 @@ 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])))) {
@@ -73,7 +62,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);
 }/*}}}*/
 
@@ -87,12 +75,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]);