muse 0.0.4 → 0.0.6

data/lib/muse/config/adsr.rb

@@ -1,3 +1,19 @@
+# Muse
+# Copyright (C) 2012  Chang Sau Sheong
+# 
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 module Muse
   module Config
     class << self

data/lib/muse/config/chords.rb

@@ -1,3 +1,19 @@
+# Muse
+# Copyright (C) 2012  Chang Sau Sheong
+# 
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 module Muse
   module Config
     class << self

data/lib/muse/config.rb

@@ -1 +1,17 @@
+# Muse
+# Copyright (C) 2012  Chang Sau Sheong
+# 
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 Dir["#{File.dirname(__FILE__)}/config/*.rb"].each{|f| require f }

data/lib/muse/version.rb

@@ -1,3 +1,19 @@
+# Muse
+# Copyright (C) 2012  Chang Sau Sheong
+# 
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 module Muse
-  VERSION = "0.0.4"
+  VERSION = "0.0.6"
 end

data/lib/muse/wav.rb

@@ -1,6 +1,23 @@
+# Muse
+# Copyright (C) 2012  Chang Sau Sheong
+# 
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 require 'bindata'
 
 module Muse
+  
   class RiffChunk < BinData::Record
     int32be :chunk_id
     int32le :chunk_size
@@ -21,23 +38,26 @@ module Muse
   class DataChunk < BinData::Record
     int32be :chunk_id
     int32le :chunk_size  
+  end
+
+  class TempData < BinData::Record
     array :stream do
       int16le :left
       int16le :right
     end
   end
-
+  
   class WavFormat < BinData::Record
     riff_chunk   :riff_chunk
     format_chunk :format_chunk
     data_chunk   :data_chunk
   end
-
-  class Wav
+  
+  class WavHeader
     SAMPLE_RATE = 44100
     attr :wav, :file, :sample_rate, :format_chunk, :riff_chunk, :data_chunk
     
-    def initialize(filename)
+    def initialize(filename, stream_size)
       @sample_rate = SAMPLE_RATE
       @file = File.open(filename, "wb")
 
@@ -54,26 +74,18 @@ module Muse
       @format_chunk.sample_rate =  @sample_rate
       @format_chunk.byte_rate = @format_chunk.sample_rate * @format_chunk.num_channels * @format_chunk.bits_per_sample/2
       @format_chunk.block_align = @format_chunk.num_channels * @format_chunk.bits_per_sample/2
+      
       @data_chunk = DataChunk.new
       @data_chunk.chunk_id = "data".unpack("N").first
-    end
-
-    def write(stream_data)
-      stream_data.each_with_index do |s,i|
-        @data_chunk.stream[i].left = s[0]
-        @data_chunk.stream[i].right = s[1]
-      end
-      @data_chunk.chunk_size = stream_data.length * @format_chunk.num_channels * @format_chunk.bits_per_sample/8
+      @data_chunk.chunk_size = stream_size * @format_chunk.num_channels * @format_chunk.bits_per_sample/8
       @riff_chunk.chunk_size = 36 + @data_chunk.chunk_size
+      
       @wav = WavFormat.new
       @wav.riff_chunk = @riff_chunk
       @wav.format_chunk = @format_chunk
       @wav.data_chunk = @data_chunk
       @wav.write(@file)
-    end
 
-    def close
-      @file.close
     end
   end
 end

data/lib/muse.rb

@@ -1,17 +1,37 @@
+# Muse
+# Copyright (C) 2012  Chang Sau Sheong
+# 
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+require "parallel"
 require "muse/wav"
 require "muse/config"
 
 module Muse
   class Song
-    attr :wav_file, :bars
+    attr :name, :bars
 
     def self.record(name, &block)
+      start_time = Time.now
       puts "Start recording song named #{name}.wav"
-      @wav_file = Wav.new(name + ".wav")
+      @name = name
       @bars = {}
       puts "Processing ..."
       instance_eval &block
       save
+      end_time = Time.now
+      puts "Total time taken : #{((end_time - start_time)/60.0).round(3)} minutes"  
       puts "done."
     end
 
@@ -72,14 +92,14 @@ module Muse
           beats, volume, adsr = (@beats || 1), 10000, 'default'
         end
         puts "[#{note}] -> beats : #{beats}, :octave : #{octave}"
-        duration = ((60 * Wav::SAMPLE_RATE * beats)/@bpm)/Wav::SAMPLE_RATE.to_f
+        duration = ((60 * WavHeader::SAMPLE_RATE * beats)/@bpm)/WavHeader::SAMPLE_RATE.to_f
         note_frequency = note + octave.to_s
         unless note == '_'
           freq = frequency_of(FREQUENCIES[note_frequency.to_sym])
         else
           freq = 0
         end      
-        (0.0..duration.to_f).step(1.0/Wav::SAMPLE_RATE) do |i|
+        (0.0..duration.to_f).step(1.0/WavHeader::SAMPLE_RATE) do |i|
           x = (Config.send(adsr.to_sym,i) * volume * Math.sin(2 * Math::PI * freq * i)).to_i
           stream << [x,x]
         end  
@@ -131,18 +151,40 @@ module Muse
       end
 
       def save
-        puts "Saving music file"
-        stream = []
-        @bars.each do |id, item|
+        puts "Creating temporary files in parallel ..."
+
+        results = Parallel.each_with_index(@bars.values, :in_processes => 4) do |item, id|
+          puts "Writing file - #{id}"
+          stream = []
           container = []
           item = right_size item
           item.each do |i|
             container << i.stream
           end
-          stream += container.transpose.map {|x| x.transpose.map {|y| y.reduce(:+)}}   
+          stream += container.transpose.map {|x| x.transpose.map {|y| y.reduce(:+)}}
+          temp = TempData.new
+          stream.each_with_index do |s,i|
+            temp.stream[i].left = s[0]
+            temp.stream[i].right = s[1]
+          end          
+          File.open("#{@name}-#{id}.tmp", "w") {|file| temp.write(file) }
+          puts "Completed file - #{id}"
+        end
+
+        stream_size = results.inject(0) do |memo, bars|
+          memo + bars.first.stream.size
+        end
+
+        puts "Combining temporary files ..."
+        WavHeader.new("#{@name}.wav", stream_size)
+        tmpfiles = Dir.glob("#{@name}-*.tmp")
+        File.open("#{@name}.wav", "ab+") do |wav|
+          tmpfiles.each do |file|
+            File.open(file, "rb") { |tmp| File.copy_stream(tmp, wav) }
+            File.delete file
+          end
         end
-        @wav_file.write(stream)
-        @wav_file.close
+        
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: muse
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-11 00:00:00.000000000Z
+date: 2012-03-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
-  requirement: &2168647260 !ruby/object:Gem::Requirement
+  requirement: &2156346880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,7 +22,18 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2168647260
+  version_requirements: *2156346880
+- !ruby/object:Gem::Dependency
+  name: parallel
+  requirement: &2156345400 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2156345400
 description: Muse is a complete music creation package including writing and up to
   creating WAV files
 email: