mml2wav 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05336b0d10a736402a502dfc2c1949e129e84377
-  data.tar.gz: 9341b84d926a6c3a120e775aac4ae1789358e9d4
+  metadata.gz: bd7a4796c9f409d00b80f36bab6500965ebfcccf
+  data.tar.gz: c07c86df8f9a0fe8121a2774a885d311548fab66
 SHA512:
-  metadata.gz: 3ab94e18b6ca8c6b8ba78d0a87f1397b4ed187b86073083cd57f4a0928fa87a3ba5545e02e1dabe9a0ffcb30772aba61e9eb9e5695ba07a6cb52f4cff89ee54a
-  data.tar.gz: 918b643d4a3809ab117beb2f3980d3c6e45ffeb9d1e11c26d5080d01d5942ca7545060068af2fa959a0615d1157a13aada3e69699289034a5d5ce5abe67e0f81
+  metadata.gz: f21edb3881d011862b646a69f32bfad62325c924e7be9daa30e5587be76f1050fcbd174cf2ae179e746ae4b0663d61838a014ba4e8e03d31a5ee92c2cbbe03dc
+  data.tar.gz: 7123c9626a12a1302ded2e1b26ce5eadc751860154567f15379c4de424b07e7ad127cfa687086c01849240e6e36328402216b27eecc533bc405b2fb3a2a11097

data/README.md

@@ -1,4 +1,4 @@
-# mml2wav
+# mml2wav [![Gem Version](https://badge.fury.io/rb/mml2wav.svg)](http://badge.fury.io/rb/mml2wav)
 
 MML (Music Macro Language) to WAV audio converter by Ruby.
 
@@ -32,11 +32,25 @@ g   | so
 a   | la
 b   | si
 
+### length
+
+MML | length
+--- | -----------------------------
+c4  | 1/4 (default)
+c8  | 1/8
+c16 | 1/16
+c.  | 1.5 times longer than default
+
 ### signs
 
 MML | mean
---- | ------
+--- | --------------
 r   | rest
+t90 | BPM
+l4  | default length
+o4  | octave
+<   | up octave
+>   | down octave
 
 ## License
 

data/examples/kaerunouta.sh

@@ -1,4 +1,4 @@
 #!/bin/sh
 
-echo 'cdefedcr efgagfer crcrcrcr ccddeefferdrc' | mml2wav --output=kaerunouta.wav
+echo 'T100V6cdefedcr efgagfer crcrcrcr c8c8d8d8e8e8f8f8 edc' | mml2wav --output=kaerunouta.wav
 aplay kaerunouta.wav

data/lib/mml2wav/command.rb

@@ -31,6 +31,10 @@ module Mml2wav
                 "Specify sampling rate", Integer) do |rate|
         options[:sampling_rate] = rate
       end
+      parser.on("--bpm=BPM",
+                "Specify BPM (beats per minute)", Integer) do |bpm|
+        options[:bpm] = bpm
+      end
       parser.parse!(arguments)
 
       unless File.pipe?('/dev/stdin') || IO.select([ARGF], nil, nil, 0)

data/lib/mml2wav/scale.rb

@@ -1,14 +1,24 @@
 module Mml2wav
   module Scale
     FREQUENCIES = {
-      c: 261.626,
-      d: 293.665,
-      e: 329.628,
-      f: 349.228,
-      g: 391.995,
-      a: 440.000,
-      b: 493.883,
-      r: 0,
+      "c"  => 32.70325 ,
+      "c#" => 34.647875,
+      "c+" => 34.647875,
+      "d"  => 36.708125,
+      "d#" => 38.890875,
+      "d+" => 38.890875,
+      "e"  => 41.2035  ,
+      "f"  => 43.6535  ,
+      "f#" => 46.24925 ,
+      "f+" => 46.24925 ,
+      "g"  => 48.999375,
+      "g#" => 51.913125,
+      "g+" => 51.913125,
+      "a"  => 55.0     ,
+      "a#" => 58.2705  ,
+      "a+" => 58.2705  ,
+      "b"  => 61.735375,
+      "r"  => 0,
     }
   end
 end

data/lib/mml2wav/version.rb

@@ -1,3 +1,3 @@
 module Mml2wav
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/mml2wav/wave.rb

@@ -8,17 +8,44 @@ module Mml2wav
 
       def write(sounds, options={})
         output_path = options[:output] || "doremi.wav"
-        sampling_rate = options[:sampling_rate] || 8000
+        sampling_rate = options[:sampling_rate] || 22050
+        bpm = options[:bpm] || 60
+        velocity = 5
+        octave = 4
+        default_length = 4.0
 
         format = Format.new(:mono, :pcm_8, sampling_rate)
-        @sine_waves = {}
         Writer.new(output_path, format) do |writer|
           buffer_format = Format.new(:mono, :float, sampling_rate)
-          sounds.split(//).each do |sound|
-            frequency = Scale::FREQUENCIES[sound.downcase.to_sym]
+          sounds.scan(/T\d+|V\d+|L\d+|[A-G][#+]?(?:\d+|\.)?|O\d+|[><]|./i).each do |sound|
+            base_sec = 60.0
+            length = default_length
+            case sound
+            when /\AT(\d+)/i
+              bpm = $1.to_i
+            when /\AV(\d+)/i
+              velocity = $1.to_i
+            when /\AL(\d+)/i
+              default_length = $1.to_f
+            when /\A([A-G][#+]?)(\d+)/i
+              length = $2.to_f
+              sound = $1
+            when /\A([A-G][#+]?)(\.)/i
+              length = default_length / 1.5
+              sound = $1
+            when /\AO(\d+)/i
+              octave = $1.to_i
+            when "<"
+              octave += 1
+            when ">"
+              octave -= 1
+            end
+            sec = base_sec / length / bpm
+            amplitude = velocity.to_f / 10
+            frequency = Scale::FREQUENCIES[sound.downcase]
             next unless frequency
-            @sine_waves[sound] ||= sine_wave(frequency, sampling_rate)
-            samples = @sine_waves[sound]
+            frequency *= (2 ** octave)
+            samples = sine_wave(frequency, sampling_rate, sec, amplitude)
             buffer = Buffer.new(samples, buffer_format)
             writer.write(buffer)
           end
@@ -26,7 +53,7 @@ module Mml2wav
       end
 
       private
-      def sine_wave(frequency, sampling_rate, sec=0.1, amplitude=0.5)
+      def sine_wave(frequency, sampling_rate, sec, amplitude=0.5)
         max = sampling_rate * sec
         if frequency == 0
           return Array.new(max) { 0.0 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mml2wav
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Masafumi Yokoyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-25 00:00:00.000000000 Z
+date: 2015-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: wavefile