muse 0.0.9 → 0.0.10

data/lib/muse.old.rb

@@ -0,0 +1,222 @@
+# 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 "#{File.dirname(__FILE__)}/muse/wav"
+require "#{File.dirname(__FILE__)}/muse/config"
+
+module Muse
+  
+  NOTES = %w(_ a ais b c cis d dis e f fis g gis)
+  FREQUENCIES = {
+    :ais1 => -34, :b1   => -33, :cis2 => -32,  :d2   => -31, :dis2 => -30,
+    :e2   => -29, :f2   => -28, :fis2 => -27,  :g2   => -26, :gis2 => -25,
+    :a2   => -24, :ais2 => -23, :b2   => -22,  :c3   => -21, :cis3 => -20, 
+    :d3   => -19, :dis3 => -18, :e3   => -17,  :f3   => -16, :fis3 => -15, 
+    :g3   => -14, :gis3 => -13, :a3   => -12,  :ais3 => -11, :b3   => -10, 
+    :c4   => -9,  :cis4 => -8,  :d4   => -7,   :dis4 => -6,  :e4   => -5,  
+    :f4   => -4,  :fis4 => -3,  :g4   => -2,   :gis4 => -1,  :a4   => 0,
+    :ais4 => 1,   :b4   => 2,   :c5   => 3,    :cis5 => 4,   :d5   => 5, 
+    :dis5 => 6,   :e5   => 7,   :f5   => 8,    :fis5 => 9,   :g5   => 10,   
+    :gis5 => 11,  :a5   => 12,  :ais5 => 13,   :b5   => 14,  :c6   => 15,
+    :cis6 => 16,  :d6   => 17,  :dis6 => 18,   :e6   => 19,  :f6   => 20,
+    :fis6 => 21,  :g6   => 22,  :gis6 => 23
+  }
+  
+  class Note
+    attr :octave, :beat, :bpm, :frequency, :harmonic, :envelope, :volume, :name
+    
+    def initialize(name, octave=4, bpm=120, options={})
+      if options
+        beat = options[:b].nil?  ? (@beat || 1) : options[:b].to_f
+        volume = (options[:v].nil? ? (@volume.to_i || 5) : options[:v].to_i) * 1000
+        envelope = options[:a].nil? ? @envelope : 'default'
+        harmonic = options[:h].nil? ? @harmonic : 'default'
+      else
+        beats, volume, envelope, harmonic = (@beats || 1), 5000, @envelope || 'default', @harmonic || 'default'
+      end      
+      @name, @octave, @bpm = name, octave, bpm
+      unless name == '_'
+        @frequency = frequency_of(FREQUENCIES["#{name}#{octave}".to_sym])
+      else
+        @frequency = 0
+      end      
+    end
+    
+  
+    # shifting notes by semitones
+    def >>()
+    end
+    
+    def to_stream
+      stream = []
+      duration = ((60 * WavHeader::SAMPLE_RATE * @beat)/@bpm)/WavHeader::SAMPLE_RATE.to_f     
+      (0.0..duration.to_f).step(1.0/WavHeader::SAMPLE_RATE) do |i|
+        env = Envelope.send(@envelope.to_sym,i, duration)
+        har = Harmonic.send(@harmonic.to_sym, @frequency * i)
+        x = (env * har * @volume).to_i
+        stream << [x,x]
+      end  
+      return stream           
+    end    
+    
+    def to_s
+      "[#{@name}] -> b: #{@beat}, o: #{@octave} bpm: #{@bpm} e: #{@envelope} h: #{@harmonic}"
+    end
+
+    def frequency_of(step)
+      440.0*(2**(step.to_f/12.0))
+    end
+    
+  end
+    
+  class Song
+
+    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
+      save
+      end_time = Time.now
+      puts "Total time taken : #{((end_time - start_time)/60.0).round(3)} minutes"  
+      puts "done."
+    end
+
+    class Bar
+      attr :bpm, :beats, :envelope, :harmonic
+      attr_accessor :stream
+
+      def initialize(id, options={})
+        @bpm = options[:bpm] || 120
+        @beats = (options[:b] || 1).to_f
+        @envelope = options[:e] || 'default'
+        @harmonic = options[:h] || 'default'
+        @volume = options[:v] || 5
+        @stream = []
+      end
+
+      def notes(&block)
+        instance_eval &block
+      end    
+
+      def chord(notes,options={})
+        puts "chord with #{notes}"
+        triad =[]
+        notes.each do |name|
+          if name.start_with? *NOTES
+            octave = name[name.length-1].to_i
+            note = octave > 0 ? name.chop : name
+            octave = 4 if octave == 0
+            n = Note.new(note, octave, @bpm, options)
+            triad << n.to_stream
+          end
+        end
+        triad.transpose.map {|x| x.transpose.map {|y| y.reduce(:+)}}   
+      end
+
+      def truncate_stream_by(num)
+        num.times {@stream.pop}
+      end
+
+      def add_to_stream(str)
+        @stream += str
+      end
+
+
+      def method_missing(name, *args, &block)
+        name = name.to_s
+        if name.start_with? *NOTES   
+          if name.split('_').length > 1
+            notes = name.split('_')
+            add_to_stream chord(notes, args[0])
+          else
+            octave = name[name.length-1].to_i
+            note = octave > 0 ? name.chop : name
+            octave = 4 if octave == 0
+            add_to_stream Note.new(note, octave, @bpm, options).to_stream
+          end
+        end
+      end
+    end
+
+    private
+    class << self
+      def bar(id, options={})
+        puts "bar #{id}"
+        unless @bars[id]
+          @bars[id] = []
+        end
+        options[:bpm] = options[:bpm] || @bpm || 120
+        options[:envelope] = options[:envelope] || @envelope || 'default'
+        options[:harmonic] = options[:harmonic] || @harmonic || 'default'
+        @bars[id] << Bar.new(id, options)
+        @bars[id].last
+      end
+      
+      def right_size(bars)
+        container = []
+        min_bar = bars.min_by {|x| x.stream.length}
+        bars.map do |bar|
+          bar.truncate_stream_by(bar.stream.length - min_bar.stream.length)
+          bar
+        end
+      end
+
+      def save
+        puts "Creating temporary files in parallel ..."
+
+        results = Parallel.each_with_index(@bars.values, :in_processes => Parallel.processor_count) 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(:+)}}
+          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.to_s.rjust(3,'0')}.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").sort
+        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
+        
+      end
+    end
+  end
+end

