banjo 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3c8b4a3d76f825ce4ed6e3530a046f1f14c2842
-  data.tar.gz: b3934b768ff3391be3b4dae71d84e4868aaf8a6a
+  metadata.gz: 25a2db070a4d537dd0f0507fa271e5b1392861d3
+  data.tar.gz: 2f9d961e602991034a2a90445b9c6b369390cfa1
 SHA512:
-  metadata.gz: 2125321edbdf759281a505206e50838bcb95568e2c027c1855c7490df31296f5e3bd4a4bb221961e9b0c13adae62d23f82c819a1de48d8692df9cfda117f649f
-  data.tar.gz: dbf2a5bc685b1f46f44e8e139de50d72a6725c65762f0d9519594b6e59d65158583392caffbb938c9ca7a4f14f26accf9d60bdac69166b3c398438aade0be11d
+  metadata.gz: 7b98de3fd1fb5692a6ca401bfe86ec02dc35e2fb0596fc54853d77b6ca774881aac35304c8c50c8ad39e475c15038f953b92cb8817be048d954b29066b595619
+  data.tar.gz: b657cff30587dbac401d57dbb6656b2060150c634f95660b9ba67b1fe49e1e9763e871072aba129149672f9376e9dee58fc1c82494e838fa0130e349aafa6874

data/banjo.gemspec

@@ -18,8 +18,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "unimidi", "~> 0.3.3"
+  spec.add_dependency "unimidi", "0.3.3"
   spec.add_dependency "eventmachine", "~> 1.0.3"
+  spec.add_dependency "rubysl-yaml", "2.0.0"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/lib/banjo.rb

@@ -14,9 +14,15 @@ module Banjo
     attr_accessor :tempo
     attr_accessor :ticks_per_beat
     attr_accessor :ticks_per_period
+    attr_accessor :loop_count
   end
 
   def self.load_channels
+    load_channels!
+  rescue Exception
+  end
+
+  def self.load_channels!
     Dir['./channels/*.rb'].each do |file|
       load file
     end
@@ -29,21 +35,31 @@ module Banjo
     puts "Beat every: #{tempo_in_ms}"
 
     EventMachine.run do
-      n = 0
+      tick = 0
+      self.loop_count = 0
+
       EM.add_periodic_timer(tempo_in_ms) do
-        begin
-          Banjo.load_channels
-        end
+        Banjo.load_channels if tick == 0
 
         Banjo::Channel.channels.each do |klass|
-          channel = klass.new(n)
+          channel = klass.new(tick)
           channel.perform
         end
 
-        n < (ticks_per_period - 1) ? n += 1 : n = 0
+        tick = update_counters(tick)
       end
 
       puts "Banjo Reactor started..."
     end
   end
+
+  def self.update_counters(tick)
+    if tick < (ticks_per_period - 1)
+      tick += 1
+    else
+      puts self.loop_count += 1
+      tick = 0
+    end
+    tick
+  end
 end

data/lib/banjo/channel.rb

@@ -7,6 +7,10 @@ module Banjo
       0
     end
 
+    def midi_channels
+      [0x90, 0x80]
+    end
+
     def self.channels
       @channels ||= []
     end
@@ -30,8 +34,8 @@ module Banjo
       end
     end
 
-    def mod_note(mod, note, offset = 0, velocity = 50)
-      play_note(note, velocity, DEFAULT_DURATION) if ((tick + offset) % mod == 0)
+    def mod_note(mod, note, offset = 0, velocity = 50, duration = DEFAULT_DURATION)
+      play_note(note, velocity, duration) if ((tick + offset) % mod == 0)
     end
 
     def play_note(note, velocity = 50, duration = DEFAULT_DURATION)
@@ -46,6 +50,10 @@ module Banjo
       output.puts 0xE0, 0, value
     end
 
+    def sustain(value = 0)
+      output.puts 0xB0, 0x40, value
+    end
+
     def arpeggio(notes, velocity = 50)
       step = (1.0 * Banjo.ticks_per_period / notes.size).round
       notes.each_with_index do |note, index|
@@ -58,9 +66,9 @@ module Banjo
     end
 
     def play_note!(note, velocity = 50, duration = DEFAULT_DURATION)
-      output.puts(0x80, note, velocity)
+      output.puts(midi_channels[0], note, velocity)
       sleep(duration)
-      output.puts(0x90, note, velocity)
+      output.puts(midi_channels[1], note, velocity)
     end
   end
 end

data/lib/banjo/version.rb

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

metadata

@@ -1,83 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: banjo
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - David Padilla
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-18 00:00:00.000000000 Z
+date: 2014-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unimidi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.3.3
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.3
+- !ruby/object:Gem::Dependency
+  name: rubysl-yaml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: MIDI looper designed for live performances
@@ -87,8 +101,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -111,17 +125,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: MIDI looper designed for live performances