picotune 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 420d900e79e43c6c4707fdf1475659527d486713959829ba8919016643727e49
-  data.tar.gz: 5d4ddd69133f82d076bc7b74110a2d1c6b3a346e9155eae17c094506bbb24794
+  metadata.gz: 0ecca785ebf3408cba41634a5b8fcaf831f4c2fd0491ca9b1a44490e874a7d5b
+  data.tar.gz: 9b1dce6e5835dbcc4c15cf5f35093305745ffdad355b9e5bc29f1cc79081fbec
 SHA512:
-  metadata.gz: 6c1e615d6ee4d1d35cfdefb97badb5c2c27a99ff35684db59c0a3c959177d3f74e29e359c0839ab13ab95f76134d847b5ae0faf97402a9531561b27051e28695
-  data.tar.gz: b0c17d66fe3841a45a871cdafbc5a4d1f8a542827c0af72fcd83e59da1d061881f5ff37a53cf96201c01a379c573aaebbd4a4e185af68c22ae76fb97f7b911cd
+  metadata.gz: 6acaaf48a00c73696d870fe31976f49712f557b76733c093d9f10b16a1083ec80e9479298fee97736fcc1e6fcc954c0e7871e85aeb29c3d50b0867ce26aee996
+  data.tar.gz: 78569c71d4dacb1f8997b39de1708d807ef52f8b609aff8bac4d461c92fdf5ff95b5188b2718b143efe1b2134dfc06c25d70c7540b26ee5e3a6af0895b335b87

data/lib/picotune.rb

@@ -49,17 +49,18 @@ class PicoTune::Sample
     @left += sample.left
     @right += sample.right
 
-    # "foldback" instead of hard clipping, sounds cool
+    # hard clip
+
     if @left > 1.0
-      @left = 1.0 - (@left - 1.0) # ex: 1.0 - (1.2 - 1.0) => 1.0 - 0.2 => 0.8
+      @left = 1.0
     elsif @left < -1.0
-      @left = -1.0 - (@left + 1.0) # ex: -1.0 - (-1.2 + 1.0) => -1.0 - -0.2 => -0.8
+      @left = -1.0
     end
 
     if @right > 1.0
-      @right = 1.0 - (@right - 1.0)
+      @right = 1.0
     elsif @right < -1.0
-      @right = -1.0 - (@right + 1.0)
+      @right = -1.0
     end
 
     self # return self to chain ops EX: sample.add(sample).add(sample) etc
@@ -75,10 +76,9 @@ class PicoTune::Sample
 end
 
 class PicoTune::WaveSample
-  def initialize tone, samples_per_wave, multiplier = nil
+  def initialize tone, samples_per_wave
     @tone = tone
     @samples_per_wave = samples_per_wave
-    @multiplier = multiplier
   end
 
   def sample index
@@ -101,43 +101,42 @@ class PicoTune::WaveSample
   end
 
   def sine index
-    Math.sin(index / (@samples_per_wave / (Math::PI * 2))) * (@multiplier || 0.5)
+    Math.sin(index / (@samples_per_wave / (Math::PI * 2)))
   end
 
   def saw index
     interval = @samples_per_wave / 2
     half_interval = interval / 2
     percent = ((index + half_interval) % interval) / interval.to_f
-    ((0.6 * percent) - 0.3) * (@multiplier || 0.5)
+    ((0.6 * percent) - 0.3)
   end
 
   def square index
-    (index <= @samples_per_wave / 2 ? 1.0 : -1.0) * (@multiplier || 0.25)
+    (index <= @samples_per_wave / 2 ? 1.0 : -1.0)
   end
 
   def noise index
     value = sine index
     rand = Random.rand - 0.5
-    value * rand * (@multiplier || 0.5)
+    value * rand
   end
 
   def triangle index
     half = @samples_per_wave / 2
     quarter = @samples_per_wave / 4
     ramp = 1.0 / quarter
-    m = @multiplier || 0.5
 
     if index <= half
       if index <= quarter
-        index * ramp * m
+        index * ramp
       else
-        (half - index) * ramp * m
+        (half - index) * ramp
       end
     else
       if index <= half + quarter
-        -((index - half) * ramp) * m
+        -((index - half) * ramp)
       else
-        -((@samples_per_wave - index) * ramp) * m
+        -((@samples_per_wave - index) * ramp)
       end
     end
   end
@@ -150,6 +149,22 @@ class PicoTune::Tune
     @name = name
     @sequence = sequence
     @phrases = phrases
+
+    @phrases.each do |p|
+      p.tune = self
+    end
+  end
+
+  def volume_factor_for_simultaneous_melodies
+    max_melodies_in_phrases = 0
+
+    @phrases.each do |phrase|
+      if phrase.simultaneous_melodies > max_melodies_in_phrases
+        max_melodies_in_phrases = phrase.simultaneous_melodies
+      end
+    end
+
+    1.0 / max_melodies_in_phrases if max_melodies_in_phrases > 0
   end
 
   def buffer
@@ -193,7 +208,8 @@ class PicoTune::Tune
 end
 
 class PicoTune::Phrase
-  attr_reader :name, :tempo, :beats, :subbeats, :melodies
+  attr_reader :name, :tempo, :beats, :subbeats, :melodies, :simultaneous_melodies
+  attr_accessor :tune
 
   def initialize name, tempo, beats, subbeats, melodies
     @name = name
@@ -201,6 +217,11 @@ class PicoTune::Phrase
     @beats = beats.to_i
     @subbeats = subbeats.to_i
     @melodies = melodies
+    @simultaneous_melodies = @melodies.count
+
+    @melodies.each do |m|
+      m.instrument.phrase = self
+    end
   end
 
   def seconds_per_beat
@@ -221,7 +242,7 @@ class PicoTune::Phrase
 
       @melodies.each do |melody|
         temp = Array.new(buffer_size) { PicoTune::Sample.new } if melody.instrument.reverb?
-        sub_buffer_size = (buffer_size.to_f / (@beats * @subbeats)).ceil
+        sub_buffer_size = buffer_size / (@beats * @subbeats)
         last_step_number = -1
         carry_over = 0
 
@@ -285,6 +306,7 @@ end
 
 class PicoTune::Instrument
   attr_reader :name, :tone, :length, :volume, :pan, :reverb
+  attr_accessor :phrase
 
   def initialize name, tone = 0, length = 'full', volume = 'full', pan = 'center', reverb = 'none'
     @name = name
@@ -369,16 +391,23 @@ class PicoTune::Instrument
 
   def wave wave_index, note 
     frequency = frequency_for_note note
-    samples_per_wave = (PicoTune::SAMPLE_RATE / frequency).ceil
+    samples_per_wave = (PicoTune::SAMPLE_RATE / frequency).to_i
     sample = PicoTune::WaveSample.new(@tone, samples_per_wave).sample wave_index
     sample.modify_left :*, volume_value * (1 - pan_value / 4.0)
     sample.modify_right :*, volume_value * (pan_value / 4.0)
+
+    if v = phrase&.tune&.volume_factor_for_simultaneous_melodies
+      sample.modify_left :*, v
+      sample.modify_right :*, v
+    end
+
     sample
   end
 
   def samples_per_wave note
     frequency = frequency_for_note note
-    (PicoTune::SAMPLE_RATE / frequency).ceil end
+    (PicoTune::SAMPLE_RATE / frequency).to_i
+  end
 
   def frequency_for_note note
     parts = note.split ''

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: picotune
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Zachary Schroeder
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-13 00:00:00.000000000 Z
+date: 2021-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: wavefile