picotune 0.0.2 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df51a0bf3802fd2ddba38cf31f7bfdc939b6d718a5c7c224880a07c9ac8af936
-  data.tar.gz: 6e3ab3ac81fc7b8636dcd99256af65f044eff8ed3372e1574c27df7c644db28e
+  metadata.gz: 0ecca785ebf3408cba41634a5b8fcaf831f4c2fd0491ca9b1a44490e874a7d5b
+  data.tar.gz: 9b1dce6e5835dbcc4c15cf5f35093305745ffdad355b9e5bc29f1cc79081fbec
 SHA512:
-  metadata.gz: 1b056316506eaba70a5b34180d9ba1ebbc2c12eb21ccee6de8949646dcbed964f6cb903b6a36d6954c9e17f32d072ab02243e6e133443c7232599e572c41ba99
-  data.tar.gz: 4af2a9c00d2950b26385b55687f8ce0ac542f2bc75c0e802bd9e7cfbe332b0313302f9ffc56551ef47f6046d5075a2065347c0257c0a16e86a614010ad9d2769
+  metadata.gz: 6acaaf48a00c73696d870fe31976f49712f557b76733c093d9f10b16a1083ec80e9479298fee97736fcc1e6fcc954c0e7871e85aeb29c3d50b0867ce26aee996
+  data.tar.gz: 78569c71d4dacb1f8997b39de1708d807ef52f8b609aff8bac4d461c92fdf5ff95b5188b2718b143efe1b2134dfc06c25d70c7540b26ee5e3a6af0895b335b87

data/bin/picotune

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require 'picotune'
+p = PicoTune.new(ARGV[0]).wav
+puts "#{ARGV[0]} -> #{p}"

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
@@ -225,6 +246,10 @@ class PicoTune::Phrase
         last_step_number = -1
         carry_over = 0
 
+        if melody.pattern.steps.count != @beats * @subbeats
+          raise "Mismatch between Pattern \"#{melody.pattern.name}\", which has #{melody.pattern.steps.count} steps, and Phrase \"#{@name}\", which has #{@beats} beats and #{subbeats} subbeats (meaning any pattern it uses should have #{@beats * @subbeats} steps). Please check your pattern and phrase definitions to find the discrepancy!"
+        end
+
         melody.pattern.steps.each_with_index do |note, step_number|
           unless note == '.'
             buffer_pointer = step_number * sub_buffer_size
@@ -281,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
@@ -365,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 ''
@@ -445,8 +478,13 @@ class PicoTune::Assembler
     phrases = list.select { |item| item['type'] == 'phrase' }.map do |item|
       melodies = item['melodies'].map do |m|
         instrument = instruments.find { |i| i.name == m[0] }
+
+        raise "Instrument named \"#{m[0]}\" doesn't exist!" unless instrument
+
         pattern = patterns.find { |p| p.name == m[1] }
 
+        raise "Pattern named \"#{m[1]}\" doesn't exist!" unless pattern
+
         PicoTune::Melody.new instrument, pattern
       end
 
@@ -460,13 +498,16 @@ class PicoTune::Assembler
     end
 
     sequence = list.find { |item| item['type'] == 'sequence' }
+
+    raise "Please define a sequence in your txt file with \"sequence s1 s2 s3...\" where s1/s2/s3/etc are names of phrases" unless sequence
+
     sequence['list'].each do |phrase_name|
       raise "undefined phrase \"#{phrase_name}\" in sequence" unless phrases.find { |p| p.name == phrase_name }
     end
 
-
     tune = list.find { |item| item['type'] == 'tune' }
-    raise 'undefined tune name' unless tune['name']
+
+    raise "Please define your tune's name in your txt file  with \"tune <tune name>\"" unless tune && tune['name']
 
     PicoTune::Tune.new tune['name'], sequence['list'], phrases
   end
@@ -497,9 +538,9 @@ class PicoTune::Parser
           item['list'] = parts[1..-1]
         elsif parts[0] == 'pattern'
           item['name'] = parts[1]
-          item['list'] = pattern_steps(parts[2])
+          item['list'] = pattern_steps parts[2..-1].join
         else
-          item['name'] = parts[1]
+          item['name'] = parts[1..-1].join
         end
 
         bag << item
@@ -512,7 +553,7 @@ class PicoTune::Parser
         elsif collecting_melodies
           bag.last['melodies'].push parts
         else
-          bag.last[parts[0]] = parts[1]
+          bag.last[parts[0]] = parts[1..-1].join
         end
       end
       

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: picotune
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  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
@@ -25,16 +25,22 @@ 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: []
+executables:
+- picotune
 extensions: []
 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: