picotune 0.0.4 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a35c7146e96a70bdf13083331db163fda9137e6cd10baac06e0fd6ef517de77e
-  data.tar.gz: acd8d878432d7770e168aa0307b5d3496c502f22593ad2df5e2dcac651d91b94
+  metadata.gz: de0cea1678fa0056bb4da4e3a016166160b1e1190a13f067f38d6cf620d07a54
+  data.tar.gz: f18fb53c744d050f6cf6632855fbd239fb4cd3ce45fa636f18dc27d65f42355c
 SHA512:
-  metadata.gz: 7607d472022133602b24139e9508d9bd68b4066994f445386faf2dac2272e132d5df6601423dbb0f292c10170f75f72650ed4ba38711c63d83e11e246c182efe
-  data.tar.gz: 4e5dbb38360c7f2db24cc0f7801a8973b79d4448cc72565913b4fd52d147514973c4ea3a2f1781602373d8d51d2e3b8d22211243b3996d2c3fa944c2a1e51657
+  metadata.gz: e745f4dd1af6767c828f711019a8c3a2c9f16027b5a7dba7647c519e2dfe06fa24ec8a00c51219b599092854f1a1e7b5918801846684d2b4ded7b1403fd50771
+  data.tar.gz: d532fac56aac02ad6353c3328ed2baca6a968566bbe721dbec25e7969ccb5e7f73b7b60b4869ddfa49a5e27eb17e7cc6dc5acd2fc90d186c1b7f94308a9ad189

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
 
@@ -269,7 +290,7 @@ class PicoTune::Phrase
                   temp[i + melody.instrument.reverb_offset] = verb_sample
                 end
 
-                samples[i] = samples[i].add temp[i]
+                samples[i] = (samples[i] || PicoTune::Sample.new).add temp[i]
                 
                 i += 1
               end
@@ -285,8 +306,9 @@ 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'
+  def initialize name, tone, length, volume, pan, reverb
     @name = name
     @tone = tone
     @length = length
@@ -307,6 +329,8 @@ class PicoTune::Instrument
       0.75
     when 'full'
       1.0
+    else
+      1.0
     end
   end
 
@@ -322,6 +346,8 @@ class PicoTune::Instrument
       0.75
     when 'full'
       1.0
+    else
+      1.0
     end
   end
 
@@ -337,11 +363,13 @@ class PicoTune::Instrument
       3
     when 'right'
       4
+    else
+      2
     end
   end
 
   def delay
-    @reverb == 'none' ? 0.0 : 0.1
+    @reverb == 'none' ? 0.0 : 0.08
   end
 
   def decay
@@ -349,11 +377,11 @@ class PicoTune::Instrument
     when 'none'
       0.0
     when 'some'
-      0.25
+      0.1
     when 'more'
-      0.5
+      0.3
     when 'lots'
-      0.75
+      0.5
     else
       0.0
     end
@@ -369,16 +397,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 ''
@@ -434,11 +469,11 @@ class PicoTune::Assembler
     instruments = list.select { |item| item['type'] == 'instrument' }.map do |item|
       PicoTune::Instrument.new(
         item['name'],
-        item['tone'],
-        item['length'],
-        item['volume'],
-        item['pan'],
-        item['reverb']
+        item['tone'] || 'sine',
+        item['length'] || 'full',
+        item['volume'] || 'full',
+        item['pan'] || 'center',
+        item['reverb'] || 'none'
       )
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: picotune
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.8
 platform: ruby
 authors:
 - Zachary Schroeder
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-13 00:00:00.000000000 Z
+date: 2021-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: wavefile
@@ -25,6 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.1.1
 description: Use a text file with a simple DSL to generate a musical (maybe) wav file.
+  See https://github.com/robobluebird/picotune for DSL documentation!
 email: schroza@gmail.com
 executables:
 - picotune
@@ -33,10 +34,13 @@ extra_rdoc_files: []
 files:
 - bin/picotune
 - lib/picotune.rb
-homepage: https://rubygems.org/gems/picotune
+homepage: https://github.com/robobluebird/picotune
 licenses:
 - MIT
-metadata: {}
+metadata:
+  documentation_uri: https://github.com/robobluebird/picotune
+  homepage_uri: https://github.com/robobluebird/picotune
+  source_code_uri: https://github.com/robobluebird/picotune
 post_install_message:
 rdoc_options: []
 require_paths: