mml2wav 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a1e953bfb6d378660ab80310c24d6471113cb88
-  data.tar.gz: e874322276558218393a43f6085bbbe795db653c
+  metadata.gz: 06613389b80c23f0feceb9a329027156ffdfa049
+  data.tar.gz: c885d9a54797cfe5a73c1e7b25dc6107b6bb3a4d
 SHA512:
-  metadata.gz: 48d9b354f075604e7c2f485690ec8a1a6c73b59dcf186e84da1eeef6dab00947a67fcefcf4fbf413fe1c8f70f1eac080d1be8714e47b3688118ca4c0bf7d9941
-  data.tar.gz: 51a6810935932876b27d5c23ea54701112e974aaa305ec24c095e051541f096bc8c53a348d01726c920898e15155cd0228073ca02d4cc10457cdade3957f9377
+  metadata.gz: 6c5d0613578307b8dc99cd947de6f7aab9c5e4bf42a2d4f0674a9bcca81c5b4238ae43a7f4f4ffe4d10e22c7e7bd88922ebb2e18df983f683e89391cc337abc6
+  data.tar.gz: 18ab290f8e4b791855cd7ac65f5532632063c759f09b0d5a0d40eb8b521e605a420c374724c3d3502e13c0a907f55350b7f333991a5bef40238b5696bc8f7cb7

data/lib/mml2wav/command.rb

@@ -10,7 +10,9 @@ module Mml2wav
 
     def initialize(arguments)
       @options = parse_options(arguments)
-      @sounds = ARGF.readlines.join(" ")
+      channel_delimiter = @options[:channel_delimiter] || ","
+      channels = ARGF.readlines.join.split(/#{channel_delimiter}/)
+      @sounds = channels.reject {|channel| channel.empty? }
     end
 
     def run
@@ -35,6 +37,14 @@ module Mml2wav
                 "Specify BPM (beats per minute)", Integer) do |bpm|
         options[:bpm] = bpm
       end
+      parser.on("--octave_reverse",
+                "Reverse octave sign (><) effects") do |boolean|
+        options[:octave_reverse] = boolean
+      end
+      parser.on("--channel_delimiter=DELIMITER",
+                "Specify channel delimiter") do |delimiter|
+        options[:channel_delimiter] = delimiter
+      end
       parser.parse!(arguments)
 
       unless File.pipe?('/dev/stdin') || IO.select([ARGF], nil, nil, 0)

data/lib/mml2wav/parser.rb

@@ -0,0 +1,64 @@
+require "mml2wav/scale"
+
+module Mml2wav
+  class Parser
+    def initialize(sounds, sampling_rate, options={})
+      pattern = /T\d+|V\d+|L\d+|[A-G][#+-]?\d*\.?|O\d+|[><]|./i
+      @sounds = sounds.scan(pattern)
+      @sampling_rate = sampling_rate
+      @bpm = options[:bpm] || 120
+      @velocity = options[:velocity] || 5
+      @octave = options[:octave] || 4
+      @default_length = options[:default_length] || 4.0
+      @octave_reverse = options[:octave_reverse] || false
+      @cursor = 0
+    end
+
+    def wave!
+      @cursor.upto(@sounds.size - 1) do |i|
+        sound = @sounds[i]
+        base_sec = 60.0 * 4
+        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
+          length = @default_length / 1.5 if $3
+        when /\AO(\d+)/i
+          @octave = $1.to_i
+        when "<"
+          @octave += @octave_reverse ? -1 : 1
+        when ">"
+          @octave -= @octave_reverse ? -1 : 1
+        end
+        sec = base_sec / length / @bpm
+        amplitude = @velocity.to_f / 10
+        frequency = Scale::FREQUENCIES[sound.downcase]
+        next unless frequency
+        frequency *= (2 ** @octave)
+        wave = sine_wave(frequency, @sampling_rate, sec, amplitude)
+        @cursor = i + 1
+        return wave
+      end
+      nil
+    end
+
+    private
+    def sine_wave(frequency, sampling_rate, sec, amplitude=0.5)
+      max = sampling_rate * sec
+      if frequency == 0
+        return Array.new(max) { 0.0 }
+      end
+      base_x = 2.0 * Math::PI * frequency / sampling_rate
+      1.upto(max).collect do |n|
+        amplitude * Math.sin(base_x * n)
+      end
+    end
+  end
+end

data/lib/mml2wav/version.rb

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

data/lib/mml2wav/wave.rb

@@ -1,66 +1,62 @@
 require "wavefile"
-require "mml2wav/scale"
+require "mml2wav/parser"
 
 module Mml2wav
   class Wave
     class << self
       include WaveFile
 
-      def write(sounds, options={})
+      def write(soundses, options={})
+        if soundses.is_a?(String)
+          n_channels = :mono
+          soundses = [soundses]
+          size = 1
+        elsif soundses.size == 1
+          n_channels = :mono
+          size = 1
+        elsif soundses.size == 2
+          n_channels = :stereo
+          size = soundses.size
+        else
+          n_channels = soundses.size
+          size = soundses.size
+        end
         output_path = options[:output] || "doremi.wav"
         sampling_rate = options[:sampling_rate] || 22050
-        bpm = options[:bpm] || 120
-        velocity = 5
-        octave = 4
-        default_length = 4.0
 
-        format = Format.new(:mono, :pcm_8, sampling_rate)
+        format = Format.new(n_channels, :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 * 4
-            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
-              length = default_length / 1.5 if $3
-            when /\AO(\d+)/i
-              octave = $1.to_i
-            when "<"
-              octave += 1
-            when ">"
-              octave -= 1
+          buffer_format = Format.new(n_channels, :float, sampling_rate)
+          parsers = []
+          soundses.each do |sounds|
+            parsers << Parser.new(sounds, sampling_rate, options)
+          end
+          waves = Array.new(parsers.size) { [] }
+          loop do
+            parsers.each_with_index do |parser, i|
+              wave = parser.wave!
+              waves[i] += wave if wave
+            end
+            break if waves.all? {|wave| wave.empty? }
+            buffer_size = waves.reject {|wave| wave.empty? }.collect(&:size).min
+            break unless buffer_size
+            samples = []
+            buffer_size.times do
+              sample = []
+              waves.each do |wave|
+                if wave.first
+                  sample << wave.shift
+                else
+                  sample << 0.0
+                end
+              end
+              samples << sample
             end
-            sec = base_sec / length / bpm
-            amplitude = velocity.to_f / 10
-            frequency = Scale::FREQUENCIES[sound.downcase]
-            next unless frequency
-            frequency *= (2 ** octave)
-            samples = sine_wave(frequency, sampling_rate, sec, amplitude)
             buffer = Buffer.new(samples, buffer_format)
             writer.write(buffer)
           end
         end
       end
-
-      private
-      def sine_wave(frequency, sampling_rate, sec, amplitude=0.5)
-        max = sampling_rate * sec
-        if frequency == 0
-          return Array.new(max) { 0.0 }
-        end
-        base_x = 2.0 * Math::PI * frequency / sampling_rate
-        1.upto(max).collect do |n|
-          amplitude * Math.sin(base_x * n)
-        end
-      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mml2wav
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Masafumi Yokoyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-26 00:00:00.000000000 Z
+date: 2015-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: wavefile
@@ -69,6 +69,7 @@ files:
 - examples/kaerunouta.sh
 - lib/mml2wav.rb
 - lib/mml2wav/command.rb
+- lib/mml2wav/parser.rb
 - lib/mml2wav/scale.rb
 - lib/mml2wav/version.rb
 - lib/mml2wav/wave.rb