synth_blocks 1.0.3 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3822db2dd2af4580090c97ded8db14ee9654daec87b10134785af9d94a915c3
-  data.tar.gz: 68a7879b69af50ee812cdcbb27ec642180f18b128fbb833f28c883aeb0c68517
+  metadata.gz: 3feea4e01983af0753f8fcc3c95d92a02d59af71ac8ac9c83373d4e150c0382d
+  data.tar.gz: d3cd62fa4294b4bb0ce334bc23439579316520f81493c93212af1c0fc6b8103e
 SHA512:
-  metadata.gz: bf35a91c3e6d073bdab7dd0e198371dd386899a56e96fb13d144bf0c271a3a9aff3890a67d178d81c5645d81f530f16aa38de596b27e8be137beb66b8124c8fa
-  data.tar.gz: d585dc04e7e58671a0942e51a5e2917e46ce265fb76f0f23905f19819de9683ffe42a736107ebc23e86265bc568c164fb69aa341b21824c509ec6082b90092bc
+  metadata.gz: 764c103a562dd360316176b555e4085f5b2ae4e9d636b6803b4e9bd797bd18512534383a88778aa1dd212d6606c6551c32c17e86df6a27ace5f4e269ceee090c
+  data.tar.gz: 7c50a642105d5bac45b205d5d1a2c0ea7d289b1796670bb136c4f7a18ff7e2fdd606fb04be0f38eea67b0db9e4f2658d494fb5edb1078875c751c6db9c80c6b9

data/lib/synth_blocks.rb

@@ -1,4 +1,5 @@
 require_relative 'synth_blocks/core/sound'
+# require_relative 'synth_blocks/mod/adsr'
 require_relative 'synth_blocks/mod/adsr'
 require_relative 'synth_blocks/fx/chorus'
 require_relative 'synth_blocks/fx/compressor'

data/lib/synth_blocks/mod/adsr.rb

@@ -1,8 +1,5 @@
 module SynthBlocks
   module Mod
-    ##
-    # Implementation of a linear ADSR envelope generator with a tracking
-    # value so that envelope restarts don't click
     class Adsr
       ##
       # attack time in seconds
@@ -27,6 +24,9 @@ module SynthBlocks
       # sustain should be between 0 and 1
       def initialize(attack, decay, sustain, release)
         @value = 0
+        @start_time = 0
+        @last_t = 0
+        @done = false
         @start_value = 0
         @attack = attack
         @decay = decay
@@ -40,44 +40,31 @@ module SynthBlocks
       # if released is given (should be <= t), the envelope will enter the release stage
       # returns the current value between 0 and 1
       def run(t, released)
-        attack_decay = attack + decay
-        if !released
-          if t < 0.0001 # initialize start value (slightly hacky, but works)
-            @start_value = @value
-            return @start_value
-          end
-          if t <= attack # attack
-            return @value = linear(@start_value, 1, attack, t)
-          end
-          if t > attack && t < attack_decay # decay
-            return @value = linear(1.0, sustain, decay, t - attack)
-          end
-          if t >= attack + decay # sustain
-            return @value = sustain
-          end
-        else # release
-          if released <= attack # when released in attack phase
-            attack_level = linear(@start_value, 1, attack, released)
-            return [linear(attack_level, 0, release, t - released), 0].max
+        delta = t - @last_t
+        @last_t = t
+        if released
+          return 0 if @done
+          @value += -(@sustain/@release) * (delta)
+          if @value <= 0
+            @value = 0
+            @done = true
           end
-          if released > attack && released <= attack_decay # when released in decay phase
-            decay_level = linear(1.0, sustain, decay, released - attack)
-            return @value = [linear(decay_level, 0, release, t - released), 0].max
+          return @value
+        else
+          if t < 0.0001 # initialize start value (slightly hacky, but works)
+            @start_time = t
+            return @value
           end
