audio_stream 3.3.2 → 3.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b69fd98d701aaba159d25fe0bc82fcb7e5b32feae3cda4619828af71b743d94
-  data.tar.gz: 35d108a674d5f927dd837b815af5d1ca47fcf160ec6ca8235691d958694b689f
+  metadata.gz: 323737f59491d3d370ca863c47eb54a2bce18dad3e1bf97d29674725e9e4213d
+  data.tar.gz: 4b1c734a8249a74f49a4a971535c4a2ed8c305de2e671ef4038a3766c17ab733
 SHA512:
-  metadata.gz: db32a11e833955d1a6b74f3dd0bd5008ae25019ecb7c125a0512b25f2af9dd845da867f15c3c942a33b82385c375a6e1c6c09dde2b89d15d554160bfa79253dc
-  data.tar.gz: 7b916c7c7c31d120e5e0026896a8cd8f8a2ab256e859dd26b392a4c8577cf8f21c840b70826e1ddf9ff54fdc453ebf1ba28d4a0a1f56a9ccf3148a01af2637a0
+  metadata.gz: a0b928495b8a46798be15e08254216fc9abea9b88d361abd96a9de0ea5d9449328a64509932d592a3307906be3a643344b6a46a1671e6f499fcf7c2d987675f5
+  data.tar.gz: bcc7884d895e368710535f8f265fdb1d4ba6080d14fcbd50195f3734a43a88518377a75111d6b00c51a6bb05bcba43997bd374537ce05d03998da8618c57f3d6

data/lib/audio_stream/fx/schroeder_reverb.rb

@@ -2,21 +2,25 @@ module AudioStream
   module Fx
     class SchroederReverb
 
-      def initialize(soundinfo, time:, dry: 1.0, wet: 0.7)
+      # @param soundinfo [AudioStream::SoundInfo]
+      # @param time [AudioStream::Rate] reverb time
+      # @param dry [AudioStream::Decibel] dry gain
+      # @param wet [AudioStream::Decibel] wet gain
+      def initialize(soundinfo, time:, dry: -1.0, wet: -20.0)
         @window_size = soundinfo.window_size
         @combs = [
-          CombFilter.new(soundinfo, freq: ms2freq(39.85 / 2.0 * time), q: 0.871402),
-          CombFilter.new(soundinfo, freq: ms2freq(36.10 / 2.0 * time), q: 0.882762),
-          CombFilter.new(soundinfo, freq: ms2freq(33.27 / 2.0 * time), q: 0.891443),
-          CombFilter.new(soundinfo, freq: ms2freq(30.15 / 2.0 * time), q: 0.901117),
+          CombFilter.new(soundinfo, freq: time * (39.85 * 0.002), q: 0.871402),
+          CombFilter.new(soundinfo, freq: time * (36.10 * 0.002), q: 0.882762),
+          CombFilter.new(soundinfo, freq: time * (33.27 * 0.002), q: 0.891443),
+          CombFilter.new(soundinfo, freq: time * (30.15 * 0.002), q: 0.901117),
         ]
         @allpasss = [
-          AllPassFilter.create(soundinfo, freq: ms2freq(5.0), q: 0.7),
-          AllPassFilter.create(soundinfo, freq: ms2freq(1.7), q: 0.7),
+          AllPassFilter.create(soundinfo, freq: Rate.msec(5.0).freq(soundinfo), q: BiquadFilter::DEFAULT_Q),
+          AllPassFilter.create(soundinfo, freq: Rate.msec(1.7).freq(soundinfo), q: BiquadFilter::DEFAULT_Q),
         ]
 
-        @dry = dry.to_f
-        @wet = wet.to_f
+        @dry = Decibel.create(dry).mag
+        @wet = Decibel.create(wet).mag
       end
 
       def process(input)
@@ -43,10 +47,6 @@ module AudioStream
 
         Buffer.new(*streams)
       end
-
-      def ms2freq(ms)
-        1.0 / (ms / 1000.0)
-      end
     end
   end
 end

data/lib/audio_stream/rate.rb

@@ -47,6 +47,26 @@ module AudioStream
       2.0 * Math::PI / sample(soundinfo)
     end
 
+    def *(other)
+      other = other.to_f
+
+      if @sample
+        return self.class.new(sample: @sample * other)
+      end
+
+      if @sec
+        return self.class.new(sec: @sec * other)
+      end
+
+      if @freq
+        return self.class.new(freq: @freq / other)
+      end
+
+      if @sync
+        return self.class.new(sync: @sync * other)
+      end
+    end
+
     def self.sec(v)
       new(sec: v)
     end

data/lib/audio_stream/version.rb

@@ -1,3 +1,3 @@
 module AudioStream
-  VERSION = "3.3.2"
+  VERSION = "3.3.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: audio_stream
 version: !ruby/object:Gem::Version
-  version: 3.3.2
+  version: 3.3.3
 platform: ruby
 authors:
 - Yoshida Tetsuya
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-02 00:00:00.000000000 Z
+date: 2019-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler