banjo 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1602d6a96258f60f5abd2b1266f9f7ab042a06a2
-  data.tar.gz: 02de585c8ea9fad0d8dc02e060d8aeb0b7daa247
+  metadata.gz: c3c8b4a3d76f825ce4ed6e3530a046f1f14c2842
+  data.tar.gz: b3934b768ff3391be3b4dae71d84e4868aaf8a6a
 SHA512:
-  metadata.gz: 865bca105bcdcc6061cdcc7af867cbd60173814f8668cc32f53776cd01103a1d47003c695423210f829dd811c771cd236a178f485a3c7f1352fa7d9b3b9e595a
-  data.tar.gz: 18c29122e833874acd3227d876825357a370e211e582577183ffba57202c6871a5f920504d2c5f6b3a9dfe9862a912a0782079b4cb0a30e329ed55b873370a27
+  metadata.gz: 2125321edbdf759281a505206e50838bcb95568e2c027c1855c7490df31296f5e3bd4a4bb221961e9b0c13adae62d23f82c819a1de48d8692df9cfda117f649f
+  data.tar.gz: dbf2a5bc685b1f46f44e8e139de50d72a6725c65762f0d9519594b6e59d65158583392caffbb938c9ca7a4f14f26accf9d60bdac69166b3c398438aade0be11d

data/lib/banjo.rb

@@ -9,7 +9,10 @@ $: << '.'
 
 module Banjo
   class << self
+    attr_accessor :beats_per_measure
+    attr_accessor :measures_per_loop
     attr_accessor :tempo
+    attr_accessor :ticks_per_beat
     attr_accessor :ticks_per_period
   end
 
@@ -20,7 +23,10 @@ module Banjo
   end
 
   def self.play
-    tempo_in_ms = 60.0 / Banjo.tempo / ticks_per_period
+    Banjo.measures_per_loop ||= 1
+    Banjo.ticks_per_period = Banjo.ticks_per_beat * Banjo.beats_per_measure * Banjo.measures_per_loop
+    tempo_in_ms = 60.0 / Banjo.tempo / Banjo.ticks_per_beat
+    puts "Beat every: #{tempo_in_ms}"
 
     EventMachine.run do
       n = 0

data/lib/banjo/channel.rb

@@ -1,6 +1,7 @@
 module Banjo
   class Channel
     attr_accessor :output, :tick
+    DEFAULT_DURATION = 0.5
 
     def channel
       0
@@ -19,16 +20,30 @@ module Banjo
       @tick   = tick
     end
 
-    def tick_note(tick, note, velocity = 50, duration = 0.5)
+    def tick_note(tick, note, velocity = 50, duration = DEFAULT_DURATION)
       play_note(note, velocity, duration) if tick == self.tick
     end
 
+    def tick_notes(notes, velocity = 50, duration = DEFAULT_DURATION)
+      notes.each do |tick, note|
+        tick_note(tick, note, velocity, duration)
+      end
+    end
+
     def mod_note(mod, note, offset = 0, velocity = 50)
-      play_note(note, velocity, 0.5) if ((tick + offset) % mod == 0)
+      play_note(note, velocity, DEFAULT_DURATION) if ((tick + offset) % mod == 0)
+    end
+
+    def play_note(note, velocity = 50, duration = DEFAULT_DURATION)
+      EM.defer { play_note!(note, velocity, duration) }
     end
 
-    def play_note(note, velocity = 50, duration = 0.5)
-      Thread.new { play_note!(note, velocity, duration) }
+    def modulation(value = 0)
+      output.puts 0xB0, 0x01, value
+    end
+
+    def pitch(value = 63)
+      output.puts 0xE0, 0, value
     end
 
     def arpeggio(notes, velocity = 50)
@@ -38,12 +53,14 @@ module Banjo
       end
     end
 
-    def play_note!(note, velocity = 50, duration = 0.5)
-      output.open do |o|
-        o.puts(0x80, note, velocity)
-        sleep(duration)
-        o.puts(0x90, note, velocity)
-      end
+    def stfu
+      output.puts 0xB0, 0x7B, 0
+    end
+
+    def play_note!(note, velocity = 50, duration = DEFAULT_DURATION)
+      output.puts(0x80, note, velocity)
+      sleep(duration)
+      output.puts(0x90, note, velocity)
     end
   end
 end

data/lib/banjo/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: banjo
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - David Padilla