tsunami 0.3.1 → 0.4.0

data/.gitignore

@@ -19,8 +19,14 @@ rdoc
 pkg
 
 ## PROJECT::SPECIFIC
+*.log
 lib/*.mp3
 lib/*.wav
 lib/*.ogg
 lib/*.png
 lib/test.rb
+ext/*.wav
+ext/test.rb
+ext/*.o
+ext/*.bundle
+ext/Makefile

data/Rakefile

@@ -11,7 +11,6 @@ begin
     gem.homepage = "http://github.com/zmack/tsunami"
     gem.authors = ["Andrei Bocan"]
     gem.add_dependency "rmagick", ">= 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.3.1
+0.4.0

data/ext/extconf.rb

@@ -0,0 +1,11 @@
+require 'mkmf'
+
+$CFLAGS = `pkg-config --cflags sndfile`.chop
+$LDFLAGS = `pkg-config --libs sndfile`.chop
+
+unless find_library 'sndfile', 'sf_open'
+  raise 'You need to install libsndfile (http://www.mega-nerd.com/libsndfile/)'
+  exit
+end
+
+create_makefile 'tsunami_ext'

data/ext/snd_analytics.c

@@ -0,0 +1,48 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <sndfile.h>
+#include "snd_analytics.h"
+
+const FRAMES_IN_BUFFER = 2000;
+
+TsunamiRange *get_stats(char *path, short sample_count) {
+  SNDFILE *file;
+  SF_INFO info;
+  float *buffer;
+  TsunamiRange *samples;
+  unsigned int offset = 0, frames_per_sample;
+  short i, buffer_size, read_frames, sample_index = 0;
+
+  file = sf_open(path, SFM_READ, &info);
+  buffer_size = FRAMES_IN_BUFFER * info.channels * sizeof(float);
+
+  frames_per_sample = info.frames / sample_count;
+
+  buffer = (float *)malloc(buffer_size);
+
+  samples = (TsunamiRange *)malloc(sample_count * sizeof(TsunamiRange));
+
+  for( i = 0; i < sample_count; i++ ) {
+    samples[i].min = 1;
+    samples[i].max = -1;
+  }
+
+  while ( read_frames = sf_readf_float(file, buffer, FRAMES_IN_BUFFER) ) {
+    for( i = 0; i < read_frames; i += info.channels ) {
+      sample_index = (i + offset) / frames_per_sample;
+
+      if (samples[sample_index].min > buffer[i]) {
+        samples[sample_index].min = buffer[i];
+      }
+
+      if (samples[sample_index].max < buffer[i]) {
+        samples[sample_index].max = buffer[i];
+      }
+    }
+    offset += read_frames;
+  }
+
+  free(buffer);
+  sf_close(file);
+  return samples;
+}

data/ext/snd_analytics.h

@@ -0,0 +1,7 @@
+
+typedef struct {
+    float min;
+    float max;
+} TsunamiRange;
+
+TsunamiRange *get_stats(char *path, short sample_count);

data/ext/tsunami_ext.c

@@ -0,0 +1,51 @@
+/*Include the Ruby headers and goodies*/
+#include "ruby.h"
+#include "snd_analytics.h"
+
+// Defining a space for information and references about the module to be stored internally
+VALUE MyTest = Qnil;
+
+// Prototype for the initialization method - Ruby calls this, not you
+void Init_tsunami_ext();
+
+// Prototype for our method 'test1' - methods are prefixed by 'method_' here
+VALUE method_get_stats(VALUE self, VALUE path, VALUE samples);
+
+// The initialization method for this module
+void Init_tsunami_ext() {
+  MyTest = rb_define_module("TsunamiC");
+  rb_define_singleton_method(MyTest, "get_stats", method_get_stats, 2);
+}
+
+VALUE min_max_hash(float min, float max) {
+  VALUE min_symb = ID2SYM(rb_intern("min"));
+  VALUE max_symb = ID2SYM(rb_intern("max"));
+  
+  VALUE hash = rb_hash_new();
+  rb_hash_aset(hash, min_symb, rb_float_new(min));
+  rb_hash_aset(hash, max_symb, rb_float_new(max));
+
+  return hash;
+}
+
+// Our 'test1' method.. it simply returns a value of '10' for now.
+VALUE method_get_stats(VALUE self, VALUE rb_path, VALUE rb_samples) {
+  TsunamiRange *values;
+  VALUE array, hash;
+
+  int i;
+  char *path = STR2CSTR(rb_path);
+  int samples = FIX2INT(rb_samples);
+
+  array = rb_ary_new();
+  
+  values = get_stats(path, samples);
+
+  for(i = 0; i < samples; i++) {
+    rb_ary_push(array, min_max_hash(values[i].min, values[i].max));
+  }
+
+  free(values);
+
+  return array;
+}

data/lib/tsunami.rb

@@ -1,82 +1,44 @@
-#this class was inspired by rjp's awesome http://github.com/rjp/cdcover
-require 'rubygems'
 require 'RMagick'
-require 'ruby-audio'
-require 'buffer_ext.rb'
-require 'tsunami/bucket'
+require 'tsunami_ext'
 
 class Tsunami
+  attr_accessor :width, :height
 
   def initialize audio_file
-    @audio_file = RubyAudio::Sound.new audio_file
-  end
+    raise Errno::ENOENT.new(audio_file) unless File.exist? audio_file
 
-  def create_waveform(image_file, options = {})
-    dimensions = {
-      :width => options[:width] || 100,
-      :height => options[:height] || 50
-    }
+    @file_name = audio_file
+  end
 
-    versions = {
-      image_file => dimensions
-    }
+  def create_waveform(image_file, width, height)
+    self.width = width
+    self.height = height
 
-    create_waveforms(versions)
-  end
+    values = TsunamiC.get_stats(@file_name, width)
 
-  def create_waveforms(versions)
-    create_buckets versions
-    fill_buckets
+    canvas = draw_waveform(values)
 
-    @buckets.each do |key, bucket|
-      canvas = draw_waveform_from_bucket(bucket)
-      canvas.write(key.to_s)
-    end
+    canvas.write(image_file)
   end
 
-  def draw_waveform_from_bucket(bucket)
-    gc = build_graph bucket
+  def draw_waveform(values)
+    gc = build_graph(values)
 
-    canvas = Magick::Image.new(bucket.width, bucket.height) { self.background_color = 'transparent' }
+    canvas = Magick::Image.new(width, height) { self.background_color = 'transparent' }
 
     gc.draw(canvas)
 
     canvas
   end
 
-  def create_buckets(versions)
-    @buckets = {}
-    versions.each_key do |key|
-      @buckets[key] = Bucket.new(total_frames, versions[key][:width], versions[key][:height])
-    end
-  end
-
-  def fill_buckets
-    @audio_file.seek(0,0)
-    frames = @audio_file.read("float", total_frames)
-    frame_index = 0
-
-    frames.each do |channel_frames|
-      if @audio_file.info.channels > 1
-        frame = channel_frames[0]
-      else
-        frame = channel_frames
-      end
-
-      @buckets.values.each { |b| b.set(frame_index, frame) }
-
-      frame_index += 1
-    end
-  end
-
-  def build_graph bucket
+  def build_graph(values)
     gc = Magick::Draw.new
     gc.stroke('red')
     gc.stroke_width(1)
 
-    mid = bucket.height / 2
+    mid = height / 2
 
-    bucket.each_value_with_index do |values, i|
+    values.each_with_index do |values, i|
       low = values[:min]
       high = values[:max]
 
@@ -89,8 +51,4 @@ class Tsunami
     return gc
   end
 
-  def total_frames
-    @total_frames ||= @audio_file.info.frames
-  end
-
 end

data/tsunami.gemspec

@@ -5,13 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tsunami}
-  s.version = "0.3.1"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrei Bocan"]
-  s.date = %q{2010-04-19}
+  s.date = %q{2010-05-06}
   s.description = %q{For reals, it draws waveforms, man}
   s.email = %q{zmaxor@gmail.com}
+  s.extensions = ["ext/extconf.rb"]
   s.extra_rdoc_files = [
     "LICENSE",
      "README.rdoc"
@@ -23,9 +24,12 @@ Gem::Specification.new do |s|
      "README.rdoc",
      "Rakefile",
      "VERSION",
+     "ext/extconf.rb",
+     "ext/snd_analytics.c",
+     "ext/snd_analytics.h",
+     "ext/tsunami_ext.c",
      "lib/buffer_ext.rb",
      "lib/tsunami.rb",
-     "lib/tsunami/bucket.rb",
      "test/helper.rb",
      "test/test_tsunami.rb",
      "tsunami.gemspec"
@@ -46,16 +50,13 @@ 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>, [">= 1.0.0"])
       s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
     else
       s.add_dependency(%q<rmagick>, [">= 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>, [">= 1.0.0"])
     s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
   end
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 1
-  version: 0.3.1
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Andrei Bocan
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-19 00:00:00 +03:00
+date: 2010-05-06 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,24 +29,10 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: ruby-audio
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  type: :runtime
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: thoughtbot-shoulda
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -54,13 +40,13 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id003
+  version_requirements: *id002
 description: For reals, it draws waveforms, man
 email: zmaxor@gmail.com
 executables: []
 
-extensions: []
-
+extensions: 
+- ext/extconf.rb
 extra_rdoc_files: 
 - LICENSE
 - README.rdoc
@@ -71,9 +57,12 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- ext/extconf.rb
+- ext/snd_analytics.c
+- ext/snd_analytics.h
+- ext/tsunami_ext.c
 - lib/buffer_ext.rb
 - lib/tsunami.rb
-- lib/tsunami/bucket.rb
 - test/helper.rb
 - test/test_tsunami.rb
 - tsunami.gemspec

data/lib/tsunami/bucket.rb

@@ -1,39 +0,0 @@
-require 'forwardable'
-
-class Tsunami
-  class Bucket
-    extend ::Forwardable
-
-    def_delegator :@values, :each, :each_value
-    def_delegator :@values, :each_with_index, :each_value_with_index
-
-    attr_reader :width, :height, :frames
-
-    def initialize(frames, width, height)
-      @values = []
-      @frames = frames
-      @width = width
-      @height = height
-    end
-
-    def set(frame, value)
-      frame_values = values(frame)
-
-      frame_values[:min] = value if value < frame_values[:min]
-
-      frame_values[:max] = value if value > frame_values[:max]
-    end
-
-    def frames_per_pixel
-      @frames_per_pixel ||= frames / @width
-    end
-
-    def index(frame)
-      frame / frames_per_pixel
-    end
-
-    def values(frame)
-      @values[index(frame)] ||= { :max => -1, :min => 1 }
-    end
-  end
-end