synthesizer 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f45da04dde77d57f659a2be426c7128d6da179afb23be0c9a247e88079d9d6b
-  data.tar.gz: 564028cc062f4327a17d3384e2d9acf9ed69b4827768349fe3a6101b0cb3d0e2
+  metadata.gz: 04ecefcdbf996dac3b8b38315ba0fa1c88ee9ce9a353ae13189c6f59d7ca764c
+  data.tar.gz: 5804b29acadece1016f420b85ee2c7fc43521e0cf14dc633240b09f2d80fa1f5
 SHA512:
-  metadata.gz: 6ea8c7397ed25c859d27e1eb68d7ed7551070ab5df1d94015bdc25a10e407b1a986a64c4f0d1be9bc2878d957299df50a75bfffd5230dfaa293a192e4286dff4
-  data.tar.gz: 5b3e73218fa8f402ff6e5b966734217cbd33a182b114fedeab4cff9c3d0c1484078220496826cd0682d6195a3209d1f051ddaee27aaefd67c63263f3f66fcb97
+  metadata.gz: bd465c0efba7fdf5608297fbd85214370328a801a97074d37670a19681a96045b68f7cbb18cb9af5d809a2a63f33d2219ef3c27319c517bba3c2a9c11c1102bd
+  data.tar.gz: ee9e14bde33fbf7eff84b2b9c88afa4ff45ae8e73b6c170ef1e03fd95d0dda4562abecd58811da9a6f0e7dcf2cacfecab344624a4b0d2d4a5ba231697c460caa

data/examples/metronome.rb

@@ -0,0 +1,55 @@
+require 'synthesizer'
+require 'audio_stream/core_ext'
+
+include AudioStream
+include AudioStream::Fx
+
+
+soundinfo = SoundInfo.new(
+  channels: 2,
+  samplerate: 44100,
+  window_size: 1024,
+  format: RubyAudio::FORMAT_WAV|RubyAudio::FORMAT_PCM_16
+)
+
+
+# Track
+
+track1 = AudioInputMetronome.new(
+  bpm: 120.0,
+  repeat: 1000,
+  soundinfo: soundinfo
+)
+
+
+# Audio FX
+
+gain = AGain.new(level: 0.9)
+
+
+# Bus
+
+#stereo_out = AudioOutput.file("out.wav", soundinfo)
+stereo_out = AudioOutput.device(soundinfo: soundinfo)
+bus1 = AudioBus.new
+
+
+# Mixer
+
+track1
+  .stream
+  .fx(gain)
+  .send_to(bus1)
+
+bus1
+  .send_to(stereo_out)
+
+
+# start
+
+conductor = Conductor.new(
+  input: track1,
+  output: stereo_out
+)
+conductor.connect
+conductor.join

data/examples/poly.rb

@@ -11,28 +11,28 @@ soundinfo = SoundInfo.new(
 )
 
 synth = Synthesizer::Poly.new(
-  oscs: [
-    Synthesizer::Osc.new(
+  oscillators: [
+    Synthesizer::Oscillator.new(
       shape: Synthesizer::Shape::SquareSawtooth,
       uni_num: Synthesizer::ModulationValue.new(4)
         .add(Synthesizer::Modulation::Lfo.new(
         )),
       uni_detune: 0.1,
     ),
-    #Synthesizer::Osc.new(
+    #Synthesizer::Oscillator.new(
     #  shape: Synthesizer::Shape::SquareSawtooth,
     #  tune_cents: 0.1,
     #  uni_num: 4,
     #  uni_detune: 0.1,
     #),
-    #Synthesizer::Osc.new(
+    #Synthesizer::Oscillator.new(
     #  shape: Synthesizer::Shape::SquareSawtooth,
     #  tune_semis: -12,
     #  uni_num: 4,
     #  uni_detune: 0.1,
     #),
   ],
-  amp: Synthesizer::Amp.new(
+  amplifier: Synthesizer::Amplifier.new(
     volume: Synthesizer::ModulationValue.new(1.0)
       .add(Synthesizer::Modulation::Adsr.new(
         attack: 0.05,

data/lib/audio_stream/audio_input_metronome.rb

@@ -0,0 +1,55 @@
+module AudioStream
+  class AudioInputMetronome < Rx::Subject
+    include AudioInput
+
+    def initialize(bpm:, beat: 4, repeat: nil, soundinfo:)
+      super()
+
+      @bpm = bpm
+      @beat = beat.to_i
+      @repeat = repeat
+
+      @synth = Synthesizer::Poly.new(
+        oscillators: Synthesizer::Oscillator.new(
+          shape: Synthesizer::Shape::Sine,
+          phase: 0,
+        ),
+        amplifier: Synthesizer::Amplifier.new(
+          volume: Synthesizer::ModulationValue.new(1.0)
+            .add(Synthesizer::Modulation::Adsr.new(
+              attack: 0.0,
+              hold: 0.05,
+              decay: 0.0,
+              sustain: 0.0,
+              release: 0.0
+            ), depth: 1.0),
+        ),
+        quality: Synthesizer::Quality::LOW,
+        soundinfo: soundinfo,
+      )
+
+      @soundinfo = soundinfo
+    end
+
+    def each(&block)
+      Enumerator.new do |y|
+        period = @soundinfo.samplerate.to_f / @soundinfo.window_size * 60.0 / @bpm
+        repeat_count = 0.0
+        beat_count = 0
+
+        Range.new(0, @repeat).each {|_|
+          if repeat_count<1
+            if beat_count==0
+              @synth.note_on(Synthesizer::Note.new(81))
+            else
+              @synth.note_on(Synthesizer::Note.new(69))
+            end
+            beat_count = (beat_count + 1) % @beat
+          end
+          y << @synth.next
+          repeat_count = (repeat_count + 1) % period
+        }
+      end.each(&block)
+    end
+  end
+end

data/lib/synthesizer.rb

@@ -1,7 +1,8 @@
-require "synthesizer/version"
+require 'synthesizer/version'
 
 require 'audio_stream'
 require 'audio_stream/audio_input_synth.rb'
+require 'audio_stream/audio_input_metronome.rb'
 
 require 'synthesizer/poly'
 require 'synthesizer/mono'

data/lib/synthesizer/modulation/adsr.rb

@@ -3,13 +3,13 @@ module Synthesizer
     class Adsr
 
       # @param attack [Float] attack sec (0.0~)
-      # @param attack_curve [Synth::Curve]
+      # @param attack_curve [Synthesizer::Curve]
       # @param hold [Float] hold sec (0.0~)
       # @param decay [Float] decay sec (0.0~)
-      # @param sustain_curve [Synth::Curve]
+      # @param sustain_curve [Synthesizer::Curve]
       # @param sustain [Float] sustain sec (0.0~)
       # @param release [Float] release sec (0.0~)
-      # @param release_curve [Synth::Curve]
+      # @param release_curve [Synthesizer::Curve]
       def initialize(attack:, attack_curve: Curve::EaseOut, hold: 0.0, decay:, sustain_curve: Curve::EaseOut, sustain:, release:, release_curve: Curve::EaseOut)
         @attack = attack
         @attack_curve = attack_curve

data/lib/synthesizer/modulation/lfo.rb

@@ -2,10 +2,10 @@ module Synthesizer
   module Modulation
     class Lfo
 
-      # @param shape [Synth::Shape]
+      # @param shape [Synthesizer::Shape]
       # @param delay [Float] delay sec (0.0~)
       # @param attack [Float] attack sec (0.0~)
-      # @param attack_curve [Synth::Curve]
+      # @param attack_curve [Synthesizer::Curve]
       # @param phase [Float] phase percent (0.0~1.0)
       # @param rate [Float] wave freq (0.0~)
       def initialize(shape: Shape::Sine, delay: 0.0, attack: 0.0, attack_curve: Curve::Straight, phase: 0.0, rate: 3.5)

data/lib/synthesizer/modulation_value.rb

@@ -13,7 +13,7 @@ module Synthesizer
       }
     end
 
-    # @param mod [Synth::Modulation]
+    # @param mod [Synthesizer::Modulation]
     # @param depth [Float] (-1.0~1.0)
     def add(mod, depth: 1.0)
       depth ||= 1.0

data/lib/synthesizer/mono.rb

@@ -11,9 +11,9 @@ module Synthesizer
     attr_reader :glide
     attr_accessor :pitch_bend
 
-    # @param oscillators [Oscillator] oscillator
-    # @param amplifier [Amplifier] amplifier
-    # @param soundinfo [SoundInfo]
+    # @param oscillators [Synthesizer::Oscillator] oscillator
+    # @param amplifier [Synthesizer::Amplifier] amplifier
+    # @param soundinfo [AudioStream::SoundInfo]
     def initialize(oscillators:, amplifier:, glide: 0.1, quality: Quality::LOW, soundinfo:)
       @oscillators = [oscillators].flatten.compact
       @amplifier = amplifier

data/lib/synthesizer/oscillator.rb

@@ -12,7 +12,7 @@ module Synthesizer
     attr_reader :uni_num
     attr_reader :uni_detune
 
-    # @param shape [Synth::Shape] oscillator waveform shape
+    # @param shape [Synthesizer::Shape] oscillator waveform shape
     # @param volume [Float] oscillator volume. mute=0.0 max=1.0
     # @param pan [Float] oscillator pan. left=-1.0 center=0.0 right=1.0 (-1.0~1.0)
     # @param tune_semis [Integer] oscillator pitch semitone

data/lib/synthesizer/poly.rb

@@ -11,9 +11,9 @@ module Synthesizer
     attr_reader :glide
     attr_accessor :pitch_bend
 
-    # @param oscillators [Oscillator] Oscillator
-    # @param amplifier [Amplifier] amplifier
-    # @param soundinfo [SoundInfo]
+    # @param oscillators [Synthesizer::Oscillator] Oscillator
+    # @param amplifier [Synthesizer::Amplifier] amplifier
+    # @param soundinfo [AudioStream::SoundInfo]
     def initialize(oscillators:, amplifier:, quality: Quality::LOW, soundinfo:)
       @oscillators = [oscillators].flatten.compact
       @amplifier = amplifier

data/lib/synthesizer/version.rb

@@ -1,3 +1,3 @@
 module Synthesizer
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synthesizer
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Yoshida Tetsuya
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-16 00:00:00.000000000 Z
+date: 2019-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -153,9 +153,11 @@ files:
 - bin/setup
 - examples/adsr.ipynb
 - examples/curves.ipynb
+- examples/metronome.rb
 - examples/mono.rb
 - examples/poly.rb
 - examples/shapes.ipynb
+- lib/audio_stream/audio_input_metronome.rb
 - lib/audio_stream/audio_input_synth.rb
 - lib/synthesizer.rb
 - lib/synthesizer/amplifier.rb