viking-bloopsaphone 0.4 → 0.4.1

data/ext/ruby/extconf.rb

@@ -1,15 +1,14 @@
 require 'mkmf'
 require 'fileutils'
 
-$CFLAGS << " -I../../c #{ENV['CFLAGS']}"
-$LIBS << " -lm -lportaudio #{ENV['LDFLAGS']}"
+$CFLAGS << " -I../../c "
 
-%w[notation.c threads.h bloopsaphone.c bloopsaphone.h].each do |fn|
-  fn = "../../c/#{fn}"
+%w[../../c/notation.c ../../c/bloopsaphone.c ../../c/bloopsaphone.h].each do |fn|
   abort "!! ERROR !!\n** #{fn} not found; type 'make ruby' in the top directory\n\n" \
     unless File.exists? fn
   FileUtils.cp(fn, ".")
 end
 
 have_library("portaudio")
+have_library("sndfile")
 create_makefile("bloops")

data/ext/ruby/rubyext.c

@@ -8,7 +8,6 @@
 #include "bloopsaphone.h"
 
 static VALUE cBloops, cSound, cTrack;
-static bloopsaphone *Pplain;
 
 #ifndef RSTRING_LEN
 #define RSTRING_LEN(str) RSTRING(str)->len
@@ -49,6 +48,15 @@ rb_bloops_play(VALUE self)
   return self;
 }
 
+VALUE
+rb_bloops_record(VALUE self, VALUE path)
+{
+  bloops *B;
+  Data_Get_Struct(self, bloops, B);
+  int result = bloops_record(B, StringValuePtr(path));
+  return self;
+}
+
 VALUE
 rb_bloops_is_stopped(VALUE self)
 {
@@ -80,7 +88,7 @@ rb_bloops_set_tempo(VALUE self, VALUE tempo)
 static void
 rb_bloops_sound_free(bloopsaphone *sound)
 {
-  bloops_sound_destroy(sound);
+  free(sound);
 }
 
 VALUE
@@ -100,65 +108,16 @@ VALUE
 rb_bloops_sound(VALUE self, VALUE type)
 {
   bloopsaphone *P = bloops_square();
-  P->params.type = (unsigned char)NUM2INT(type);
+  P->type = (unsigned char)NUM2INT(type);
   return Data_Wrap_Struct(cSound, NULL, rb_bloops_sound_free, P);
 }
 
-VALUE
-rb_bloops_sound_copy(VALUE self, VALUE other)
-{
-  bloopsaphone *P;
-  bloopsaphone *O;
-  Data_Get_Struct(self, bloopsaphone, P);
-  Data_Get_Struct(other, bloopsaphone, O);
-  bloops_sound_copy(P, O);
-  return Qnil;
-}
-
-VALUE
-rb_bloops_sound_str(VALUE self)
-{
-  bloopsaphone *P;
-  Data_Get_Struct(self, bloopsaphone, P);
-  return rb_str_new2(bloops_sound_str(P));
-}
-
-VALUE
-rb_bloops_reset(VALUE self)
-{
-  bloopsaphone *P;
-  Data_Get_Struct(self, bloopsaphone, P);
-  bloops_sound_copy(P, Pplain);
-  return self;
-}
-
-VALUE
-rb_bloops_test(VALUE self)
-{
-  bloops *B;
-  bloopsatrack *T;
-  bloopsaphone *P;
-
-  Data_Get_Struct(self, bloopsaphone, P);
-
-  B = bloops_new();
-  bloops_tempo(B, 120);
-  T = bloops_track2(B, P, "C");
-  T->notes[0].tone = 'n';
-  memcpy(&T->params, &P->params, sizeof(bloopsaparams));
-  bloops_play(B);
-  bloops_track_destroy(T);
-  bloops_destroy(B);
-
-  return self;
-}
-
 VALUE
 rb_bloops_get_type(VALUE self)
 {
   bloopsaphone *P;
   Data_Get_Struct(self, bloopsaphone, P);
-  return INT2NUM((int)P->params.type);
+  return INT2NUM((int)P->type);
 }
 
 VALUE
@@ -166,7 +125,7 @@ rb_bloops_set_type(VALUE self, VALUE type)
 {
   bloopsaphone *P;
   Data_Get_Struct(self, bloopsaphone, P);
-  P->params.type = (unsigned char)NUM2INT(type);
+  P->type = (unsigned char)NUM2INT(type);
   return type;
 }
 
@@ -174,12 +133,12 @@ rb_bloops_set_type(VALUE self, VALUE type)
   VALUE rb_bloops_get_##name(VALUE self) { \
     bloopsaphone *P; \
     Data_Get_Struct(self, bloopsaphone, P); \
-    return rb_float_new(P->params.name); \
+    return rb_float_new(P->name); \
   } \
   VALUE rb_bloops_set_##name(VALUE self, VALUE f) { \
     bloopsaphone *P; \
     Data_Get_Struct(self, bloopsaphone, P); \
-    P->params.name = (float)NUM2DBL(f); \
+    P->name = (float)NUM2DBL(f); \
     return f; \
   }
 
@@ -220,6 +179,7 @@ rb_bloops_track_free(bloopsatrack *track)
 VALUE
 rb_bloops_tune(VALUE self, VALUE sound, VALUE notes)
 {
+  int i;
   bloops *B;
   bloopsaphone *phone;
   bloopsatrack *track;
@@ -228,6 +188,12 @@ rb_bloops_tune(VALUE self, VALUE sound, VALUE notes)
 
   StringValue(notes);
   track = bloops_track(B, phone, RSTRING_PTR(notes), RSTRING_LEN(notes));
+
+  for (i = 0; i < BLOOPS_MAX_TRACKS; i++)
+    if (B->tracks[i] == NULL) {
+      bloops_track_at(B, track, i);
+      break;
+    }
   return Data_Wrap_Struct(cTrack, NULL, rb_bloops_track_free, track);
 }
 
@@ -252,15 +218,13 @@ rb_bloops_track_str(VALUE self)
 void
 Init_bloops()
 {
-  Pplain = bloops_square();
-
   cBloops = rb_define_class("Bloops", rb_cObject);
   rb_define_alloc_func(cBloops, rb_bloops_alloc);
   rb_define_method(cBloops, "clear", rb_bloops_clear, 0);
   rb_define_method(cBloops, "load", rb_bloops_load, 1);
   rb_define_method(cBloops, "play", rb_bloops_play, 0);
+  rb_define_method(cBloops, "record", rb_bloops_record, 1);
   rb_define_method(cBloops, "sound", rb_bloops_sound, 1);
-  rb_define_singleton_method(cBloops, "sound", rb_bloops_sound, 1);
   rb_define_method(cBloops, "stopped?", rb_bloops_is_stopped, 0);
   rb_define_method(cBloops, "tempo", rb_bloops_get_tempo, 0);
   rb_define_method(cBloops, "tempo=", rb_bloops_set_tempo, 1);
@@ -272,10 +236,6 @@ Init_bloops()
   rb_const_set(cBloops, rb_intern("NOISE"), INT2NUM(BLOOPS_NOISE));
 
   cSound = rb_define_class_under(cBloops, "Sound", rb_cObject);
-  rb_define_method(cSound, "initialize_copy", rb_bloops_sound_copy, 1);
-  rb_define_method(cSound, "to_s", rb_bloops_sound_str, 0);
-  rb_define_method(cSound, "reset", rb_bloops_reset, 0);
-  rb_define_method(cSound, "test", rb_bloops_test, 0);
   rb_define_method(cSound, "arp", rb_bloops_get_arp, 0);
   rb_define_method(cSound, "arp=", rb_bloops_set_arp, 1);
   rb_define_method(cSound, "aspeed", rb_bloops_get_aspeed, 0);

data/ext/ruby/test.rb

@@ -6,7 +6,6 @@ b.tempo = 320
 
 # an instrument
 saw = b.sound Bloops::SAWTOOTH
-saw.test
 
 # assign a track to the song
 b.tune saw, "c5 c6 b4 b5 d5 d6 e5 e6"
@@ -18,24 +17,10 @@ sleep 1 while !b.stopped?
 # a percussion
 beat = b.sound Bloops::NOISE
 beat.repeat = 0.6
-beat2 = b.sound Bloops::NOISE
-beat2.repeat = 0.2
-beat3 = b.sound Bloops::SQUARE
-beat3.sustain = 0.25
-beat3.decay = 0.2
-beat3.slide = 0.2
-beat3.square = 0.3
-beat3.vibe = 0.25
-beat3.vspeed = 0.25
 
 # assign a track to the song
-b.tune beat, "4 4 4 b4 4 d5 4 e5"
-b.tune beat2, "c2 4 c2 4 c2 4 c2 4"
-b.tune beat3, "4 4 4 4 4 c2 c5 4"
+b.tune beat, "4 4 b4 4 d5 4 e5 e6"
 
 # make it go
-loop do
-  b.play
-  saw.test
-  sleep 0.02 while !b.stopped?
-end
+b.play
+sleep 1 while !b.stopped?

data/ext/ruby/test_record.rb

@@ -0,0 +1,24 @@
+require './bloops'
+
+# the song object
+b = Bloops.new
+b.tempo = 320
+
+# an instrument
+saw = b.sound Bloops::SAWTOOTH
+
+# assign a track to the song
+b.tune saw, "c5 c6 b4 b5 d5 d6 e5 e6"
+
+# make it go
+b.record("out1.wav")
+
+# a percussion
+beat = b.sound Bloops::NOISE
+beat.repeat = 0.6
+
+# assign a track to the song
+b.tune beat, "4 4 b4 4 d5 4 e5 e6"
+
+# make it go
+b.record("out2.wav")

metadata

@@ -1,20 +1,21 @@
 --- !ruby/object:Gem::Specification 
 name: viking-bloopsaphone
 version: !ruby/object:Gem::Version 
-  version: "0.4"
+  version: 0.4.1
 platform: ruby
 authors: 
 - why the lucky stiff
+- Jeremy Stephens
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-02-12 00:00:00 -08:00
+date: 2009-09-26 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
 description: arcade sounds and chiptunes
-email: why@ruby-lang.org
+email: viking415@gmail.com
 executables: []
 
 extensions: 
@@ -28,20 +29,15 @@ files:
 - c/bloopsaphone.c
 - c/bloopsaphone.h
 - c/notation.c
-- c/threads.h
 - ext/ruby/extconf.rb
 - ext/ruby/rubyext.c
 - ext/ruby/test.rb
 - ext/ruby/test_load.rb
-- sounds/dart.blu
-- sounds/error.blu
-- sounds/ice.blu
-- sounds/jump.blu
-- sounds/pogo.blu
-- sounds/stun.blu
-has_rdoc: false
-homepage: http://github.com/why/bloopsaphone
-licenses: 
+- ext/ruby/test_record.rb
+has_rdoc: true
+homepage: http://github.com/viking/bloopsaphone
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -64,7 +60,7 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: arcade sounds and chiptunes
 test_files: []
 

data/c/threads.h

@@ -1,46 +0,0 @@
-//
-// threads.h - threaded garments for the bloopsaphone
-//
-#ifndef BLOOPSAPHONE_THREADS_H
-#define BLOOPSAPHONE_THREADS_H
-
-#ifdef _WIN32
-#include <windows.h>
-typedef CRITICAL_SECTION bloopsalock;
-static inline void bloops_lock_init(bloopsalock *lock) {
-    InitializeCriticalSection(lock);
-}
-static inline void bloops_lock_acquire(bloopsalock *lock) {
-    EnterCriticalSection(lock);
-}
-static inline int bloops_lock_try_acquire(bloopsalock *lock) {
-    return !!TryEnterCriticalSection(lock);
-}
-static inline void bloops_lock_release(bloopsalock *lock) {
-    LeaveCriticalSection(lock);
-}
-static inline void bloops_lock_finalize(bloopsalock *lock) {
-    DeleteCriticalSection(lock);
-}
-#else
-#include <pthread.h>
-#include <errno.h>
-typedef pthread_mutex_t bloopsalock;
-static inline void bloops_lock_init(bloopsalock *lock) {
-    pthread_mutex_init(lock, NULL);
-}
-static inline void bloops_lock_acquire(bloopsalock *lock) {
-    pthread_mutex_lock(lock);
-}
-static inline int bloops_lock_try_acquire(bloopsalock *lock) {
-    return !pthread_mutex_trylock(lock);
-}
-static inline void bloops_lock_release(bloopsalock *lock) {
-    pthread_mutex_unlock(lock);
-}
-static inline void bloops_lock_finalize(bloopsalock *lock) {
-    pthread_mutex_destroy(lock);
-}
-#endif
-
-#endif

data/sounds/dart.blu

@@ -1,10 +0,0 @@
-type    noise
-punch   0.524
-sustain 0.160
-decay   0.367
-freq    0.296
-slide  -0.373
-vibe    0.665
-vspeed  0.103
-phase   0.141
-psweep -0.005

data/sounds/error.blu

@@ -1,13 +0,0 @@
-type      square
-sustain   0.333
-decay     0.380
-freq      0.336
-slide     0.292
-square    0.289
-sweep     0.020
-vibe      0.002
-lpf       0.220
-lsweep    0.015
-resonance 0.875
-aspeed    0.035
-repeat    0.551

data/sounds/ice.blu

@@ -1,5 +0,0 @@
-type    square
-punch   0.441
-sustain 0.067
-decay   0.197
-freq    0.499

data/sounds/jump.blu

@@ -1,8 +0,0 @@
-type    square
-sustain 0.266
-decay   0.187
-freq    0.268
-slide   0.179
-square  0.326
-vibe    0.227
-vspeed  0.231

data/sounds/pogo.blu

@@ -1,19 +0,0 @@
-type      square
-volume    0.977
-punch     0.190
-sustain   0.165
-slide     0.100
-dslide    0.030
-square    0.048
-sweep    -0.055
-vibe      0.437
-vspeed    0.310
-lpf       0.355
-resonance 0.185
-hpf       0.205
-hsweep    0.255
-arp       0.677
-aspeed    0.275
-phase     0.200
-psweep   -0.565
-repeat    0.500

data/sounds/stun.blu

@@ -1,6 +0,0 @@
-type    sawtooth
-sustain 0.306
-decay   0.477
-freq    0.429
-slide   0.217
-repeat  0.677