scissor 0.0.26 → 0.1.0

data/README.rdoc

@@ -15,6 +15,7 @@ supported file format:
 
 * {FFmpeg}[http://ffmpeg.mplayerhq.hu/]
 * {Ecasound}[http://www.eca.cx/ecasound/] 2.5.0 or higher
+* {Rubber Band}[http://breakfastquay.com/rubberband/]
 
 === Archive Installation
 
@@ -67,6 +68,10 @@ supported file format:
 
  foo.pitch(50)
 
+=== 200% time stretch without changing the pitch
+
+ foo.stretch(200)
+
 === mix
 
  Scissor.mix([foo, bar], 'mix.mp3')

data/Rakefile

@@ -1,4 +1,5 @@
 require 'rubygems'
+gem 'rspec', '< 2'
 require 'rake'
 require 'rake/clean'
 require 'spec/rake/spectask'
@@ -17,7 +18,7 @@ DESCRIPTION       = "utility to chop sound files"
 RUBYFORGE_PROJECT = "scissor"
 HOMEPATH          = "http://github.com/youpy/scissor"
 BIN_FILES         = %w(  )
-VERS              = "0.0.26"
+VERS              = "0.1.0"
 
 REV = File.read(".svn/entries")[/committed-rev="(d+)"/, 1] rescue nil
 CLEAN.include ['**/.*.sw?', '*.gem', '.config']

data/lib/scissor/chunk.rb

@@ -147,7 +147,7 @@ module Scissor
         new_instance.add_fragment(Fragment.new(
             fragment.filename,
             fragment.start,
-            fragment.true_duration,
+            fragment.original_duration,
             !fragment.reversed?,
             fragment.pitch))
       end
@@ -155,21 +155,27 @@ module Scissor
       new_instance
     end
 
-    def pitch(pitch)
+    def pitch(pitch, stretch = false)
       new_instance = self.class.new
 
       @fragments.each do |fragment|
         new_instance.add_fragment(Fragment.new(
             fragment.filename,
             fragment.start,
-            fragment.true_duration,
+            fragment.original_duration,
             fragment.reversed?,
-            fragment.pitch * (pitch.to_f / 100)))
+            fragment.pitch * (pitch.to_f / 100),
+            stretch))
       end
 
       new_instance
     end
 
+    def stretch(factor)
+      factor_for_pitch = ((100 / factor.to_f) * 100).to_i
+      pitch(factor_for_pitch, true)
+    end
+
     def to_file(filename, options = {})
       Scissor.mix([self], filename, options)
     end

data/lib/scissor/fragment.rb

@@ -4,12 +4,13 @@ module Scissor
   class Fragment
     attr_reader :filename, :start, :pitch
 
-    def initialize(filename, start, duration, reverse = false, pitch = 100)
+    def initialize(filename, start, duration, reverse = false, pitch = 100, stretch = false)
       @filename = Pathname.new(filename).realpath
       @start = start
       @duration = duration
       @reverse = reverse
       @pitch = pitch
+      @is_stretched = stretch
 
       freeze
     end
@@ -18,7 +19,7 @@ module Scissor
       @duration * (100 / pitch.to_f)
     end
 
-    def true_duration
+    def original_duration
       @duration
     end
 
@@ -26,6 +27,10 @@ module Scissor
       @reverse
     end
 
+    def stretched?
+      @is_stretched
+    end
+
     def create(remaining_start, remaining_length)
       new_fragment = nil
 

data/lib/scissor/writer.rb

@@ -11,49 +11,65 @@ module Scissor
     class FileExists < Error; end
     class EmptyFragment < Error; end
     class CommandFailed < Error; end
+    class CommandNotFound < Error; end
 
     def initialize
       @tracks = []
 
       which('ecasound')
       which('ffmpeg')
+      which('rubberband')
     end
 
     def add_track(fragments)
       @tracks << fragments
     end
 
-    def fragments_to_file(fragments, outfile, tmpdir)
+    def join_fragments(fragments, outfile, tmpdir)
       position = 0.0
       cmd = %w/ecasound/
 
       fragments.each_with_index do |fragment, index|
         fragment_filename = fragment.filename
-        fragment_duration = fragment.duration
 
         if !index.zero? && (index % 28).zero?
           run_command(cmd.join(' '))
           cmd = %w/ecasound/
         end
 
-        fragment_outfile =
-          fragment_filename.extname.downcase == '.wav' ? fragment_filename :
-          tmpdir + (Digest::MD5.hexdigest(fragment_filename.to_s) + '.wav')
+        if fragment_filename.extname.downcase == '.wav'
+          fragment_outfile = fragment_filename
+        else
+          fragment_outfile = tmpdir + (Digest::MD5.hexdigest(fragment_filename.to_s) + '.wav')
+        end
 
         unless fragment_outfile.exist?
           run_command("ffmpeg -i \"#{fragment_filename}\" \"#{fragment_outfile}\"")
         end
 
-        cmd <<
-          "-a:#{index} " +
-          "-i:" +
-          (fragment.reversed? ? 'reverse,' : '') +
-          "select,#{fragment.start},#{fragment.true_duration},\"#{fragment_outfile}\" " +
-          "-o:#{outfile} " +
-          (fragment.pitch.to_f == 100.0 ? "" : "-ei:#{fragment.pitch} ") +
-          "-y:#{position}"
+        cmd << "-a:#{index} -o:#{outfile} -y:#{position}"
+
+        if fragment.stretched? && fragment.pitch.to_f != 100.0
+          rubberband_out = tmpdir + (Digest::MD5.hexdigest(fragment_filename.to_s) + "rubberband_#{index}.wav")
+          rubberband_temp = tmpdir + "_rubberband.wav"
+          
+          run_command("ecasound " + 
+            "-i:" +
+            (fragment.reversed? ? 'reverse,' : '') +
+            "select,#{fragment.start},#{fragment.original_duration},\"#{fragment_outfile}\" -o:#{rubberband_temp} "
+          )
+          run_command("rubberband -T #{fragment.pitch.to_f/100} \"#{rubberband_temp}\" \"#{rubberband_out}\"")
+
+          cmd << "-i:\"#{rubberband_out}\""
+        else
+          cmd << 
+            "-i:" +
+            (fragment.reversed? ? 'reverse,' : '') +
+            "select,#{fragment.start},#{fragment.original_duration},\"#{fragment_outfile}\" " +
+            (fragment.pitch.to_f == 100.0 ? "" : "-ei:#{fragment.pitch} ")
+        end
 
-        position += fragment_duration
+        position += fragment.duration
       end
 
       run_command(cmd.join(' '))
@@ -96,8 +112,9 @@ module Scissor
         tmpfiles = []
 
         @tracks.each_with_index do |fragments, track_index|
-          tmpfiles << tmpfile = tmpdir + 'track_%s.wav' % track_index.to_s
-          fragments_to_file(fragments, tmpfile, tmpdir)
+          tmpfile = tmpdir + 'track_%s.wav' % track_index.to_s
+          tmpfiles << tmpfile
+          join_fragments(fragments, tmpfile, tmpdir)
         end
 
         mix_files(tmpfiles, final_tmpfile = tmpdir + 'tmp.wav')
@@ -112,6 +129,8 @@ module Scissor
 
     def which(command)
       run_command("which #{command}")
+    rescue
+      raise CommandNotFound.new(command + ': command not found')
     end
 
     def run_command(cmd)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: scissor
 version: !ruby/object:Gem::Version 
-  hash: 43
+  hash: 27
   prerelease: 
   segments: 
   - 0
+  - 1
   - 0
-  - 26
-  version: 0.0.26
+  version: 0.1.0
 platform: ruby
 authors: 
 - youpy
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-18 00:00:00 +09:00
+date: 2011-07-20 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency