ruby-audio 1.6.0 → 1.6.1

data/ext/rubyaudio_ext/ra_buffer.c

@@ -67,6 +67,7 @@ static long ra_buffer_alloc_data(RA_BUFFER *buf) {
             break;
     }
     buf->data = (void*)xmalloc(size);
+    memset(buf->data, 0, size);
     return size;
 }
 
@@ -321,18 +322,21 @@ static VALUE ra_buffer_aset(VALUE self, VALUE index, VALUE val) {
 }
 
 static void ra_buffer_index_set(RA_BUFFER *buf, long i, VALUE val) {
-    switch(buf->type) {
-        case RA_BUFFER_TYPE_SHORT:
-            ((short*)buf->data)[i] = (short)FIX2INT(val);
-            break;
-        case RA_BUFFER_TYPE_INT:
-            ((int*)buf->data)[i] = FIX2INT(val);
-            break;
-        case RA_BUFFER_TYPE_FLOAT:
-            ((float*)buf->data)[i] = (float)RFLOAT_VALUE(val);
-            break;
-        case RA_BUFFER_TYPE_DOUBLE:
-            ((double*)buf->data)[i] = RFLOAT_VALUE(val);
-            break;
+    if(buf->type == RA_BUFFER_TYPE_SHORT || buf->type == RA_BUFFER_TYPE_INT) {
+        // Convert val to an integer
+        VALUE int_obj = rb_Integer(val);
+        if(TYPE(int_obj) != T_FIXNUM) rb_raise(eRubyAudioError, "could not convert frame value to an integer");
+        long int_val = FIX2LONG(int_obj);
+
+        // Set it
+        if(buf->type == RA_BUFFER_TYPE_SHORT) ((short*)buf->data)[i] = (short)int_val;
+        else ((int*)buf->data)[i] = (int)int_val;
+    } else {
+        // Convert val to a float
+        double float_val = RFLOAT_VALUE(rb_Float(val));
+
+        // Set it
+        if(buf->type == RA_BUFFER_TYPE_FLOAT) ((float*)buf->data)[i] = (float)float_val;
+        else ((double*)buf->data)[i] = float_val;
     }
 }

data/ruby-audio.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'ruby-audio'
-  s.version     = '1.6.0'
+  s.version     = '1.6.1'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Stephen Augenstein']
   s.email       = ['perl.programmer@gmail.com']

data/spec/buffer_spec.rb

@@ -17,10 +17,24 @@ describe RubyAudio::Buffer do
     }.should_not raise_error
   end
 
-  it "should allow [] access on single channel buffers" do
+  it "should allow [] access on integer single channel buffers" do
     buf = RubyAudio::Buffer.int(100, 1)
     buf[0] = 1.3
     buf[0].should == 1
+
+    buf = RubyAudio::Buffer.short(100, 1)
+    buf[20] = 614
+    buf[20].should == 614
+  end
+
+  it "should allow [] access on floating point single channel buffers" do
+    buf = RubyAudio::Buffer.double(100, 1)
+    buf[30] = 1.375
+    buf[30].should == 1.375
+
+    buf = RubyAudio::Buffer.float(100, 1)
+    buf[12] = 5
+    buf[12].should == 5.0
   end
 
   it "should allow [] access on multi-channel buffers" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 6
-  - 0
-  version: 1.6.0
+  - 1
+  version: 1.6.1
 platform: ruby
 authors: 
 - Stephen Augenstein
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-19 00:00:00 -05:00
+date: 2012-02-28 00:00:00 -05:00
 default_executable: 
 dependencies: []