synthesizer 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab192c339eebdc39d867ac206c82454c8b3509f92967e54f4aa4f4660b2e3cdf
-  data.tar.gz: 86fadad577d12289b652be8bfa4ac55f6a6bad136fa5dc9ce21eac4df3f536e6
+  metadata.gz: ba89ee2f086cd7828b8a8f56ac0afaaed912b6140171972ea0a79de35116a8d2
+  data.tar.gz: 74ac5e12ea76f79b4d03a3181f24a97901c6381a8f8f7c4f34894f212f234438
 SHA512:
-  metadata.gz: ce723ad9a5fd4817ce33f362fb15cdce50132b066c0aff60b203d13e04ab4bef99f947f6e4d871d2a24ad0a66b98aa1b899e72b579d23dbad64245b848ffc94d
-  data.tar.gz: c42def904f7c6531d2f68d1000c5cd0a4cc2b54088f7af0c3414d3ffa59d1da8750eca6efd961b987953cde385266f187066ca71ba4f41c3bf2798fb0f1fcec3
+  metadata.gz: 2fbda5f5c4e4a5f13744ce84f1ba210cc5cf5ae264d4b24b0106650949b8e03d1a2ef24767d832febfd5770dda7805797fccf798a0015be99884371cedb75572
+  data.tar.gz: a8aa71eeaca0a941c2b0c7edadaa67610d44084afa7808a4a6488a622be0ab457025339d843854261ad7950f4e03510750feed62fae3083851023d01ca05f982

data/examples/step_editor.rb

@@ -0,0 +1,59 @@
+require 'synthesizer'
+require 'audio_stream/core_ext'
+
+include AudioStream
+include Synthesizer
+
+soundinfo = SoundInfo.new(
+  channels: 2,
+  samplerate: 44100,
+  window_size: 1024,
+  format: RubyAudio::FORMAT_WAV|RubyAudio::FORMAT_PCM_16
+)
+
+synth = PolySynth.new(
+  oscillators: [
+    Oscillator.new(
+      shape: Shape::SquareSawtooth,
+      uni_num: ModulationValue.new(4)
+        .add(Modulation::Lfo.new(
+        )),
+      uni_detune: 0.1,
+    ),
+  ],
+  amplifier: Amplifier.new(
+    volume: ModulationValue.new(1.0)
+      .add(Modulation::Adsr.new(
+        attack: 0.05,
+        hold: 0.1,
+        decay: 0.4,
+        sustain: 0.8,
+        release: 0.2
+      ), depth: 1.0),
+    ),
+  quality: Quality::LOW,
+  soundinfo: soundinfo,
+)
+
+se = StepEditor::StGt.new(bpm: 120) {|se|
+  se.note(Note.new(60), st: 480, gt: 480*3)
+  se.pitch_bend(1, st: 480)
+  se.pitch_bend(2, st: 480*2)
+  se.complete
+}
+
+track1 = AudioInputStepEditor.new(synth, se)
+
+stereo_out = AudioOutput.device(soundinfo: soundinfo)
+
+track1
+  .stream
+  .send_to(stereo_out, gain: 0.25)
+
+
+conductor = Conductor.new(
+  input: [track1],
+  output: [stereo_out]
+)
+conductor.connect
+conductor.join

data/lib/audio_stream/audio_input_step_editor.rb

@@ -0,0 +1,52 @@
+module AudioStream
+  class AudioInputStepEditor < Rx::Subject
+    include AudioInput
+
+    def initialize(synth, step_editor)
+      super()
+
+      @synth = synth
+      @step_editor = step_editor
+
+      @soundinfo = synth.soundinfo
+    end
+
+    def each(&block)
+      Enumerator.new do |y|
+
+        events = Hash.new {|h, k| h[k]=[]}
+
+        fps = @soundinfo.samplerate.to_f / @soundinfo.window_size
+
+        @step_editor.events.each {|event|
+          pos = event[0]
+          events[(pos * fps).to_i] << event
+        }
+
+        catch :break do
+          Range.new(0, nil).each {|i|
+            if events.has_key?(i)
+              events[i].each {|event|
+                type = event[1]
+
+                case type
+                when :note_on
+                  @synth.note_on(event[2], velocity: event[3])
+                when :note_off
+                  @synth.note_off(event[2])
+                when :pitch_bend
+                  @synth.pitch_bend = event[2]
+                when :complete
+                  throw :break
+                end
+              }
+            end
+
+            buf = @synth.next
+            y << buf
+          }
+        end
+      end.each(&block)
+    end
+  end
+end

data/lib/synthesizer.rb

@@ -3,6 +3,8 @@ require 'synthesizer/version'
 require 'audio_stream'
 require 'audio_stream/audio_input_synth.rb'
 require 'audio_stream/audio_input_metronome.rb'
+require 'audio_stream/audio_input_step_editor'
+require 'synthesizer/step_editor'
 
 require 'synthesizer/poly_synth'
 require 'synthesizer/mono_synth'

data/lib/synthesizer/mono_synth.rb

@@ -45,7 +45,9 @@ module Synthesizer
       end
     end
 
-    def note_on(note)
+    # @param note [Synthesizer::Note]
+    # @param velocity [Float] volume percent (0.0~1.0)
+    def note_on(note, velocity: 1.0)
       # Note Off
       note_off(note)
 
@@ -54,12 +56,13 @@ module Synthesizer
         @glide.target = note.num
       else
         # Note On
-        @perform = NotePerform.new(self, note)
+        @perform = NotePerform.new(self, note, velocity)
         @glide.base = note.num
       end
       @note_nums << note.num        
     end
 
+    # @param note [Synthesizer::Note]
     def note_off(note)
       # Note Off
       @note_nums.delete_if {|note_num| note_num==note.num}

data/lib/synthesizer/note_perform.rb

@@ -3,14 +3,17 @@ module Synthesizer
 
     attr_reader :synth
     attr_reader :note
+    attr_reader :velocity
 
-    def initialize(synth, note)
+    def initialize(synth, note, velocity)
       @synth = synth
+      @note = note
+      @velocity = velocity
+
       @processors = synth.oscillators.map {|osc|
         synth.processor.generator(osc, self)
       }
 
-      @note = note
       @note_on = true
       @released = false
     end

data/lib/synthesizer/poly_synth.rb

@@ -30,19 +30,21 @@ module Synthesizer
     end
 
     def next
+      buf = nil
       if 0<@performs.length
-        bufs = @performs.values.map(&:next)
+        bufs = @performs.values.map(&:next).compact
 
         # delete released note performs
         @performs.delete_if {|note_num, perform| perform.released? }
 
-        bufs.compact.inject(:+)
-      else
-        AudioStream::Buffer.float(@soundinfo.window_size, @soundinfo.channels)
+        buf = bufs.inject(:+)
       end
+      buf || AudioStream::Buffer.float(@soundinfo.window_size, @soundinfo.channels)
     end
 
-    def note_on(note)
+    # @param note [Synthesizer::Note]
+    # @param velocity [Float] volume percent (0.0~1.0)
+    def note_on(note, velocity: 1.0)
       # Note Off
       perform = @performs[note.num]
       if perform
@@ -50,10 +52,11 @@ module Synthesizer
       end
 
       # Note On
-      perform = NotePerform.new(self, note)
+      perform = NotePerform.new(self, note, velocity)
       @performs[note.num] = perform
     end
 
+    # @param note [Synthesizer::Note]
     def note_off(note)
       # Note Off
       perform = @performs[note.num]

data/lib/synthesizer/processor/high.rb

