mml2wav 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd7a4796c9f409d00b80f36bab6500965ebfcccf
-  data.tar.gz: c07c86df8f9a0fe8121a2774a885d311548fab66
+  metadata.gz: 5a1e953bfb6d378660ab80310c24d6471113cb88
+  data.tar.gz: e874322276558218393a43f6085bbbe795db653c
 SHA512:
-  metadata.gz: f21edb3881d011862b646a69f32bfad62325c924e7be9daa30e5587be76f1050fcbd174cf2ae179e746ae4b0663d61838a014ba4e8e03d31a5ee92c2cbbe03dc
-  data.tar.gz: 7123c9626a12a1302ded2e1b26ce5eadc751860154567f15379c4de424b07e7ad127cfa687086c01849240e6e36328402216b27eecc533bc405b2fb3a2a11097
+  metadata.gz: 48d9b354f075604e7c2f485690ec8a1a6c73b59dcf186e84da1eeef6dab00947a67fcefcf4fbf413fe1c8f70f1eac080d1be8714e47b3688118ca4c0bf7d9941
+  data.tar.gz: 51a6810935932876b27d5c23ea54701112e974aaa305ec24c095e051541f096bc8c53a348d01726c920898e15155cd0228073ca02d4cc10457cdade3957f9377

data/README.md

@@ -1,6 +1,6 @@
 # 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.
+MML (Music Macro Language) to WAV audio converter by pure Ruby.
 
 ## Dependencies
 

data/lib/mml2wav/scale.rb

@@ -4,19 +4,24 @@ module Mml2wav
       "c"  => 32.70325 ,
       "c#" => 34.647875,
       "c+" => 34.647875,
+      "d-" => 34.647875,
       "d"  => 36.708125,
       "d#" => 38.890875,
       "d+" => 38.890875,
+      "e-" => 38.890875,
       "e"  => 41.2035  ,
       "f"  => 43.6535  ,
       "f#" => 46.24925 ,
       "f+" => 46.24925 ,
+      "g-" => 46.24925 ,
       "g"  => 48.999375,
       "g#" => 51.913125,
       "g+" => 51.913125,
+      "a-" => 51.913125,
       "a"  => 55.0     ,
       "a#" => 58.2705  ,
       "a+" => 58.2705  ,
+      "b-" => 58.2705  ,
       "b"  => 61.735375,
       "r"  => 0,
     }

data/lib/mml2wav/version.rb

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

data/lib/mml2wav/wave.rb

@@ -9,7 +9,7 @@ module Mml2wav
       def write(sounds, options={})
         output_path = options[:output] || "doremi.wav"
         sampling_rate = options[:sampling_rate] || 22050
-        bpm = options[:bpm] || 60
+        bpm = options[:bpm] || 120
         velocity = 5
         octave = 4
         default_length = 4.0
@@ -17,8 +17,8 @@ module Mml2wav
         format = Format.new(:mono, :pcm_8, sampling_rate)
         Writer.new(output_path, format) do |writer|
           buffer_format = Format.new(:mono, :float, sampling_rate)
-          sounds.scan(/T\d+|V\d+|L\d+|[A-G][#+]?(?:\d+|\.)?|O\d+|[><]|./i).each do |sound|
-            base_sec = 60.0
+          sounds.scan(/T\d+|V\d+|L\d+|[A-G][#+-]?\d*\.?|O\d+|[><]|./i).each do |sound|
+            base_sec = 60.0 * 4
             length = default_length
             case sound
             when /\AT(\d+)/i
@@ -27,12 +27,10 @@ module Mml2wav
               velocity = $1.to_i
             when /\AL(\d+)/i
               default_length = $1.to_f
-            when /\A([A-G][#+]?)(\d+)/i
+            when /\A([A-G][#+-]?)(\d+)(\.)?/i
               length = $2.to_f
               sound = $1
-            when /\A([A-G][#+]?)(\.)/i
-              length = default_length / 1.5
-              sound = $1
+              length = default_length / 1.5 if $3
             when /\AO(\d+)/i
               octave = $1.to_i
             when "<"

data/mml2wav.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.version       = Mml2wav::VERSION
   spec.authors       = ["Masafumi Yokoyama"]
   spec.email         = ["myokoym@gmail.com"]
-  spec.description   = %q{MML (Music Macro Language) to WAV audio converter by Ruby.}
+  spec.description   = %q{MML (Music Macro Language) to WAV audio converter by pure Ruby.}
   spec.summary       = spec.description
   spec.homepage      = "https://github.com/myokoym/mml2wav"
   spec.license       = "MIT"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mml2wav
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Masafumi Yokoyama
@@ -52,7 +52,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: MML (Music Macro Language) to WAV audio converter by Ruby.
+description: MML (Music Macro Language) to WAV audio converter by pure Ruby.
 email:
 - myokoym@gmail.com
 executables:
@@ -96,6 +96,6 @@ rubyforge_project:
 rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: MML (Music Macro Language) to WAV audio converter by Ruby.
+summary: MML (Music Macro Language) to WAV audio converter by pure Ruby.
 test_files: []
 has_rdoc: