scissor 0.3.0 → 0.4.0

data/lib/scissor/fragment.rb

@@ -2,15 +2,16 @@ require 'pathname'
 
 module Scissor
   class Fragment
-    attr_reader :filename, :start, :pitch
+    attr_reader :filename, :start, :pitch, :pan
 
-    def initialize(filename, start, duration, reverse = false, pitch = 100, stretch = false)
+    def initialize(filename, start, duration, reverse = false, pitch = 100, stretch = false, pan = 50)
       @filename = Pathname.new(filename).realpath
       @start = start
       @duration = duration
       @reverse = reverse
       @pitch = pitch
       @is_stretched = stretch
+      @pan = pan
 
       freeze
     end
@@ -32,37 +33,55 @@ module Scissor
     end
 
     def create(remaining_start, remaining_length)
-      new_fragment = nil
-
       if remaining_start >= duration
-        remaining_start -= duration
+        return [nil, remaining_start - duration, remaining_length]
+      end
+
+      have_remain_to_return = (remaining_start + remaining_length) >= duration
+
+      if have_remain_to_return
+        new_length = duration - remaining_start
+        remaining_length -= new_length
       else
-        if remaining_start + remaining_length >= duration
-          new_fragment = self.class.new(
-            filename,
-            start + remaining_start * pitch.to_f / 100,
-            (duration - remaining_start) * pitch.to_f / 100,
-            false,
-            pitch,
-            stretched?)
+        new_length = remaining_length
+        remaining_length = 0
+      end
+
+      new_fragment = clone do |attributes|
+        attributes.update(
+          :start    =>  start + remaining_start * pitch.to_f / 100,
+          :duration =>  new_length * pitch.to_f / 100,
+          :reverse  => false
+          )
+      end
+
+      return [new_fragment, 0, remaining_length]
+    end
 
-          remaining_length -= duration - remaining_start
-          remaining_start = 0
-        else
-          new_fragment = self.class.new(
-            filename,
-            start + remaining_start * pitch.to_f / 100,
-            remaining_length * pitch.to_f / 100,
-            false,
-            pitch,
-            stretched?)
+    def clone(&block)
+      attributes = {
+        :filename => filename,
+        :start    => start,
+        :duration => original_duration,
+        :reverse  => reversed?,
+        :pitch    => pitch,
+        :stretch  => stretched?,
+        :pan      => pan
+      }
 
-          remaining_start = 0
-          remaining_length = 0
-        end
+      if block_given?
+        block.call(attributes)
       end
 
-      return new_fragment, remaining_start, remaining_length
+      self.class.new(
+        attributes[:filename],
+        attributes[:start],
+        attributes[:duration],
+        attributes[:reverse],
+        attributes[:pitch],
+        attributes[:stretch],
+        attributes[:pan]
+      )
     end
   end
 end

data/lib/scissor/tape.rb

@@ -170,13 +170,9 @@ module Scissor
       new_instance = self.class.new
 
       @fragments.reverse.each do |fragment|
-        new_instance.add_fragment(Fragment.new(
-            fragment.filename,
-            fragment.start,
-            fragment.original_duration,
-            !fragment.reversed?,
-            fragment.pitch,
-            fragment.stretched?))
+        new_instance.add_fragment(fragment.clone do |attributes|
+            attributes[:reverse] = !fragment.reversed?
+          end)
       end
 
       new_instance
@@ -186,13 +182,10 @@ module Scissor
       new_instance = self.class.new
 
       @fragments.each do |fragment|
-        new_instance.add_fragment(Fragment.new(
-            fragment.filename,
-            fragment.start,
-            fragment.original_duration,
-            fragment.reversed?,
-            fragment.pitch * (pitch.to_f / 100),
-            stretch))
+        new_instance.add_fragment(fragment.clone do |attributes|
+            attributes[:pitch]   = fragment.pitch * (pitch.to_f / 100)
+            attributes[:stretch] = stretch
+          end)
       end
 
       new_instance
@@ -203,6 +196,18 @@ module Scissor
       pitch(factor_for_pitch, true)
     end
 
+    def pan(right_percent)
+      new_instance = self.class.new
+
+      @fragments.each do |fragment|
+        new_instance.add_fragment(fragment.clone do |attributes|
+            attributes[:pan] = right_percent
+          end)
+      end
+
+      new_instance
+    end
+
     def to_file(filename, options = {})
       Scissor.mix([self], filename, options)
     end

data/lib/scissor/writer.rb

@@ -49,6 +49,10 @@ module Scissor
 
         cmd << "-a:#{index} -o:#{outfile} -y:#{position}#{is_mono[fragment_filename] ? ' -chcopy:1,2' : ''}"
 
+        if fragment.pan != 50
+          cmd << "-epp:%i" % fragment.pan
+        end
+
         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"

data/scissor.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.name          = %q{scissor}
   gem.require_paths = ["lib"]
-  gem.version       = "0.3.0"
+  gem.version       = "0.4.0"
 
   gem.add_dependency('open4', '>= 1.3.0')
   gem.add_dependency('ruby-mp3info')

data/spec/fragment_spec.rb

@@ -37,6 +37,12 @@ describe Scissor::Fragment do
     fragment.duration.should eql(21.0)
   end
 
+  it "should have a pan" do
+    fragment = Scissor::Fragment.new(fixture('sample.mp3'), 5, 10.5, false, 50, false, 10)
+
+    fragment.pan.should eql(10)
+  end
+
   it "should return new fragment and remaining start point and length" do
     new_fragment, remaining_start, remaining_length = @fragment.create(0.5, 1.0)
     new_fragment.filename.should eql(fixture('sample.mp3'))

data/spec/scissor_spec.rb

@@ -212,6 +212,13 @@ describe Scissor do
     scissor.fragments.first.should be_stretched
   end
 
+  it "should pan" do
+    scissor = @mp3.slice(0, 10) + @mp3.slice(0, 5)
+
+    scissor.pan(10).fragments[0].pan.should eql(10)
+    scissor.pan(10).pan(10).fragments[0].pan.should eql(10)
+  end
+
   it "should join instances of scissor" do
     a = @mp3.slice(0, 120)
     b = @mp3.slice(150, 20)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scissor
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-04 00:00:00.000000000 Z
+date: 2012-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: open4
-  requirement: &70321600379940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70321600379940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: ruby-mp3info
-  requirement: &70321600379320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70321600379320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: riff
-  requirement: &70321600378660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - <=
@@ -43,10 +53,15 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70321600378660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - <=
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: tempdir
-  requirement: &70321600378140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70321600378140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: streamio-ffmpeg
-  requirement: &70321600221860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70321600221860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70321600220380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +101,15 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70321600220380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70321600219080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70321600219080
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70321600217900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +133,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70321600217900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: utility to chop sound files
 email:
 - youpy@buycheapviagraonlinenow.com
@@ -112,7 +152,6 @@ files:
 - Gemfile
 - README.rdoc
 - Rakefile
-- VERSION
 - data/silence.mp3
 - lib/scissor.rb
 - lib/scissor/fragment.rb
@@ -146,7 +185,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1882453864553140725
+      hash: -2487823998857234402
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -155,10 +194,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1882453864553140725
+      hash: -2487823998857234402
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: utility to chop sound files

data/VERSION

@@ -1 +0,0 @@
-0.2.9