@@ -33,7 +33,7 @@ module Synthesizer
 
               window_size.times.each {|i|
                 # Oscillator, Amplifier
-                volume = volume_mod.next
+                volume = volume_mod.next * note_perform.velocity
                 tune_semis = tune_semis_mod.next + synth.pitch_bend
                 tune_cents = tune_cents_mod.next
 
@@ -60,7 +60,7 @@ module Synthesizer
 
               window_size.times.each {|i|
                 # Oscillator, Amplifier
-                volume = volume_mod.next
+                volume = volume_mod.next * note_perform.velocity
                 pan = pan_mod.next
                 tune_semis = tune_semis_mod.next + synth.pitch_bend
                 tune_cents = tune_cents_mod.next

data/lib/synthesizer/processor/low.rb

@@ -32,7 +32,7 @@ module Synthesizer
               buf = AudioStream::Buffer.float(window_size, channels)
 
               # Oscillator, Amplifier
-              volume = volume_mod.next
+              volume = volume_mod.next * note_perform.velocity
               tune_semis = tune_semis_mod.next + synth.pitch_bend
               tune_cents = tune_cents_mod.next
 
@@ -57,7 +57,7 @@ module Synthesizer
               buf = AudioStream::Buffer.float(window_size, channels)
 
               # Oscillator, Amplifier
-              volume = volume_mod.next
+              volume = volume_mod.next * note_perform.velocity
               pan = pan_mod.next
               tune_semis = tune_semis_mod.next + synth.pitch_bend
               tune_cents = tune_cents_mod.next

data/lib/synthesizer/step_editor.rb

@@ -0,0 +1,6 @@
+require 'synthesizer/step_editor/st_gt'
+
+module Synthesizer
+  module StepEditor
+  end
+end

data/lib/synthesizer/step_editor/st_gt.rb

@@ -0,0 +1,55 @@
+module Synthesizer
+  module StepEditor
+    class StGt
+
+      attr_reader :ppq
+      attr_reader :events
+
+      def initialize(bpm:, ppq: 480, &block)
+        @ppq = ppq
+        @seek = 0.0
+        @location = 0
+        @events = []
+        self.bpm = bpm
+
+        if block_given?
+          yield self
+        end
+      end
+
+      def bpm=(bpm)
+        @ppq_rate = 60.0 / (@ppq.to_f * bpm)
+      end
+
+      def step(st)
+        @location += st
+        @seek += st * @ppq_rate
+      end
+
+      def location(beats: 4)
+        tick = @location % @ppq
+        location = (@location - tick) / @ppq
+        beat = location % beats
+        location = location - beat
+        measure = location / beats
+
+        "#{measure+1}. #{beat+1}. #{tick}"
+      end
+
+      def note(note, st: 0, gt:, vel: 1.0, dev: 0)
+        @events << [@seek + dev * @ppq_rate, :note_on, note, vel]
+        @events << [@seek + (gt + dev) * @ppq_rate, :note_off, note]
+        step(st)
+      end
+
+      def pitch_bend(semis, st: 0, dev: 0)
+        @events << [@seek + dev * @ppq_rate, :pitch_bend, semis]
+        step(st)
+      end
+
+      def complete
+        @events << [@seek, :complete]
+      end
+    end
+  end
+end

data/lib/synthesizer/version.rb

@@ -1,3 +1,3 @@
 module Synthesizer
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

data/synthesizer.gemspec

@@ -30,5 +30,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency "minitest", "~> 5.0"
 
-  spec.add_dependency "audio_stream", ">= 1.2.1"
+  spec.add_dependency "audio_stream", ">= 1.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synthesizer
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Yoshida Tetsuya
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-18 00:00:00.000000000 Z
+date: 2019-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.2.2
 description: Synthesizer implemented in Ruby.
 email:
 - yoshida.eth0@gmail.com
@@ -88,7 +88,9 @@ files:
 - examples/mono.rb
 - examples/poly.rb
 - examples/shapes.ipynb
+- examples/step_editor.rb
 - lib/audio_stream/audio_input_metronome.rb
+- lib/audio_stream/audio_input_step_editor.rb
 - lib/audio_stream/audio_input_synth.rb
 - lib/synthesizer.rb
 - lib/synthesizer/amplifier.rb
@@ -118,6 +120,8 @@ files:
 - lib/synthesizer/quality.rb
 - lib/synthesizer/shape.rb
 - lib/synthesizer/shape_pos.rb
+- lib/synthesizer/step_editor.rb
+- lib/synthesizer/step_editor/st_gt.rb
 - lib/synthesizer/unison.rb
 - lib/synthesizer/utils.rb
 - lib/synthesizer/version.rb