ruby-audio 1.3.0 → 1.4.0

data/Rakefile

@@ -6,7 +6,7 @@ require 'spec/rake/spectask'
 
 spec = Gem::Specification.new do |s|
   s.name    = 'ruby-audio'
-  s.version = '1.3.0'
+  s.version = '1.4.0'
   s.summary = 'ruby-audio wraps around libsndfile to provide simplified sound reading and writing support to ruby programs'
   s.authors  = ['Stephen Augenstein']
   s.email    = 'perl.programmer@gmail.com'

data/ext/extconf.rb

@@ -1,12 +1,26 @@
 require 'mkmf'
 
-$CFLAGS = '-I/opt/local/include'
-$LDFLAGS = '-L/opt/local/lib -L/usr/local/lib'
+$CFLAGS.gsub!("-arch i386", "")
+$LDFLAGS.gsub!("-arch i386", "")
+
+dir_config('sndfile')
+
+# Mega-Nerd windows installer installs as libsndfile-1.dll
+if RUBY_PLATFORM =~ /(mswin|mingw|cygwin)/
+  sndfile_lib = 'sndfile-1'
+else
+  sndfile_lib = 'sndfile'
+end
 
 # libsndfile requirements
-unless find_library 'sndfile', 'sf_open'
-  raise 'You need to install libsndfile (http://www.mega-nerd.com/libsndfile/)'
-  exit
+find_header 'sndfile.h', '/opt/local/include', '/usr/local/include', 'C:/Program Files/Mega-Nerd/libsndfile/include'
+unless find_library sndfile_lib, 'sf_open', '/opt/local/lib', '/usr/local/lib', 'C:/Program Files/Mega-Nerd/libsndfile'
+  fail <<-EOM
+  Can't find libsndfile (http://www.mega-nerd.com/libsndfile/)
+
+  Try passing --with-sndfile-dir or --with-sndfile-lib and --with-sndfile-include
+  options to extconf.
+  EOM
 end
 
 # Check for format support

data/ext/ra_buffer.c