data/lib/muse.rb

@@ -19,6 +19,24 @@ require "#{File.dirname(__FILE__)}/muse/wav"
 require "#{File.dirname(__FILE__)}/muse/config"
 
 module Muse
+  
+      
+  NOTES = %w(_ a ais b c cis d dis e f fis g gis)
+  FREQUENCIES = {
+    :ais1 => -34, :b1   => -33, :cis2 => -32,  :d2   => -31, :dis2 => -30,
+    :e2   => -29, :f2   => -28, :fis2 => -27,  :g2   => -26, :gis2 => -25,
+    :a2   => -24, :ais2 => -23, :b2   => -22,  :c3   => -21, :cis3 => -20, 
+    :d3   => -19, :dis3 => -18, :e3   => -17,  :f3   => -16, :fis3 => -15, 
+    :g3   => -14, :gis3 => -13, :a3   => -12,  :ais3 => -11, :b3   => -10, 
+    :c4   => -9,  :cis4 => -8,  :d4   => -7,   :dis4 => -6,  :e4   => -5,  
+    :f4   => -4,  :fis4 => -3,  :g4   => -2,   :gis4 => -1,  :a4   => 0,
+    :ais4 => 1,   :b4   => 2,   :c5   => 3,    :cis5 => 4,   :d5   => 5, 
+    :dis5 => 6,   :e5   => 7,   :f5   => 8,    :fis5 => 9,   :g5   => 10,   
+    :gis5 => 11,  :a5   => 12,  :ais5 => 13,   :b5   => 14,  :c6   => 15,
+    :cis6 => 16,  :d6   => 17,  :dis6 => 18,   :e6   => 19,  :f6   => 20,
+    :fis6 => 21,  :g6   => 22,  :gis6 => 23
+  }
+    
   class Song
 
     def self.record(name, options ={}, &block)
@@ -40,28 +58,14 @@ module Muse
     class Bar
       attr :bpm, :beats, :envelope, :harmonic
       attr_accessor :stream
-      
-      NOTES = %w(_ a ais b c cis d dis e f fis g gis)
-      FREQUENCIES = {
-        :ais1 => -34, :b1   => -33, :cis2 => -32,  :d2   => -31, :dis2 => -30,
-        :e2   => -29, :f2   => -28, :fis2 => -27,  :g2   => -26, :gis2 => -25,
-        :a2   => -24, :ais2 => -23, :b2   => -22,  :c3   => -21, :cis3 => -20, 
-        :d3   => -19, :dis3 => -18, :e3   => -17,  :f3   => -16, :fis3 => -15, 
-        :g3   => -14, :gis3 => -13, :a3   => -12,  :ais3 => -11, :b3   => -10, 
-        :c4   => -9,  :cis4 => -8,  :d4   => -7,   :dis4 => -6,  :e4   => -5,  
-        :f4   => -4,  :fis4 => -3,  :g4   => -2,   :gis4 => -1,  :a4   => 0,
-        :ais4 => 1,   :b4   => 2,   :c5   => 3,    :cis5 => 4,   :d5   => 5, 
-        :dis5 => 6,   :e5   => 7,   :f5   => 8,    :fis5 => 9,   :g5   => 10,   
-        :gis5 => 11,  :a5   => 12,  :ais5 => 13,   :b5   => 14,  :c6   => 15,
-        :cis6 => 16,  :d6   => 17,  :dis6 => 18,   :e6   => 19,  :f6   => 20,
-        :fis6 => 21,  :g6   => 22,  :gis6 => 23
-      }
+
 
       def initialize(id, options={})
         @bpm = options[:bpm] || 120
         @beats = (options[:b] || 1).to_f
