tsunami 0.0.2 → 0.1.0

data/.gitignore

@@ -20,5 +20,7 @@ pkg
 
 ## PROJECT::SPECIFIC
 lib/*.mp3
+lib/*.wav
+lib/*.ogg
 lib/*.png
 lib/test.rb

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 "narray", ">= 0"
+    gem.add_dependency "ruby-audio", ">= 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.0.2
+0.1.0

data/lib/tsunami.rb

@@ -1,103 +1,64 @@
 #this class was inspired by rjp's awesome http://github.com/rjp/cdcover
 require 'rubygems'
 require 'RMagick'
-require 'narray'
+require 'audio/sndfile'
 
 class Tsunami
 
   def initialize audio_file
-    # graph parameters
-    @bitrate = '500'
-    @offset = 5
-    @audio_file = audio_file
+    @audio_file = Audio::Soundfile.new audio_file
   end
 
-  def create_waveform(image_file, options)
-    @width = options[:width].to_i || 100
-    @height = options[:height].to_i || 50
+  def create_waveform(image_file, options = {})
+    @width = options[:width] || 100
+    @height = options[:height] || 50
 
     buckets = fill_buckets
 
     gc = build_graph buckets
 
-    #create new image canvas
-    canvas = Magick::Image.new(@width + 2*@offset, @height) { self.background_color = 'transparent' }
+    canvas = Magick::Image.new(@width, @height) { self.background_color = 'transparent' }
 
-    # canvas = Magick::ImageList.new('images/waveform.png')
     gc.draw(canvas)
 
     canvas.write(image_file)
   end
 
-  #fill the buckets
   def fill_buckets
-    buckets = NArray.int(@width,2)
-
-    #let sox fetch the byte array
-    bytes = wave_bytes
-
-    bucket_size = (((bytes.size-1).to_f / @width)+0.5).to_i + 1
-
-    (0..bytes.total-1).each do |i|
-      value = bytes[i]
-      index = i/bucket_size
-      #minimum
-      buckets[index,0] = value if value < buckets[index,0]
-      #maximum
-      buckets[index,1] = value if value > buckets[index,1]
-      #total value
-      #buckets[index,2] += value
-      #count
-      #buckets[index,3] += 1
-      #negative total
-      #buckets[index,4] += value if value < 0
-      #positive total
-      #buckets[index,5] += value if value > 0
-    end
+    frames = @audio_file.read_float(@audio_file.frames).channel(0)
+    buckets = []
+    frame_index = 0
+    frames_per_pixel = frames.length / @width
 
-    return buckets
-  end
+    frames.each do |frame|
+      index = frame_index / frames_per_pixel
+      buckets[index] ||= { :max => -1, :min => 1 }
 
-  def wave_bytes
-    @wave_bytes ||= sox_get_bytes
-  end
+      buckets[index][:min] = frame if frame < buckets[index][:min]
+
+      buckets[index][:max] = frame if frame > buckets[index][:max]
 
-  #open file with sox and return a byte array with sweet waveform information in it
-  def sox_get_bytes channels = 1
-    x=nil
-    # read a 16 bit linear raw PCM file
-    sox_command = [ 'sox', @audio_file, '-t', 'raw', '-r', @bitrate, '-c', channels.to_s, '-s', '-L', '-' ]
-    # we have to fork/exec to get a clean commandline
-    IO.popen('-') { |p|
-      if p.nil? then
-        $stderr.close
-        # raw 16 bit linear PCM one channel
-        exec *sox_command
-      end
-      x = p.read
-    }
-    if x.size == 0 then
-      puts "sox returned no data, command was\n> #{sox_command.join(' ')}"
-      exit 1
+      frame_index += 1
     end
-    return NArray.to_na(x.unpack("s*"))
+
+    return buckets
   end
 
-  #build the waveform graph
   def build_graph buckets
     gc = Magick::Draw.new
+    gc.stroke('red')
+    gc.stroke_width(1)
+
+    mid = @height/2
+
+    buckets.each_with_index do |bucket, i|
+      low = bucket[:min]
+      high = bucket[:max]
+
+      low_point = mid * ( 1 - low )
+      high_point = mid * ( 1 - high )
 
-    scale = 32768/@height*2.75
-    midpoint = @height/2
-
-    (0..(buckets.size/2)-1).each do |i|
-      low = buckets[i,0]
-      high = buckets[i,1]
-      gc.stroke('red')
-      gc.stroke_width(1)
-      low_point = midpoint+low/scale
-      high_point = midpoint+high/scale
-      gc.line(i+@offset, low_point.to_i, i+@offset, high_point.to_i)
+      gc.line(i, low_point.to_i, i, high_point.to_i)
     end
 
     return gc

data/tsunami.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tsunami}
-  s.version = "0.0.2"
+  s.version = "0.1.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-09}
+  s.date = %q{2010-03-10}
   s.description = %q{For reals, it draws waveforms, man}
   s.email = %q{zmaxor@gmail.com}
   s.extra_rdoc_files = [
@@ -44,16 +44,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<narray>, [">= 0"])
+      s.add_runtime_dependency(%q<ruby-audio>, [">= 0"])
       s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
     else
       s.add_dependency(%q<rmagick>, [">= 0"])
-      s.add_dependency(%q<narray>, [">= 0"])
+      s.add_dependency(%q<ruby-audio>, [">= 0"])
       s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
     end
   else
     s.add_dependency(%q<rmagick>, [">= 0"])
-    s.add_dependency(%q<narray>, [">= 0"])
+    s.add_dependency(%q<ruby-audio>, [">= 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.0.2
+  version: 0.1.0
 platform: ruby
 authors: 
 - Andrei Bocan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-09 00:00:00 +02:00
+date: 2010-03-10 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,7 +23,7 @@ dependencies:
         version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: narray
+  name: ruby-audio
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement