Merge pull request #6 from livibetter/master

Fix only one sound played at the same time and Makefile by using Channels
nogweii · Aug 8, 2011 · af6f300 · af6f300
2 parents 8f79a83 + 5a21781
commit af6f300
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -4,5 +4,5 @@ SDLCONFIG = -g ${shell sdl-config --cflags --libs}
 
 all: pianistic
 
-pianistic:
-	$(CC) -o $@ $@.c ${LDLIBS} ${SDLCONFIG}
+pianistic: pianistic.c
+	$(CC) -o $@ $< ${LDLIBS} ${SDLCONFIG}
diff --git a/pianistic.c b/pianistic.c
@@ -40,19 +40,19 @@ int stop = 0;
 
 void event_callback (XPointer, XRecordInterceptData*);
 void play (int index);
-Mix_Music* sounds[26];
+Mix_Chunk *sounds[12];
 
 void loadSounds(){
   char path[256];
   int letter = 0;
   for (;letter < 12; letter ++) {
     sprintf(path, "audio/%c.wav", letter + 'a');
-    sounds[letter] = Mix_LoadMUS(path);
+    sounds[letter] = Mix_LoadWAV(path);
   }
 }
 
 void play(int index) {
-  Mix_PlayMusic(sounds[index%12], 0);
+  Mix_PlayChannel(index%12, sounds[index%12], 0);
 }
 
 int main (int argc, char **argv)
@@ -69,6 +69,7 @@ int main (int argc, char **argv)
     printf("Unable to open audio!\n");
     exit(1);
   }
+  Mix_AllocateChannels(12);
   loadSounds();
 
   // RECORD