muse 0.0.6 → 0.0.7

data/lib/muse/config/{adsr.rb → envelope.rb}

@@ -15,11 +15,16 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 module Muse
-  module Config
+  module Envelope
     class << self
-      def default(input)
-        Math.cos(2* Math::PI*input).to_f
+      def default(input, duration)
+        Math.cos((Math::PI*input)/(2*duration.to_f))
       end
+      
+      def sine(input, duration)
+        Math.sin((Math::PI*input)/duration.to_f)
+      end  
+      
     end
   end
 end

data/lib/muse/config/harmonic.rb

@@ -0,0 +1,46 @@
+# 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 Harmonic
+    class << self
+      def default(input)
+        Math.sin(2 * Math::PI * input)
+      end
+
+      def second(input)
+        Math.sin(2 * Math::PI * input) + 
+        Math.sin(3* 2 * Math::PI * input)
+      end
+
+      def third(input)
+        Math.sin(2 * Math::PI * input) + 
+        Math.sin(3* 2 * Math::PI * input) + 
+        Math.sin(5 * 2 * Math::PI * input)
+      end
+
+      def organ(input)
+        Math.sin(2 * 2 * Math::PI * input) + 
+        Math.sin(2 * Math::PI * input) + 
+        Math.sin(Math::PI * input)
+
+      end
+      
+
+      
+    end
+  end
+end

data/lib/muse/version.rb

@@ -15,5 +15,5 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 module Muse
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/muse.rb

@@ -15,17 +15,19 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require "parallel"
-require "muse/wav"
-require "muse/config"
+require "#{File.dirname(__FILE__)}/muse/wav"
+require "#{File.dirname(__FILE__)}/muse/config"
 
 module Muse
   class Song
-    attr :name, :bars
 
-    def self.record(name, &block)
+    def self.record(name, options ={}, &block)
       start_time = Time.now
       puts "Start recording song named #{name}.wav"
       @name = name
+      @bpm = options[:bpm] || 120
+      @envelope = options[:envelope] || 'default'
+      @harmonic = options[:harmonic] || 'default'
       @bars = {}
       puts "Processing ..."
       instance_eval &block
@@ -36,7 +38,7 @@ module Muse
     end
 
     class Bar
-      attr :bpm, :beats, :adsr
+      attr :bpm, :beats, :envelope, :harmonic
       attr_accessor :stream
       
       NOTES = %w(_ a ais b c cis d dis e f fis g gis)
@@ -56,7 +58,8 @@ module Muse
       def initialize(id, options={})
         @bpm = options[:bpm] || 120
         @beats = (options[:b] || 1).to_f
-        @adsr = options[:adsr] || 'default'
+        @envelope = options[:envelope] || 'default'
+        @harmonic = options[:harmonic] || 'default'
         @stream = []
       end
 
@@ -86,12 +89,13 @@ module Muse
         stream = []
         if options
           beats  = options[:b].nil?  ? (@beats || 1) : options[:b].to_f
-          volume = (options[:v].nil? ? 10 : options[:v].to_i) * 1000
-          adsr = options[:a].nil? ? @adsr : 'default'
+          volume = (options[:v].nil? ? 5 : options[:v].to_i) * 1000
+          envelope = options[:a].nil? ? @envelope : 'default'
+          harmonic = options[:h].nil? ? @harmonic : 'default'
         else
-          beats, volume, adsr = (@beats || 1), 10000, 'default'
+          beats, volume, envelope, harmonic = (@beats || 1), 5000, @envelope || 'default', @harmonic || 'default'
         end
-        puts "[#{note}] -> beats : #{beats}, :octave : #{octave}"
+        puts "[#{note}] -> beats : #{beats}, octave : #{octave} bpm: #{bpm} envelope: #{envelope} harmonic : #{harmonic}"
         duration = ((60 * WavHeader::SAMPLE_RATE * beats)/@bpm)/WavHeader::SAMPLE_RATE.to_f
         note_frequency = note + octave.to_s
         unless note == '_'
@@ -100,7 +104,9 @@ module Muse
           freq = 0
         end      
         (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
+          env = Envelope.send(envelope.to_sym,i, duration)
+          har = Harmonic.send(harmonic.to_sym, freq * i)
+          x = (env * volume * har).to_i
           stream << [x,x]
         end  
         return stream           
@@ -137,6 +143,9 @@ module Muse
         unless @bars[id]
           @bars[id] = []
         end
+        options[:bpm] = @bpm || options[:bpm] || 120
+        options[:envelope] = @envelope || options[:envelope] || 'default'
+        options[:harmonic] = @harmonic || options[:harmonic] || 'default'
         @bars[id] << Bar.new(id, options)
         @bars[id].last
       end
@@ -153,7 +162,7 @@ module Muse
       def save
         puts "Creating temporary files in parallel ..."
 
-        results = Parallel.each_with_index(@bars.values, :in_processes => 4) do |item, id|
+        results = Parallel.each_with_index(@bars.values, :in_processes => Parallel.processor_count) do |item, id|
           puts "Writing file - #{id}"
           stream = []
           container = []
@@ -167,7 +176,7 @@ module Muse
             temp.stream[i].left = s[0]
             temp.stream[i].right = s[1]
           end          
-          File.open("#{@name}-#{id}.tmp", "w") {|file| temp.write(file) }
+          File.open("#{@name}-#{id.to_s.rjust(3,'0')}.tmp", "w") {|file| temp.write(file) }
           puts "Completed file - #{id}"
         end
 
@@ -177,7 +186,7 @@ module Muse
 
         puts "Combining temporary files ..."
         WavHeader.new("#{@name}.wav", stream_size)
-        tmpfiles = Dir.glob("#{@name}-*.tmp")
+        tmpfiles = Dir.glob("#{@name}-*.tmp").sort
         File.open("#{@name}.wav", "ab+") do |wav|
           tmpfiles.each do |file|
             File.open(file, "rb") { |tmp| File.copy_stream(tmp, wav) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: muse
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-15 00:00:00.000000000Z
+date: 2012-03-18 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
-  requirement: &2156346880 !ruby/object:Gem::Requirement
+  requirement: &2160980980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156346880
+  version_requirements: *2160980980
 - !ruby/object:Gem::Dependency
   name: parallel
-  requirement: &2156345400 !ruby/object:Gem::Requirement
+  requirement: &2160980520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,7 +33,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156345400
+  version_requirements: *2160980520
 description: Muse is a complete music creation package including writing and up to
   creating WAV files
 email:
@@ -43,8 +43,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/muse/config/adsr.rb
 - lib/muse/config/chords.rb
+- lib/muse/config/envelope.rb
+- lib/muse/config/harmonic.rb
 - lib/muse/config.rb
 - lib/muse/version.rb
 - lib/muse/wav.rb