youpy-scissor 0.0.20 → 0.0.21

data/README.rdoc

@@ -31,29 +31,42 @@ supported file format:
 
 == Synopsis
 
+=== instanciate
+
  foo = Scissor('foo.mp3')
  bar = Scissor('bar.wav')
   
- # concat
+=== concat
+
  foo + bar > 'foobar.mp3'
 
- # slice + concat
+=== slice + concat
+
  foo[10, 1] + bar[2, 3] > 'slicefoobar.mp3'
 
- # slice + concat + loop
+=== slice + concat + loop
+
  (foo[10, 1] + bar[2, 3]) * 4 > 'slicefoobarloop.mp3'
 
- # split
+=== split
+
  (Scissor('sequence.mp3') / 16).first.to_file('split.mp3')
 
- # replace first 10 seconds with 30 seconds of silence
+=== replace first 10 seconds with 30 seconds of silence
+
  foo.replace(0, 10, Scissor.silence(30)).to_file('replace.mp3')
 
- # sequence + loop
+=== sequence + loop
+
  seq = Scissor.sequence('x y  xyz', 0.2)
  seq.apply(:x => foo, :y => Proc.new { bar }, :z => foo.reverse) * 4 > 'sequence.wav'
 
- # mix
+=== half the pitch
+
+ foo.pitch(50)
+
+=== mix
+
  Scissor.mix([foo, bar], 'mix.mp3')
 
 == Copyright

data/Rakefile

@@ -17,7 +17,7 @@ DESCRIPTION       = "utility to chop sound files"
 RUBYFORGE_PROJECT = "scissor"
 HOMEPATH          = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
 BIN_FILES         = %w(  )
-VERS              = "0.0.20"
+VERS              = "0.0.21"
 
 REV = File.read(".svn/entries")[/committed-rev="(d+)"/, 1] rescue nil
 CLEAN.include ['**/.*.sw?', '*.gem', '.config']

data/lib/scissor/chunk.rb

@@ -150,20 +150,31 @@ module Scissor
         new_instance.add_fragment(Fragment.new(
             fragment.filename,
             fragment.start,
-            fragment.duration,
-            !fragment.reversed?))
+            fragment.true_duration,
+            !fragment.reversed?,
+            fragment.pitch))
       end
 
       new_instance
     end
 
-    def to_file(filename, options = {})
-      writer = Writer.new
+    def pitch(pitch)
+      new_instance = self.class.new
 
-      writer.add_track(@fragments)
-      writer.to_file(filename, options)
+      @fragments.each do |fragment|
+        new_instance.add_fragment(Fragment.new(
+            fragment.filename,
+            fragment.start,
+            fragment.true_duration,
+            fragment.reversed?,
+            fragment.pitch * (pitch.to_f / 100)))
+      end
 
-      self.class.new(filename)
+      new_instance
+    end
+
+    def to_file(filename, options = {})
+      Scissor.mix([self], filename, options)
     end
 
     alias > to_file

data/lib/scissor/fragment.rb

@@ -2,17 +2,26 @@ require 'pathname'
 
 module Scissor
   class Fragment
-    attr_reader :filename, :start, :duration
+    attr_reader :filename, :start, :pitch
 
-    def initialize(filename, start, duration, reverse = false)
+    def initialize(filename, start, duration, reverse = false, pitch = 100)
       @filename = Pathname.new(filename).realpath
       @start = start
       @duration = duration
       @reverse = reverse
+      @pitch = pitch
 
       freeze
     end
 
+    def duration
+      @duration * (100 / pitch.to_f)
+    end
+
+    def true_duration
+      @duration
+    end
+
     def reversed?
       @reverse
     end
@@ -26,16 +35,20 @@ module Scissor
         if remaining_start + remaining_length >= duration
           new_fragment = self.class.new(
             filename,
-            start + remaining_start,
-            duration - remaining_start)
+            start + remaining_start * pitch.to_f / 100,
+            (duration - remaining_start) * pitch.to_f / 100,
+            false,
+            pitch)
 
-          remaining_length -= (duration - remaining_start)
+          remaining_length -= duration - remaining_start
           remaining_start = 0
         else
           new_fragment = self.class.new(
             filename,
-            start + remaining_start,
-            remaining_length)
+            start + remaining_start * pitch.to_f / 100,
+            remaining_length * pitch.to_f / 100,
+            false,
+            pitch)
 
           remaining_start = 0
           remaining_length = 0

data/lib/scissor/writer.rb

@@ -46,8 +46,9 @@ module Scissor
           "-a:#{index} " +
           "-i:" +
           (fragment.reversed? ? 'reverse,' : '') +
-          "select,#{fragment.start},#{fragment_duration},\"#{fragment_outfile}\" " +
+          "select,#{fragment.start},#{fragment.true_duration},\"#{fragment_outfile}\" " +
           "-o:#{outfile} " +
+          (fragment.pitch.to_f == 100.0 ? "" : "-ei:#{fragment.pitch} ") +
           "-y:#{position}"
 
         position += fragment_duration

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: youpy-scissor
 version: !ruby/object:Gem::Version 
-  version: 0.0.20
+  version: 0.0.21
 platform: ruby
 authors: 
 - youpy