youpy-scissor 0.0.15 → 0.0.16

data/README.rdoc

@@ -37,13 +37,13 @@ supported file format:
 	 foo + bar > 'foobar.mp3'
 
 	 # slice + concat
-	 (foo.slice(10, 1) + bar.slice(2, 3)).to_file('slicefoobar.mp3')
+	 foo[10, 1] + bar.slice[2, 3] > 'slicefoobar.mp3'
 
 	 # slice + concat + loop
-	 ((foo.slice(10, 1) + bar.slice(2, 3)) * 4).to_file('slicefoobarloop.mp3')
+	 foo[10, 1] + bar[2, 3] * 4 > 'slicefoobarloop.mp3'
 
 	 # split
-	 (Scissor.new('sequence.mp3') / 16).first.to_file('split.mp3')
+	 (Scissor('sequence.mp3') / 16).first.to_file('split.mp3')
 
 	 # replace first 10 seconds with 30 seconds of silence
 	 foo.replace(0, 10, Scissor.silence(30)).to_file('replace.mp3')

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.15"
+VERS              = "0.0.16"
 
 REV = File.read(".svn/entries")[/committed-rev="(d+)"/, 1] rescue nil
 CLEAN.include ['**/.*.sw?', '*.gem', '.config']

data/lib/scissor/chunk.rb

@@ -21,7 +21,7 @@ module Scissor
 
       if filename
         @fragments << Fragment.new(
-          Pathname.new(filename),
+          filename,
           0,
           SoundFile.new(filename).length)
       end
@@ -43,38 +43,27 @@ module Scissor
       end
 
       new_instance = self.class.new
-      remain = length
+      remaining_start = start.to_f
+      remaining_length = length.to_f
 
       @fragments.each do |fragment|
-        if start >= fragment.duration
-          start -= fragment.duration
+        new_fragment, remaining_start, remaining_length =
+          fragment.create(remaining_start, remaining_length)
 
-          next
+        if new_fragment
+          new_instance.add_fragment(new_fragment)
         end
 
-        if (start + remain) <= fragment.duration
-          new_instance.add_fragment(Fragment.new(
-              fragment.filename,
-              fragment.start + start,
-              remain,
-              fragment.reversed?))
-
+        if remaining_length == 0
           break
-        else
-          remain = remain - (fragment.duration - start)
-          new_instance.add_fragment(Fragment.new(
-              fragment.filename,
-              fragment.start + start,
-              fragment.duration - start,
-              fragment.reversed?))
-
-          start = 0
         end
       end
 
       new_instance
     end
 
+    alias [] slice
+
     def concat(other)
       other.fragments.each do |fragment|
         add_fragment(fragment)
@@ -83,7 +72,17 @@ module Scissor
       self
     end
 
-    alias + concat
+    alias << concat
+
+    def +(other)
+      new_instance = Scissor()
+
+      (@fragments + other.fragments).each do |fragment|
+        new_instance.add_fragment(fragment)
+      end
+
+      new_instance
+    end
 
     def loop(count)
       orig_fragments = @fragments.clone

data/lib/scissor/fragment.rb

@@ -1,9 +1,11 @@
+require 'pathname'
+
 module Scissor
   class Fragment
     attr_reader :filename, :start, :duration
 
     def initialize(filename, start, duration, reverse = false)
-      @filename = filename
+      @filename = Pathname.new(filename)
       @start = start
       @duration = duration
       @reverse = reverse
@@ -14,5 +16,33 @@ module Scissor
     def reversed?
       @reverse
     end
+
+    def create(remaining_start, remaining_length)
+      new_fragment = nil
+
+      if remaining_start >= duration
+        remaining_start -= duration
+      else
+        if remaining_start + remaining_length >= duration
+          new_fragment = self.class.new(
+            filename,
+            start + remaining_start,
+            duration - remaining_start)
+
+          remaining_length -= (duration - remaining_start)
+          remaining_start = 0
+        else
+          new_fragment = self.class.new(
+            filename,
+            start + remaining_start,
+            remaining_length)
+
+          remaining_start = 0
+          remaining_length = 0
+        end
+      end
+
+      return new_fragment, remaining_start, remaining_length
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: youpy-scissor
 version: !ruby/object:Gem::Version 
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors: 
 - youpy
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-06 00:00:00 -07:00
+date: 2009-04-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency