mdaines-soxophone 0.2 → 0.3

data/examples/effects.rb

@@ -5,7 +5,7 @@ Soxophone.play do |x|
   s = x.sound(:square)
   s.release = 0.5
   
-  x.tune s, "a b c"
+  x.tune s, "a b c 4"
 end
 
 Soxophone.play do |x|
@@ -13,7 +13,7 @@ Soxophone.play do |x|
   s.release = 0.5
   s.tremolo = 10
   
-  x.tune s, "a b c"
+  x.tune s, "a b c 4"
 end
 
 Soxophone.play do |x|
@@ -21,5 +21,45 @@ Soxophone.play do |x|
   s.release = 0.5
   s.phaser = true
   
-  x.tune s, "a b c"
+  x.tune s, "a b c 4"
+end
+
+Soxophone.play do |x|
+  s = x.sound(:square)
+  s.release = 0.5
+  s.lowpass = 250
+  
+  x.tune s, "a b c 4"
+end
+
+Soxophone.play do |x|
+  s = x.sound(:square)
+  s.release = 0.5
+  s.lowpass = 500
+  
+  x.tune s, "a b c 4"
+end
+
+Soxophone.play do |x|
+  s = x.sound(:square)
+  s.release = 0.5
+  s.highpass = 500
+  
+  x.tune s, "a b c 4"
+end
+
+Soxophone.play do |x|
+  s = x.sound(:square)
+  s.release = 0.5
+  s.highpass = 5000
+  
+  x.tune s, "a b c 4"
+end
+
+Soxophone.play do |x|
+  s = x.sound(:square)
+  s.release = 0.5
+  s.reverb = true
+  
+  x.tune s, "a b c 4"
 end

data/examples/mod.rb

@@ -0,0 +1,42 @@
+$LOAD_PATH << File.dirname(__FILE__) + "/../lib"
+require "soxophone"
+
+Soxophone.play do |x|
+  s = x.sound(:sine)
+  s.mods << s.amod(:square)
+  
+  x.tune s, "a b c d e f g + a 4 - (a c e) 4"
+end
+
+Soxophone.play do |x|
+  s = x.sound(:sine)
+  s.mods << s.fmod(:sine, 700..600)
+  
+  x.tune s, "a b c d e f g + a 4 - (a c e) 4"
+end
+
+Soxophone.play do |x|
+  s = x.sound(:sine)
+  s.mods << s.fmod(:square, 100)
+  s.gain = -4
+  
+  x.tune s, "a b c d e f g + a 4 - (a c e) 4"
+end
+
+Soxophone.play do |x|
+  s = x.sound(:sine)
+  s.mods << s.fmod(:sine)
+  
+  ss = x.sound(:sine)
+  ss.mods << ss.fmod(:sine)
+  ss.mods << ss.fmod(:sine)
+  
+  sss = x.sound(:sine)
+  sss.mods << sss.fmod(:sine)
+  sss.mods << sss.fmod(:sine)
+  sss.mods << sss.fmod(:sine)
+  
+  x.tune s,   "a b c"
+  x.tune ss,  "4 4 4 a b c"
+  x.tune sss, "4 4 4 4 4 4 a b c 4"
+end

data/lib/soxophone.rb

@@ -16,6 +16,8 @@ end
 
 require "soxophone/notation"
 require "soxophone/effects"
+require "soxophone/modulation"
+require "soxophone/envelope"
 require "soxophone/sound"
 require "soxophone/sample"
 require "soxophone/tune"

data/lib/soxophone/effects.rb

@@ -5,33 +5,60 @@ module Soxophone
     attr_reader :tremolo
     attr_reader :phaser
     attr_reader :gain
+    attr_reader :highpass
+    attr_reader :lowpass
+    attr_reader :reverb
     
     def tremolo=(tremolo)
       unless tremolo.is_a?(Numeric)
-        raise "Tremolo must be a number"
+        raise "rremolo must be a number"
       end
       @tremolo = tremolo
     end
     
     def phaser=(phaser)
       unless [true, false].include?(phaser)
-        raise "Phaser must be true or false"
+        raise "phaser must be true or false"
       end
       @phaser = phaser
     end
     
     def gain=(gain)
       unless gain.is_a?(Numeric)
-        raise "Gain must be a number"
+        raise "gain must be a number"
       end
       @gain = gain
     end
     
+    def highpass=(highpass)
+      unless highpass.is_a?(Numeric)
+        raise "highpass must be a number"
+      end
+      @highpass = highpass
+    end
+    
+    def lowpass=(lowpass)
+      unless lowpass.is_a?(Numeric)
+        raise "lowpass must be a number"
+      end
+      @lowpass = lowpass
+    end
+    
+    def reverb=(reverb)
+      unless [true, false].include?(reverb)
+        raise "Reverb must be true or false"
+      end
+      @reverb = reverb
+    end
+    
     def effectopts
       fx = []
       fx << "tremolo #{tremolo}" if tremolo
       fx << "phaser 0.6 0.66 3 0.6 2 -t" if phaser
       fx << "gain #{gain}" if gain
+      fx << "highpass #{highpass}" if highpass
+      fx << "lowpass #{lowpass}" if lowpass
+      fx << "reverb" if reverb
       
       fx.compact.join(" ")
     end

data/lib/soxophone/envelope.rb

@@ -0,0 +1,34 @@
+module Soxophone
+  
+  module Envelope
+    
+    attr_reader :attack
+    attr_reader :release
+    
+    def attack=(attack)
+      unless attack.is_a?(Numeric)
+        raise "attack must be a number"
+      end
+      @attack = attack
+    end
+    
+    def release=(release)
+      unless release.is_a?(Numeric)
+        raise "release must be a number"
+      end
+      @release = release
+    end
+    
+    private
+    
+      def envelope(duration)
+        env = []
+        env << "fade #{attack * duration}" if attack > 0
+        env << "fade 0 #{duration} #{release * duration}" if release > 0
+        
+        env.compact.join(" ")
+      end
+    
+  end
+  
+end

data/lib/soxophone/modulation.rb

@@ -0,0 +1,81 @@
+module Soxophone
+  
+  module Modulation
+    
+    class Combine
+      
+      COMBINES = %w( fmod amod )
+    
+      KINDS = %w(
+        sine square triangle sawtooth trapezium
+        exp noise whitenoise pinknoise brownnoise
+      )
+      
+      def initialize(combine, kind, frequency = nil)
+        self.combine = combine
+        self.kind = kind
+        self.frequency = frequency
+      end
+      
+      attr_reader :combine
+      attr_reader :kind
+      attr_reader :frequency
+      
+      def combine=(combine)
+        if COMBINES.include?(combine.to_s)
+          @combine = combine
+        else
+          raise "combine must be one of: #{COMBINES.join(", ")}"
+        end
+      end
+      
+      def kind=(kind)
+        if KINDS.include?(kind.to_s)
+          @kind = kind
+        else
+          raise "kind must be one of: #{KINDS.join(", ")}"
+        end
+      end
+      
+      def frequency=(freq)
+        if freq.nil? || freq.is_a?(Numeric) || (freq.is_a?(Range) && freq.first.is_a?(Numeric) && freq.first.is_a?(Numeric))
+          @frequency = freq
+        else
+          raise "frequency must be nil, a number, or a range of numbers"
+        end
+      end
+      
+      def synth(duration, freq)
+        if frequency.nil?
+          "synth #{duration} #{kind} #{combine} %#{freq}"
+        elsif frequency.is_a?(Numeric)
+          "synth #{duration} #{kind} #{combine} #{frequency}"
+        elsif frequency.is_a?(Range)
+          "synth #{duration} #{kind} #{combine} #{frequency.first}-#{frequency.last}"
+        end
+      end
+      
+    end
+    
+    def fmod(kind, freq = nil)
+      Combine.new(:fmod, kind, freq)
+    end
+    
+    def amod(kind, freq = nil)
+      Combine.new(:amod, kind, freq)
+    end
+    
+    def mods
+      @mods = [] unless defined?(@mods)
+      @mods
+    end
+    
+    private
+    
+      def modulation(duration, freq)
+        mods.map { |m| m.synth(duration, freq) }.join(" ")
+      end
+    
+  end
+  
+end

data/lib/soxophone/sound.rb

@@ -3,6 +3,8 @@ module Soxophone
   class Sound
     
     include Effects
+    include Modulation
+    include Envelope
     
     KINDS = %w(
       sine square triangle sawtooth trapezium
@@ -16,50 +18,25 @@ module Soxophone
     end
     
     attr_reader :kind
-    attr_reader :attack
-    attr_reader :release
     
     def kind=(kind)
       unless KINDS.include?(kind.to_s)
-        raise "Kind must be one of #{KINDS.join(", ")}"
+        raise "kind must be one of: #{KINDS.join(", ")}"
       end
       @kind = kind
     end
     
-    def attack=(attack)
-      unless attack.is_a?(Numeric)
-        raise "Attack must be a number"
-      end
-      @attack = attack
-    end
-    
-    def release=(release)
-      unless release.is_a?(Numeric)
-        raise "Release must be a number"
-      end
-      @release = release
-    end
-    
     def notecmd(freq, duration)
       env = envelope(duration)
-      "sox -n -p synth #{duration} #{kind} %#{freq} #{env}"
+      mod = modulation(duration, freq)
+      "sox -n -p synth #{duration} #{kind} %#{freq} #{mod} #{env}"
     end
     
     def chordcmd(freqs, duration)
-      env = envelope(duration)
-      "sox -n -c1 -p synth #{duration} #{freqs.map { |f| "#{kind} %#{f}" }.join(" ")} #{env}"
+      cmds = freqs.map { |f| notecmd(f, duration) }
+      "sox -m #{cmds.map { |c| "\"|#{c}\"" }.join(" ")} -p"
     end
     
-    private
-    
-      def envelope(duration)
-        env = []
-        env << "fade #{attack * duration}" if attack > 0
-        env << "fade 0 #{duration} #{release * duration}" if release > 0
-        
-        env.compact.join(" ")
-      end
-    
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mdaines-soxophone
 version: !ruby/object:Gem::Version 
-  version: "0.2"
+  version: "0.3"
 platform: ruby
 authors: 
 - Michael Daines
@@ -29,6 +29,7 @@ files:
 - examples/chords.rb
 - examples/effects.rb
 - examples/envelope.rb
+- examples/mod.rb
 - examples/notation.rb
 - examples/samples.rb
 - examples/crash.mp3
@@ -36,6 +37,8 @@ files:
 - lib/soxophone.rb
 - lib/soxophone/base.rb
 - lib/soxophone/effects.rb
+- lib/soxophone/envelope.rb
+- lib/soxophone/modulation.rb
 - lib/soxophone/notation.rb
 - lib/soxophone/notation.rl
 - lib/soxophone/sample.rb