-          if released > attack_decay  # normal release
-            return @value = [linear(sustain, 0, release, t - released), 0].max
+          if t <= @attack
+            return @value += 1/@attack * delta
+          elsif t <= @attack + @decay
+            return @value += -(1-@sustain)/@decay * delta
+          else
+            return @value = @sustain
           end
-        end
-        0.0
-      end
-
-      private
-
-      def linear(start, target, length, time)
-        return start if time == 0
-        return target if length == 0
-        (target - start) / length * time + start
+        end 
+        @a_s = 1 / @attack
       end
     end
   end
-end
+end

data/lib/synth_blocks/mod/adsr_old.rb

@@ -0,0 +1,83 @@
+module SynthBlocks
+  module Mod
+    ##
+    # Implementation of a linear ADSR envelope generator with a tracking
+    # value so that envelope restarts don't click
+    class AdsrOld
+      ##
+      # attack time in seconds
+      attr_accessor :attack
+
+      ##
+      # decay time in seconds
+      attr_accessor :decay
+      ##
+      # sustain level (0.0-1.0)
+      attr_accessor :sustain
+
+      ##
+      # release time in seconds
+      attr_accessor :release
+
+      ##
+      # Creates new ADSR envelope
+      #
+      # attack, decay and release are times in seconds (as float)
+      #
+      # sustain should be between 0 and 1
+      def initialize(attack, decay, sustain, release)
+        @value = 0
+        @start_value = 0
+        @attack = attack
+        @decay = decay
+        @sustain = sustain
+        @release = release
+      end
+
+      ##
+      # run the envelope.
+      #
+      # if released is given (should be <= t), the envelope will enter the release stage
+      # returns the current value between 0 and 1
+      def run(t, released)
+        attack_decay = attack + decay
+        if !released
+          if t < 0.0001 # initialize start value (slightly hacky, but works)
+            @start_value = @value
+            return @start_value
+          end
+          if t <= attack # attack
+            return @value = linear(@start_value, 1, attack, t)
+          end
+          if t > attack && t < attack_decay # decay
+            return @value = linear(1.0, sustain, decay, t - attack)
+          end
+          if t >= attack + decay # sustain
+            return @value = sustain
+          end
+        else # release
+          if released <= attack # when released in attack phase
+            attack_level = linear(@start_value, 1, attack, released)
+            return [linear(attack_level, 0, release, t - released), 0].max
+          end
+          if released > attack && released <= attack_decay # when released in decay phase
+            decay_level = linear(1.0, sustain, decay, released - attack)
+            return @value = [linear(decay_level, 0, release, t - released), 0].max
+          end
+          if released > attack_decay  # normal release
+            return @value = [linear(sustain, 0, release, t - released), 0].max
+          end
+        end
+        0.0
+      end
+
+      private
+
+      def linear(start, target, length, time)
+        return start if time == 0
+        return target if length == 0
+        (target - start) / length * time + start
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synth_blocks
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 2.0.0
 platform: ruby
 authors:
 - Jan Krutisch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-11 00:00:00.000000000 Z
+date: 2020-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -81,6 +81,7 @@ files:
 - lib/synth_blocks/mixer/mixer_channel.rb
 - lib/synth_blocks/mixer/send_channel.rb
 - lib/synth_blocks/mod/adsr.rb
+- lib/synth_blocks/mod/adsr_old.rb
 - lib/synth_blocks/mod/envelope.rb
 - lib/synth_blocks/sequencer/sequencer_dsl.rb
 - lib/synth_blocks/synth/monosynth.rb
@@ -90,7 +91,7 @@ homepage: https://rubysynth.fun
 licenses:
 - AGPL-3.0-only
 metadata:
-  source_code_uri: https://github.com/halfbyte/synth_blocks
+  source_code_uri: https://github.com/halfbyte/ruby_synth_blocks
 post_install_message: 
 rdoc_options: []
 require_paths: