midiator 0.2.0 → 0.3.0

data/examples/chromatic_scale.rb

@@ -19,6 +19,7 @@ require 'midiator'
 
 midi = MIDIator::Interface.new
 midi.autodetect_driver
+midi.instruct_user!
 
 include MIDIator::Notes
 

data/examples/metronome.rb

@@ -50,6 +50,7 @@ include MIDIator::Notes
 
 @midi = MIDIator::Interface.new
 @midi.autodetect_driver
+@midi.instruct_user!
 @midi.program_change 0, 115 # Wood block!
 
 # trap interrupts to properly kill the timer

data/examples/twinkle.rb

@@ -0,0 +1,34 @@
+#!/usr/bin/env ruby
+#
+# A simple example that plays Twinkle Twinkle Little Star.  Also
+# shows how to use the MIDIator::Notes mixin.
+#
+# == Authors
+#
+# * Ben Bleything <ben@bleything.net>
+#
+# == Copyright
+#
+# Copyright (c) 2008 Ben Bleything
+#
+# This code released under the terms of the MIT license.
+#
+
+require 'rubygems'
+require 'midiator'
+
+midi = MIDIator::Interface.new
+midi.autodetect_driver
+
+include MIDIator::Notes
+
+scale = [ C4, Cs4, D4, Eb4, E4, F4, Fs4, G4, Gs4, A4, Bb4, B4,
+          C5, Cs5, D5, Eb5, E5, F5, Fs5, G5, Gs5, A5, Bb5, B5 ]
+
+scale.each do |note|
+	midi.play note
+end
+
+scale.reverse.each do |note|
+	midi.play note
+end

data/lib/midiator.rb

@@ -14,7 +14,7 @@
 #
 
 module MIDIator
-	VERSION = "0.2.0"
+	VERSION = "0.3.0"
 end
 
 #####################################################################

data/lib/midiator/driver.rb

@@ -6,6 +6,10 @@
 #
 # * Ben Bleything <ben@bleything.net>
 #
+# == Contributors
+#
+# * Jeremy Voorhis <jvoorhis@gmail.com>
+#
 # == Copyright
 #
 # Copyright (c) 2008 Ben Bleything
@@ -28,9 +32,21 @@ class MIDIator::Driver
 	# Note off
 	OFF = 0x80
 
+	# Polyphonic aftertouch
+	PA  = 0xa0
+
+	# Control change
+	CC  = 0xb0
+
 	# Program change
 	PC  = 0xc0
 
+	# Channel aftertouch
+	CA  = 0xd0
+
+	# Pitch bend
+	PB  = 0xe0
+
 	##########################################################################
 	### M A G I C   H O O K S
 	##########################################################################
@@ -62,16 +78,42 @@ class MIDIator::Driver
 
 
 	### Shortcut to send a note_off message.
-	def note_off( note, channel, velocity )
+	def note_off( note, channel, velocity = 0 )
 		message( OFF | channel, note, velocity )
 	end
 
 
+	### Shortcut to send a polyphonic aftertouch message for an individual note.
+	def aftertouch( note, channel, pressure )
+		message( PA | channel, note, pressure )
+	end
+
+
+	### Shortcut to send a control change.
+	def control_change( number, channel, value )
+		message( CC | channel, number, value )
+	end
+
+
 	### Shortcut to send a program_change message.
 	def program_change( channel, program )
 		message( PC | channel, program )
 	end
 
+
+	### Shortcut to send a channel aftertouch message.
+	def channel_aftertouch( channel, pressure )
+		message( CA | channel, pressure )
+	end
+
+
+	### Shortcut to send a pitch bend message.
+	def pitch_bend( channel, value )
+		message( PB | channel, value )
+	end
+	alias bend pitch_bend
+
+
 	##########################################################################
 	### D R I V E R   A P I
 	##########################################################################
@@ -97,4 +139,10 @@ class MIDIator::Driver
 		raise NotImplementedError, "You must implement #message in your driver."
 	end
 
+
+	### The only non-required method.  Override this to give the user instructions
+	### if necessary.
+	def instruct_user!
+	end
+
 end

data/lib/midiator/drivers/alsa.rb

@@ -24,6 +24,17 @@ require 'midiator/driver'
 require 'midiator/driver_registry'
 
 class MIDIator::Driver::ALSA < MIDIator::Driver # :nodoc:
+	# tell the user they need to connect to their output
+	def instruct_user!
+		$stderr.puts "[MIDIator] Please connect the MIDIator output port to your input"
+		$stderr.puts "[MIDIator] of choice.  You can use qjackctl or aconnect to do so."
+		$stderr.puts "[MIDIator]"
+		$stderr.puts "[MIDIator] Press enter when you're done."
+
+		gets # wait for the enter
+	end
+
+
 	module C # :nodoc:
 		extend DL::Importable
 		dlload 'libasound.so'

data/lib/midiator/drivers/core_midi.rb

@@ -51,7 +51,7 @@ class MIDIator::Driver::CoreMIDI < MIDIator::Driver # :nodoc:
 	##########################################################################
 
 	def open
-		client_name = CF.cFStringCreateWithCString( nil, "RubyMIDI", 0 )
+		client_name = CF.cFStringCreateWithCString( nil, "MIDIator", 0 )
 		@client = DL::PtrData.new( nil )
 		C.mIDIClientCreate( client_name, nil, nil, @client.ref )
 

data/lib/midiator/drivers/dls_synth.rb

@@ -0,0 +1,119 @@
+# A MIDI driver to play MIDI using OSX's built in DLS synthesizer.
+#
+# == Authors
+#
+# * Adam Murray <adam@compusition.com>
+#
+# == Copyright
+#
+# Copyright (c) 2008 Adam Murray
+#
+# This code released under the terms of the MIT license.
+#
+
+require 'dl/import'
+require 'dl/struct'
+
+class String
+	def to_bytes
+		bytes = 0
+		self.each_byte do |byte|
+			bytes <<= 8
+			bytes += byte
+		end
+		return bytes
+	end
+end
+
+class MIDIator::Driver::DLSSynth < MIDIator::Driver # :nodoc:
+
+	attr_accessor :synth
+
+	module AudioToolbox
+		extend DL::Importable 
+		dlload '/System/Library/Frameworks/AudioToolbox.framework/Versions/Current/AudioToolbox'   
+
+		ComponentDescription = struct [ 
+			"int componentType", 
+			"int componentSubType", 
+			"int componentManufacturer", 
+			"int componentFlags", 
+			"int componentFlagsMask"
+		]
+
+		# to_bytes may not be strictly necessary but these are supposed to be 4 byte numbers
+		AudioUnitManufacturer_Apple    = 'appl'.to_bytes
+		AudioUnitType_MusicDevice      = 'aumu'.to_bytes
+		AudioUnitSubType_DLSSynth      = 'dls '.to_bytes
+		AudioUnitType_Output           = 'auou'.to_bytes
+		AudioUnitSubType_DefaultOutput = 'def '.to_bytes
+
+		extern 'int NewAUGraph(void *)'
+		extern 'int AUGraphAddNode(void *, ComponentDescription *, void *)'
+		extern 'int AUGraphOpen(void *)'
+		extern 'int AUGraphConnectNodeInput(void *, void *, int, void *, int)'
+		extern 'int AUGraphNodeInfo(void *, void *, ComponentDescription *, void *)'
+		extern 'int AUGraphInitialize(void *)'
+		extern 'int AUGraphStart(void *)'      
+		extern 'int AUGraphStop(void *)'
+		extern 'int DisposeAUGraph(void *)'
+
+		extern 'void * CAShow(void *)'
+
+		extern 'void * MusicDeviceMIDIEvent(void *, int, int, int, int)'      
+	end      
+
+	protected
+
+	def require_noerr(action_description, &block)
+		if block.call != 0
+			fail "Failed to #{action_description}"
+		end
+	end
+
+	def open
+		@synth = DL::PtrData.new(nil) 
+		@graph = DL::PtrData.new(nil)
+		synthNode = DL::PtrData.new(nil)
+		outNode = DL::PtrData.new(nil)
+
+		cd = AudioToolbox::ComponentDescription.malloc()
+		cd.componentManufacturer = AudioToolbox::AudioUnitManufacturer_Apple
+		cd.componentFlags = 0
+		cd.componentFlagsMask = 0
+
+		require_noerr('create AUGraph') { AudioToolbox.newAUGraph(@graph.ref) }
+
+		cd.componentType = AudioToolbox::AudioUnitType_MusicDevice
+		cd.componentSubType = AudioToolbox::AudioUnitSubType_DLSSynth
+		require_noerr('add synthNode') { AudioToolbox.aUGraphAddNode(@graph, cd, synthNode.ref) }
+
+		cd.componentType = AudioToolbox::AudioUnitType_Output
+		cd.componentSubType = AudioToolbox::AudioUnitSubType_DefaultOutput
+		require_noerr('add outNode') { AudioToolbox.aUGraphAddNode(@graph, cd, outNode.ref) }
+
+		require_noerr('open graph') { AudioToolbox.aUGraphOpen(@graph) }
+
+		require_noerr('connect synth to out') { AudioToolbox.aUGraphConnectNodeInput(@graph, synthNode, 0, outNode, 0) }
+
+		require_noerr('graph info') { AudioToolbox.aUGraphNodeInfo(@graph, synthNode, nil, @synth.ref) }
+		require_noerr('init graph') { AudioToolbox.aUGraphInitialize(@graph) }
+		require_noerr('start graph') { AudioToolbox.aUGraphStart(@graph) }
+
+		AudioToolbox.cAShow(@graph) if $DEBUG
+	end
+
+	def message(*args)
+		arg0 = args[0] || 0
+		arg1 = args[1] || 0
+		arg2 = args[2] || 0
+		AudioToolbox.musicDeviceMIDIEvent(@synth, arg0, arg1, arg2, 0)
+	end
+
+	def close
+		if @graph
+			AudioToolbox.aUGraphStop(@graph)
+			AudioToolbox.disposeAUGraph(@graph)
+		end
+	end
+end

data/lib/midiator/interface.rb

@@ -10,6 +10,7 @@
 # == Contributors
 #
 # * Giles Bowkett
+# * Jeremy Voorhis
 #
 # == Copyright
 #
@@ -65,6 +66,9 @@ class MIDIator::Interface
 		# special case for the WinMM driver
 		driver_class.sub!( /Winmm/, 'WinMM' )
 
+		# special case for the DLSSynth driver
+		driver_class.sub!( /Dls/, 'DLS' )
+
 		# this little trick stolen from ActiveSupport.  It looks for a top-
 		# level module with the given name.
 		@driver = Object.module_eval( "::#{driver_class}" ).new

data/spec/interface_spec.rb

@@ -126,5 +126,15 @@ describe MIDIator::Interface do
 
 			@interface.use( :winmm )
 		end
+		
+		it "correctly spells DLSSynth when the DLSSynth driver is requested" do
+			@interface.stub!( :require )
+			
+			Object.should_receive( :module_eval ).with(
+				"::MIDIator::Driver::DLSSynth" 
+			).and_return( Class.new )
+			
+			@interface.use( :dls_synth )
+		end
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: midiator
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Ben Bleything
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-29 00:00:00 -07:00
+date: 2008-11-23 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -39,6 +39,7 @@ files:
 - lib/midiator/driver_registry.rb
 - lib/midiator/drivers/alsa.rb
 - lib/midiator/drivers/core_midi.rb
+- lib/midiator/drivers/dls_synth.rb
 - lib/midiator/drivers/winmm.rb
 - lib/midiator/drums.rb
 - lib/midiator/exceptions.rb
@@ -49,6 +50,7 @@ files:
 - lib/string_extensions.rb
 - examples/chromatic_scale.rb
 - examples/metronome.rb
+- examples/twinkle.rb
 - misc/rake/packaging.rb
 - misc/rake/rdoc.rb
 - misc/rake/testing.rb
@@ -74,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: midiator
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: MIDIator - A a nice Ruby interface to your system's MIDI services.