-        @envelope = options[:envelope] || 'default'
-        @harmonic = options[:harmonic] || 'default'
+        @envelope = options[:e] || 'default'
+        @harmonic = options[:h] || 'default'
+        @volume = options[:v] || 5
         @stream = []
       end
 
@@ -91,13 +95,13 @@ module Muse
         stream = []
         if options
           beats  = options[:b].nil?  ? (@beats || 1) : options[:b].to_f
-          volume = (options[:v].nil? ? 5 : options[:v].to_i) * 1000
+          volume = (options[:v].nil? ? (@volume.to_i || 5) : options[:v].to_i) * 1000
           envelope = options[:a].nil? ? @envelope : 'default'
           harmonic = options[:h].nil? ? @harmonic : 'default'
         else
           beats, volume, envelope, harmonic = (@beats || 1), 5000, @envelope || 'default', @harmonic || 'default'
         end
-        puts "[#{note}] -> beats : #{beats}, octave : #{octave} bpm: #{@bpm} envelope: #{envelope} harmonic : #{harmonic}"
+        puts "[#{note}] -> b:#{beats}, o:#{octave}, e:#{envelope}, h:#{harmonic}"
         duration = ((60 * WavHeader::SAMPLE_RATE * beats)/@bpm)/WavHeader::SAMPLE_RATE.to_f
         note_frequency = note + octave.to_s
         unless note == '_'
@@ -141,7 +145,7 @@ module Muse
     private
     class << self
       def bar(id, options={})
-        puts "bar #{id}"
+        puts "bar #{id} - bpm:#{@bpm}"
         unless @bars[id]
           @bars[id] = []
         end
@@ -162,10 +166,10 @@ module Muse
       end
 
       def save
-        puts "Creating temporary files in parallel ..."
+        puts "\nCreating temporary files in parallel ..."
 
         results = Parallel.each_with_index(@bars.values, :in_processes => Parallel.processor_count) do |item, id|
-          puts "Writing file - #{id}"
+          puts "Writing file #{id}"
           stream = []
           container = []
           item = right_size item
@@ -179,14 +183,14 @@ module Muse
             temp.stream[i].right = s[1]
           end          
           File.open("#{@name}-#{id.to_s.rjust(3,'0')}.tmp", "w") {|file| temp.write(file) }
-          puts "Completed file - #{id}"
+          puts "file #{id} done."
         end
 
         stream_size = results.inject(0) do |memo, bars|
           memo + bars.first.stream.size
         end
 
-        puts "Combining temporary files ..."
+        print "\nCombining temporary files ..."
         WavHeader.new("#{@name}.wav", stream_size)
         tmpfiles = Dir.glob("#{@name}-*.tmp").sort
         File.open("#{@name}.wav", "ab+") do |wav|
@@ -195,7 +199,7 @@ module Muse
             File.delete file
           end
         end
-        
+        puts " done."
       end
     end
   end

data/lib/muse/config/harmonic.rb

@@ -17,30 +17,32 @@
 module Muse
   module Harmonic
     class << self
+      
+      def base(input)
+        2 * Math::PI * input
+      end
+      
       def default(input)
-        Math.sin(2 * Math::PI * input)
+        Math.sin(base(input))
       end
 
       def second(input)
-        Math.sin(2 * Math::PI * input) + 
-        Math.sin(3* 2 * Math::PI * input)
+        Math.sin(base(input))
+        Math.sin(base(input) * 3)
       end
 
       def third(input)
-        Math.sin(2 * Math::PI * input) + 
-        Math.sin(3* 2 * Math::PI * input) + 
-        Math.sin(5 * 2 * Math::PI * input)
+        Math.sin(base(input)) + 
+        Math.sin(base(input) * 3) + 
+        Math.sin(base(input) * 5)
       end
 
-      def organ(input)
-        Math.sin(2 * 2 * Math::PI * input) + 
-        Math.sin(2 * Math::PI * input) + 
-        Math.sin(Math::PI * input)
-
+      def guitar(input)
+        Math.sin(base(input)) + 
+        Math.sin(base(input) * 2) + 
+        Math.sin(base(input) * 0.5)
       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.9"
+  VERSION = "0.0.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: muse
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-07 00:00:00.000000000Z
+date: 2012-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
-  requirement: &2153178280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153178280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: parallel
-  requirement: &2153177840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,7 +38,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153177840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Muse is a complete music creation package including writing and up to
   creating WAV files
 email:
@@ -49,6 +59,7 @@ files:
 - lib/muse/config.rb
 - lib/muse/version.rb
 - lib/muse/wav.rb
+- lib/muse.old.rb
 - lib/muse.rb
 homepage: https://github.com/sausheong/muse
 licenses: []
@@ -71,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.22
 signing_key: 
 specification_version: 3
 summary: Muse is a Ruby DSL for making music