@@ -48,13 +48,21 @@ static void ra_buffer_free(RA_BUFFER *buf) {
  * Uses size, channels, and type to allocate a properly sized array and set data
  * to the pointer for that data. Returns size.
  */
-static int ra_buffer_alloc_data(RA_BUFFER *buf) {
-    int size;
+static long ra_buffer_alloc_data(RA_BUFFER *buf) {
+    long size = 0;
     switch(buf->type) {
-        case RA_BUFFER_TYPE_SHORT: size = sizeof(short)*buf->size*buf->channels; break;
-        case RA_BUFFER_TYPE_INT: size = sizeof(int)*buf->size*buf->channels; break;
-        case RA_BUFFER_TYPE_FLOAT: size = sizeof(float)*buf->size*buf->channels; break;
-        case RA_BUFFER_TYPE_DOUBLE: size = sizeof(double)*buf->size*buf->channels; break;
+        case RA_BUFFER_TYPE_SHORT:
+            size = sizeof(short) * buf->size * buf->channels;
+            break;
+        case RA_BUFFER_TYPE_INT:
+            size = sizeof(int) * buf->size * buf->channels;
+            break;
+        case RA_BUFFER_TYPE_FLOAT:
+            size = sizeof(float) * buf->size * buf->channels;
+            break;
+        case RA_BUFFER_TYPE_DOUBLE:
+            size = sizeof(double) * buf->size * buf->channels;
+            break;
     }
     buf->data = (void*)xmalloc(size);
     return size;
@@ -95,7 +103,7 @@ static VALUE ra_buffer_init(int argc, VALUE *argv, VALUE self) {
     buf->channels = (argc == 3) ? FIX2INT(argv[2]) : 1;
 
     // Allocate data array based on type
-    buf->size = FIX2INT(argv[1]);
+    buf->size = FIX2LONG(argv[1]);
     buf->real_size = 0;
     if(strcmp(buf_type, "short") == 0) buf->type = RA_BUFFER_TYPE_SHORT;
     else if(strcmp(buf_type, "int") == 0) buf->type = RA_BUFFER_TYPE_INT;
@@ -124,7 +132,7 @@ static VALUE ra_buffer_init_copy(VALUE copy, VALUE buf) {
 
     // Clone data
     memcpy(copy_struct, buf_struct, sizeof(RA_BUFFER));
-    int size = ra_buffer_alloc_data(copy_struct);
+    long size = ra_buffer_alloc_data(copy_struct);
     memcpy(copy_struct->data, buf_struct->data, size);
 
     return copy;
@@ -151,7 +159,7 @@ static VALUE ra_buffer_channels(VALUE self) {
 static VALUE ra_buffer_size(VALUE self) {
     RA_BUFFER *buf;
     Data_Get_Struct(self, RA_BUFFER, buf);
-    return INT2FIX(buf->size);
+    return LONG2FIX(buf->size);
 }
 
 /*
@@ -164,7 +172,7 @@ static VALUE ra_buffer_size(VALUE self) {
 static VALUE ra_buffer_real_size(VALUE self) {
     RA_BUFFER *buf;
     Data_Get_Struct(self, RA_BUFFER, buf);
-    return INT2FIX(buf->real_size);
+    return LONG2FIX(buf->real_size);
 }
 
 /*:nodoc:*/
@@ -172,7 +180,7 @@ static VALUE ra_buffer_real_size_set(VALUE self, VALUE real_size) {
     RA_BUFFER *buf;
     Data_Get_Struct(self, RA_BUFFER, buf);
 
-    int new_real_size = FIX2INT(real_size);
+    long new_real_size = FIX2LONG(real_size);
     if(new_real_size > buf->size) {
         buf->real_size = buf->size;
     } else if(new_real_size < 0) {
@@ -181,7 +189,7 @@ static VALUE ra_buffer_real_size_set(VALUE self, VALUE real_size) {
         buf->real_size = new_real_size;
     }
 
-    return INT2FIX(buf->real_size);
+    return LONG2FIX(buf->real_size);
 }
 
 /*
@@ -219,15 +227,15 @@ static VALUE ra_buffer_aref(VALUE self, VALUE index) {
     Data_Get_Struct(self, RA_BUFFER, buf);
 
     // Bounds check
-    int f = FIX2INT(index);
+    long f = FIX2LONG(index);
     if(f < 0 || f >= buf->real_size) return Qnil;
-    int i = f * buf->channels;
+    long i = f * buf->channels;
 
     if(buf->channels == 1) {
         return ra_buffer_index_get(buf, i);
     } else {
         VALUE frame = rb_ary_new();
-        int j;
+        long j;
         for(j = 0; j < buf->channels; j++) {
             rb_ary_push(frame, ra_buffer_index_get(buf, i+j));
         }
@@ -235,7 +243,7 @@ static VALUE ra_buffer_aref(VALUE self, VALUE index) {
     }
 }
 
-static VALUE ra_buffer_index_get(RA_BUFFER *buf, int i) {
+static VALUE ra_buffer_index_get(RA_BUFFER *buf, long i) {
     switch(buf->type) {
         case RA_BUFFER_TYPE_SHORT: return INT2FIX((int)((short*)buf->data)[i]);
         case RA_BUFFER_TYPE_INT: return INT2FIX(((int*)buf->data)[i]);
@@ -263,9 +271,9 @@ static VALUE ra_buffer_aset(VALUE self, VALUE index, VALUE val) {
     Data_Get_Struct(self, RA_BUFFER, buf);
 
     // Bounds check
-    int f = FIX2INT(index);
+    long f = FIX2LONG(index);
     if(f < 0 || f >= buf->size) rb_raise(eRubyAudioError, "setting frame out of bounds");
-    int i = f * buf->channels;
+    long i = f * buf->channels;
 
     // Set data
     if(buf->channels == 1) {
@@ -275,7 +283,7 @@ static VALUE ra_buffer_aset(VALUE self, VALUE index, VALUE val) {
         long length = RARRAY_LEN(val);
         if(length != buf->channels) rb_raise(eRubyAudioError, "array length must match channel count");
 
-        int j;
+        long j;
         for(j = 0; j < length; j++) {
             ra_buffer_index_set(buf, i+j, rb_ary_entry(val, j));
         }
@@ -289,7 +297,7 @@ static VALUE ra_buffer_aset(VALUE self, VALUE index, VALUE val) {
     return val;
 }
 
-static void ra_buffer_index_set(RA_BUFFER *buf, int i, 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);

data/ext/ra_buffer.h

@@ -13,8 +13,8 @@ typedef enum {
 typedef struct {
     BUFFER_TYPE type;
     void *data;
-    int size;
-    int real_size;
+    long size;
+    long real_size;
     int channels;
 } RA_BUFFER;
 
@@ -33,8 +33,8 @@ static VALUE ra_buffer_real_size(VALUE self);
 static VALUE ra_buffer_real_size_set(VALUE self, VALUE new_real_size);
 static VALUE ra_buffer_type(VALUE self);
 static VALUE ra_buffer_aref(VALUE self, VALUE index);
-static VALUE ra_buffer_index_get(RA_BUFFER *buf, int i);
+static VALUE ra_buffer_index_get(RA_BUFFER *buf, long i);
 static VALUE ra_buffer_aset(VALUE self, VALUE index, VALUE val);
-static void ra_buffer_index_set(RA_BUFFER *buf, int i, VALUE val);
+static void ra_buffer_index_set(RA_BUFFER *buf, long i, VALUE val);
 
 #endif        //  #ifndef RA_BUFFER_H

data/ext/ra_sound.c

@@ -437,7 +437,7 @@ static VALUE ra_sound_write(VALUE self, VALUE buf) {
     }
 
     // Write data
-    sf_count_t written;
+    sf_count_t written = 0;
     switch(b->type) {
         case RA_BUFFER_TYPE_SHORT:
             written = sf_writef_short(snd->snd, b->data, b->real_size);

data/lib/ruby-audio/sound_info.rb

@@ -49,7 +49,7 @@ module RubyAudio
 
     private
     def calculate_format
-      RubyAudio.constants.grep(/FORMAT_/).each do |f|
+      RubyAudio.constants.grep(/FORMAT_/).map(&:to_s).each do |f|
         next if f.include?('MASK') # Skip mask constants
 
         val = RubyAudio.const_get(f)

data/spec/buffer_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper.rb'
+require "spec_helper.rb"
 
 describe RubyAudio::Buffer do
   it "should initialize properly" do

data/spec/sound_info_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper.rb'
+require "spec_helper.rb"
 
 describe RubyAudio::SoundInfo do
   it "should initialize with default properties" do

data/spec/sound_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper.rb'
+require "spec_helper.rb"
 
 describe RubyAudio::Sound do
   MONO_TEST_WAV = File.dirname(__FILE__)+'/data/what.wav'

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-audio
 version: !ruby/object:Gem::Version 
+  hash: 7
   prerelease: false
   segments: 
   - 1
-  - 3
+  - 4
   - 0
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors: 
 - Stephen Augenstein
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-29 00:00:00 -04:00
+date: 2010-12-23 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -67,23 +68,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: 
 - libsndfile (http://www.mega-nerd.com/libsndfile/)
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: ruby-audio wraps around libsndfile to provide simplified sound reading and writing support to ruby programs