tsunami 0.1.1 → 0.2.0

data/Rakefile

@@ -11,7 +11,7 @@ begin
     gem.homepage = "http://github.com/zmack/tsunami"
     gem.authors = ["Andrei Bocan"]
     gem.add_dependency "rmagick", ">= 0"
-    gem.add_dependency "ruby-audio", ">= 0"
+    gem.add_dependency "ruby-audio", ">= 1.0.0"
     gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/lib/buffer_ext.rb

@@ -0,0 +1,15 @@
+unless RubyAudio::Buffer.included_modules.include? Enumerable
+
+  module RubyAudio
+    class Buffer
+      include Enumerable
+
+      def each 
+        self.size.times do |i|
+          yield self[i]
+        end
+      end
+    end
+  end
+
+end

data/lib/tsunami.rb

@@ -1,12 +1,13 @@
 #this class was inspired by rjp's awesome http://github.com/rjp/cdcover
 require 'rubygems'
 require 'RMagick'
-require 'audio/sndfile'
+require 'ruby-audio'
+require 'buffer_ext.rb'
 
 class Tsunami
 
   def initialize audio_file
-    @audio_file = Audio::Soundfile.new audio_file
+    @audio_file = RubyAudio::Sound.new audio_file
   end
 
   def create_waveform(image_file, options = {})
@@ -26,12 +27,18 @@ class Tsunami
 
   def fill_buckets
     @audio_file.seek(0,0)
-    frames = @audio_file.read_float(@audio_file.frames).channel(0)
+    frames = @audio_file.read("float", @audio_file.info.frames)
     buckets = []
     frame_index = 0
-    frames_per_pixel = frames.length / @width
+    frames_per_pixel = frames.size / @width
+
+    frames.each do |channel_frames|
+      if @audio_file.info.channels > 1
+        frame = channel_frames[0]
+      else
+        frame = channel_frames
+      end
 
-    frames.each do |frame|
       index = frame_index / frames_per_pixel
       buckets[index] ||= { :max => -1, :min => 1 }
 

data/tsunami.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tsunami}
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrei Bocan"]
-  s.date = %q{2010-03-24}
+  s.date = %q{2010-03-25}
   s.description = %q{For reals, it draws waveforms, man}
   s.email = %q{zmaxor@gmail.com}
   s.extra_rdoc_files = [
@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
      "README.rdoc",
      "Rakefile",
      "VERSION",
+     "lib/buffer_ext.rb",
      "lib/tsunami.rb",
      "test/helper.rb",
      "test/test_tsunami.rb",
@@ -44,16 +45,16 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rmagick>, [">= 0"])
-      s.add_runtime_dependency(%q<ruby-audio>, [">= 0"])
+      s.add_runtime_dependency(%q<ruby-audio>, [">= 1.0.0"])
       s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
     else
       s.add_dependency(%q<rmagick>, [">= 0"])
-      s.add_dependency(%q<ruby-audio>, [">= 0"])
+      s.add_dependency(%q<ruby-audio>, [">= 1.0.0"])
       s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
     end
   else
     s.add_dependency(%q<rmagick>, [">= 0"])
-    s.add_dependency(%q<ruby-audio>, [">= 0"])
+    s.add_dependency(%q<ruby-audio>, [">= 1.0.0"])
     s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tsunami
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors: 
 - Andrei Bocan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-24 00:00:00 +02:00
+date: 2010-03-25 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.0.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: thoughtbot-shoulda
@@ -58,6 +58,7 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- lib/buffer_ext.rb
 - lib/tsunami.rb
 - test/helper.rb
 - test/test_tsunami.rb