niki 0.1.0 → 0.1.1

data/examples/my_song.rb

@@ -3,43 +3,51 @@ require 'niki'
 
 song = Niki::Song.new :tempo => 127 do
 
-  # Configure midi channels
-  channel :basses, 1
-  channel :drums, 10
-  channel :chords, 2
-  channel :melodies, 3
-
-  configure :drums do |drums|
-    drums[:kick]  = c1
-    drums[:snare] = c1.sharp
-    drums[:hh]    = g1
-    drums[:ohh]   = g1.sharp
+  instrument :bass do
+    channel 1
+  end
+
+  instrument :chords do
+    channel 2
+  end
+
+  instrument :melody do
+    channel 3
+  end
+
+  instrument :drums do
+    channel 10
+
+    note[:kick]  = c1
+    note[:snare] = c1.sharp
+    note[:hh]    = g1
+    note[:ohh]   = g1.sharp
   end
 
   part :intro do
     # Drums
     2.times do
-      drum [:kick, :hh], 8
-      drum :hh, 8
-      drum [:snare, :hh], 8
-      drum :hh, 8
-
-      drum [:kick, :hh], 8
-      drum :hh, 8
-      drum [:snare, :hh], 8
-      drum [:kick, :hh], 8
-
-      drum :hh, 16
-      drum :hh, 16
-      drum :hh, 16
-      drum :hh, 16
-      drum [:snare, :hh], 8
-      drum :hh, 8
-
-      drum [:kick, :hh], 8
-      drum [:kick, :hh], 8
-      drum [:snare, :hh], 8
-      drum :ohh, 8
+      drums [:kick, :hh], 8
+      drums :hh, 8
+      drums [:snare, :hh], 8
+      drums :hh, 8
+
+      drums [:kick, :hh], 8
+      drums :hh, 8
+      drums [:snare, :hh], 8
+      drums [:kick, :hh], 8
+
+      drums :hh, 16
+      drums :hh, 16
+      drums :hh, 16
+      drums :hh, 16
+      drums [:snare, :hh], 8
+      drums :hh, 8
+
+      drums [:kick, :hh], 8
+      drums [:kick, :hh], 8
+      drums [:snare, :hh], 8
+      drums :ohh, 8
     end
 
     # Bass
@@ -76,48 +84,48 @@ song = Niki::Song.new :tempo => 127 do
 
   part :intro_ending do
     # Drums
-    drum [:kick, :hh], 8
-    drum :hh, 8
-    drum [:snare, :hh], 8
-    drum :hh, 8
-
-    drum [:kick, :hh], 8
-    drum :hh, 8
-    drum [:snare, :hh], 8
-    drum [:kick, :hh], 8
-
-    drum :hh, 16
-    drum :hh, 16
-    drum :hh, 16
-    drum :hh, 16
-    drum [:snare, :hh], 8
-    drum :hh, 8
-
-    drum [:kick, :hh], 8
-    drum [:kick, :hh], 8
-    drum [:snare, :hh], 8
-    drum :ohh, 8
-
-    # Drum break
-    drum [:kick, :hh], 8
-    drum :hh, 8
-    drum [:kick, :hh], 8
-    drum :hh, 8
-    drum [:kick, :hh], 8
-    drum :hh, 8
-    drum [:kick, :hh], 8
-    drum :hh, 8
-
-    drum [:snare, :ooh], 4
-    drum [:snare, :ooh], 4
-    drum :snare, 16
-    drum :snare, 16
-    drum :kick, 16
-    drum :kick, 16
-    drum :snare, 16
-    drum :snare, 16
-    drum [:snare, :ooh], 16
-    drum :snare, 16
+    drums [:kick, :hh], 8
+    drums :hh, 8
+    drums [:snare, :hh], 8
+    drums :hh, 8
+
+    drums [:kick, :hh], 8
+    drums :hh, 8
+    drums [:snare, :hh], 8
+    drums [:kick, :hh], 8
+
+    drums :hh, 16
+    drums :hh, 16
+    drums :hh, 16
+    drums :hh, 16
+    drums [:snare, :hh], 8
+    drums :hh, 8
+
+    drums [:kick, :hh], 8
+    drums [:kick, :hh], 8
+    drums [:snare, :hh], 8
+    drums :ohh, 8
+
+    # drums break
+    drums [:kick, :hh], 8
+    drums :hh, 8
+    drums [:kick, :hh], 8
+    drums :hh, 8
+    drums [:kick, :hh], 8
+    drums :hh, 8
+    drums [:kick, :hh], 8
+    drums :hh, 8
+
+    drums [:snare, :ooh], 4
+    drums [:snare, :ooh], 4
+    drums :snare, 16
+    drums :snare, 16
+    drums :kick, 16
+    drums :kick, 16
+    drums :snare, 16
+    drums :snare, 16
+    drums [:snare, :ooh], 16
+    drums :snare, 16
 
     # Bass
     bass f2, 4
@@ -152,7 +160,7 @@ song = Niki::Song.new :tempo => 127 do
 
   part :pre_chorus do
     bass :from => :intro
-    drum :from => :intro
+    drums :from => :intro
 
     melody a2, 4
     melody a2, 4
@@ -220,47 +228,47 @@ song = Niki::Song.new :tempo => 127 do
 
     # Drums
     7.times do
-      drum [:kick, :hh], 8
-      drum :hh, 8
-      drum [:snare, :kick, :hh], 8
-      drum :hh, 8
+      drums [:kick, :hh], 8
+      drums :hh, 8
+      drums [:snare, :kick, :hh], 8
+      drums :hh, 8
     end
-    drum :kick, 8
-    drum :hh, 16
-    drum :hh, 16
-    drum [:snare, :kick], 16
-    drum :snare, 16
-    drum [:kick, :ohh], 8
+    drums :kick, 8
+    drums :hh, 16
+    drums :hh, 16
+    drums [:snare, :kick], 16
+    drums :snare, 16
+    drums [:kick, :ohh], 8
 
     # Chords
-    chord a3MIN(2), 2, :base => f3
-    chord a3MIN(2), 8, :base => f3
-    chord a3MIN(2), 8, :base => f3
-    chord a3MIN(2), 8, :base => f3
-    chord c3MAJ, 4
-    chord c3MAJ, 4
-    chord c3MAJ, 8
-    chord g3MAJ, 2
-    chord [a3, b3, e4]
-    chord c3MAJ, 4
-    chord c3MAJ, 4
-    chord g3MAJ, 8
-    chord g3MAJ, 8
-    chord g3MAJ, 8, :base => f4
-    chord g3MAJ, 8, :base => e4
+    chords a3MIN(2), 2, :base => f3
+    chords a3MIN(2), 8, :base => f3
+    chords a3MIN(2), 8, :base => f3
+    chords a3MIN(2), 8, :base => f3
+    chords c3MAJ, 4
+    chords c3MAJ, 4
+    chords c3MAJ, 8
+    chords g3MAJ, 2
+    chords [a3, b3, e4]
+    chords c3MAJ, 4
+    chords c3MAJ, 4
+    chords g3MAJ, 8
+    chords g3MAJ, 8
+    chords g3MAJ, 8, :base => f4
+    chords g3MAJ, 8, :base => e4
   end
 
   repeat :chorus
 
   part :outro do
-    drum :from => :intro
+    drums :from => :intro
     bass :from => :intro
-    chord :from => :chorus
+    chords :from => :chorus
   end
 
   part :outro_ending do
     bass :from => :intro
-    chord :from => :chorus
+    chords :from => :chorus
   end
 end
 

data/lib/niki.rb

@@ -3,6 +3,7 @@ require 'core_ext/array'
 require 'niki/chords'
 require 'niki/part'
 require 'niki/song'
+require 'niki/instrument'
 
 module Niki
 end

data/lib/niki/instrument.rb

@@ -0,0 +1,57 @@
+module Niki
+  class Instrument
+    attr_reader :name, :channel_number
+
+    include Niki::Chords
+
+    def initialize(name, song, &block)
+      @name = name
+      @song = song
+      @channel_number = nil
+      @macros = {}
+
+      self.instance_exec(&block)
+
+      Part.send :include, self.to_module
+    end
+
+    def channel(number)
+      @channel_number = number - 1
+    end
+
+    def note
+      @macros
+    end
+
+    def to_module
+      instrument_name = @name
+      macros = @macros
+
+      Module.new do
+        define_method instrument_name do |*args|
+          note     = args.shift
+          duration = args.shift || 1
+          options  = args.shift || {}
+
+          if note.is_a?(Hash) && note[:from]
+            copy_from_part(note[:from], instrument_name)
+            return
+          end
+
+          note = [note].flatten.map do |n|
+            if note.is_a?(Fixnum)
+              note
+            else
+              # Try to fetch the note from the symbol
+              macros[note]
+            end
+          end
+
+          note.push options[:base]
+
+          register_note(instrument_name, note, duration)
+        end
+      end
+    end
+  end
+end

data/lib/niki/part.rb

@@ -1,69 +1,34 @@
 module Niki
   class Part
-    attr_reader :name, :chords, :drums, :basses, :melodies
+    attr_reader :name, :notes
 
     include Niki::Chords
 
     def initialize(name, song, &block)
       @name = name
       @song = song
-      @drum_notes = @song.drum_notes
-      @chords = []
-      @drums = []
-      @basses = []
-      @melodies = []
+      @notes = {}
       self.instance_eval(&block)
     end
 
-    def chord note, duration = 1, options = {}
-      if note.is_a?(Hash) && note[:from]
-        copy_from_part(note[:from], :chords)
-        return
-      end
-
-      note.push options[:base]
-      @chords << [note, calculate_duration(duration)]
-    end
-
-    def drum note, duration = 1, options = {}
-      if note.is_a?(Hash) && note[:from]
-        copy_from_part(note[:from], :drums)
-        return
-      end
-
-      drum_note = [note].flatten.map do |n|
-        @drum_notes[n]
-      end
-      @drums << [drum_note, calculate_duration(duration)]
+    def for_instrument(instrument_name)
+      @notes[instrument_name] || []
     end
 
-    def bass note = nil, duration = 1, options = {}
-      if note.is_a?(Hash) && note[:from]
-        copy_from_part(note[:from], :basses)
-        return
-      end
+    private
 
-      @basses << [[note], calculate_duration(duration)]
+    def copy_from_part(name, type)
+      part = @song.get_part(name)
+      @notes[type] = part.send(type)
     end
 
-    def melody note = nil, duration = 1, options = {}
-      if note.is_a?(Hash) && note[:from]
-        copy_from_part(note[:from], :melodies)
-        return
-      end
-
-      @melodies << [[note], calculate_duration(duration)]
+    def register_note(instrument_name, note, duration)
+      @notes[instrument_name] ||= []
+      @notes[instrument_name] << [note, calculate_duration(duration)]
     end
 
-    private
-
     def calculate_duration(duration)
       1.to_f / ((@song.tempo.to_f/120) * duration/2)
     end
-
-    def copy_from_part(name, type)
-      part = @song.get_part(name)
-      instance_variable_set(:"@#{type}", part.send(type))
-    end
   end
 end

data/lib/niki/song.rb

@@ -2,7 +2,7 @@ require 'unimidi'
 
 module Niki
   class Song
-    attr_reader :tempo, :drum_notes
+    attr_reader :tempo
 
     include Niki::Chords
 
@@ -12,26 +12,19 @@ module Niki
     def initialize(options, &block)
       @midi = UniMIDI::Output.first
       @parts = []
+      @instruments = []
       @channel = {}
-      @drum_notes = {}
       @tempo = options[:tempo]
       self.instance_eval &block
     end
 
-    def channel(instrument, number)
-      @channel[instrument] = number - 1
-    end
-
     def part(name, &block)
       raise "#{name} is already defined!" if has_part?(name)
       @parts << Part.new(name, self, &block)
     end
 
-    def configure(instrument, &block)
-      case instrument
-      when :drums
-        block.call @drum_notes
-      end
+    def instrument(name, &block)
+      @instruments << Instrument.new(name, self, &block)
     end
 
     def repeat(name, options = {})
@@ -42,29 +35,29 @@ module Niki
 
     def play
       @parts.each do |part|
-        [:basses, :chords, :melodies, :drums].map do |instrument_name|
+        @instruments.map do |instrument|
           Thread.start do
-            play_part(part, instrument_name)
+            play_part(part, instrument)
           end
         end.map { |thread| thread.join }
 
-        [:basses, :chords, :melodies, :drums].each do |instrument_name|
-          reset(instrument_name)
+        @instruments.each do |instrument|
+          reset(instrument)
         end
       end
     end
 
-    def play_part(part, instrument_name)
-      return if part.send(instrument_name).length.zero?
-      channel = @channel[instrument_name]
+    def play_part(part, instrument)
+      return if part.for_instrument(instrument.name).length.zero?
+      channel = instrument.channel_number
 
       @midi.open do |out|
-        part.send(instrument_name).each do |instrument|
-          notes = [instrument.first].flatten.compact
+        part.for_instrument(instrument.name).each do |notes, duration|
+          notes = [notes].flatten.compact
           notes.each do |note|
             out.puts NOTE_ON + channel, note, 100
           end
-          sleep(instrument.last)
+          sleep(duration)
           notes.each do |note|
             out.puts NOTE_OFF + channel, note, 100
           end
@@ -82,12 +75,11 @@ module Niki
       !!@parts.map(&:name).detect {|part_name| part_name == name }
     end
 
-    def reset(instrument_name)
-      channel = @channel[instrument_name]
+    def reset(instrument)
       @midi.open do |out|
         # Reset all notes
         95.times do |i|
-          out.puts NOTE_OFF + channel, i, 100
+          out.puts NOTE_OFF + instrument.channel_number, i, 100
         end
       end
     end

data/lib/niki/version.rb

@@ -1,3 +1,3 @@
 module Niki
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,35 +1,39 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: niki
-version: !ruby/object:Gem::Version
-  version: 0.1.0
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.1.1
 platform: ruby
-authors:
+authors: 
 - Josep M. Bach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-16 00:00:00.000000000 +02:00
+
+date: 2011-08-16 00:00:00 +02:00
 default_executable: 
-dependencies:
-- !ruby/object:Gem::Dependency
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: unimidi
-  requirement: &2154214760 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *2154214760
+  version_requirements: *id001
 description: A DSL to describe and play structured musical pieces, i.e. songs
-email:
+email: 
 - josep.m.bach@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
 - Gemfile.lock
@@ -41,6 +45,7 @@ files:
 - lib/core_ext/fixnum.rb
 - lib/niki.rb
 - lib/niki/chords.rb
+- lib/niki/instrument.rb
 - lib/niki/part.rb
 - lib/niki/song.rb
 - lib/niki/version.rb
@@ -48,32 +53,30 @@ files:
 has_rdoc: true
 homepage: http://github.com/txus/niki
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -752574128219649690
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -752574128219649690
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: niki
-rubygems_version: 1.6.2
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: A DSL to describe and play structured musical pieces, i.e. songs
 test_files: []
+