put bloops_play back the way it was to prevent double-adding

localhost · Jun 5, 2011 · e3777db · e3777db
1 parent f8ccd31
commit e3777db
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -47,6 +47,7 @@ clean:
 	@rm -f ${OBJ}
 	@rm -f c/notation.c c/*.o
 	@rm -f bloopsawhat libbloopsaphone.a bloopsaphone.so
+	@cd ext/ruby && make distclean || true
 
 ruby: c/notation.c c/bloopsaphone.c
 	@${ECHO} RUBY extconf.rb

diff --git a/c/bloopsaphone.c b/c/bloopsaphone.c
@@ -414,10 +414,9 @@ bloops_play(bloops *B)
       A->nextnote[1] = 0;
     }
 
+  bloops_remove(B);
   for (i = 0; i < BLOOPS_MAX_CHANNELS; i++) {
-    if (MIXER->B[i] == B) {
-      break;
-    } else if (MIXER->B[i] == NULL || MIXER->B[i]->play == BLOOPS_STOP) {
+    if (MIXER->B[i] == NULL || MIXER->B[i]->play == BLOOPS_STOP) {
       bloops_ref(B);
       if (MIXER->B[i] != NULL) {
         bloops_destroy(MIXER->B[i]);