midiator 0.3.0 → 0.3.1

data/lib/midiator/driver_registry.rb

@@ -17,37 +17,37 @@ require 'singleton'
 require 'midiator'
 
 class MIDIator::DriverRegistry
-	include Singleton
+  include Singleton
 
-	### Stores the given +klass+ in the <tt>@drivers</tt> hash, keyed by +name+.
-	### Typically called via MIDIator::Driver's +inherited+ hook.
-	def register_driver( name, klass )
-		@drivers ||= {}
+  ### Stores the given +klass+ in the <tt>@drivers</tt> hash, keyed by +name+.
+  ### Typically called via MIDIator::Driver's +inherited+ hook.
+  def register_driver( name, klass )
+    @drivers ||= {}
 
-		raise ArgumentError, "Attempted to register something that is not a MIDIator::Driver" unless
-			klass < MIDIator::Driver
+    raise ArgumentError, "Attempted to register something that is not a MIDIator::Driver" unless
+      klass < MIDIator::Driver
 
-		@drivers.each do |existing_name, existing_klass|
-			raise ArgumentError, "Already registered #{existing_klass.to_s} as '#{existing_name}'." if
-				existing_klass == klass
-		end
+    @drivers.each do |existing_name, existing_klass|
+      raise ArgumentError, "Already registered #{existing_klass.to_s} as '#{existing_name}'." if
+        existing_klass == klass
+    end
 
-		@drivers[ name ] = klass
-	end
-	alias register register_driver
-	alias <<       register_driver
+    @drivers[ name ] = klass
+  end
+  alias register register_driver
+  alias <<       register_driver
 
 
-	### Returns the number of drivers currently registered.
-	def size
-		return @drivers.size
-	end
+  ### Returns the number of drivers currently registered.
+  def size
+    return @drivers.size
+  end
 
 
-	### Included to make the registry quack like a hash. Delegates to the
-	### <tt>@drivers</tt> hash.
-	def []( name )
-		return @drivers[ name ]
-	end
+  ### Included to make the registry quack like a hash. Delegates to the
+  ### <tt>@drivers</tt> hash.
+  def []( name )
+    return @drivers[ name ]
+  end
 
 end

data/lib/midiator/drivers/alsa.rb

@@ -24,40 +24,40 @@ 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'
-
-		extern "int snd_rawmidi_open(void*, void*, char*, int)"
-		extern "int snd_rawmidi_close(void*)"
-		extern "int snd_rawmidi_write(void*, void*, int)"
-		extern "int snd_rawmidi_drain(void*)"
-	end
-
-	def open
-		@output = DL::PtrData.new(nil)
-		C.snd_rawmidi_open(nil, @output.ref, "virtual", 0)
-	end
-
-	def close
-		C.snd_rawmidi_close(@output)
-	end
-
-	def message(*args)
-		format = "C" * args.size
-		bytes = args.pack(format).to_ptr
-		C.snd_rawmidi_write(@output, bytes, args.size)
-		C.snd_rawmidi_drain(@output)
-	end
+  # 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'
+
+    extern "int snd_rawmidi_open(void*, void*, char*, int)"
+    extern "int snd_rawmidi_close(void*)"
+    extern "int snd_rawmidi_write(void*, void*, int)"
+    extern "int snd_rawmidi_drain(void*)"
+  end
+
+  def open
+    @output = DL::PtrData.new(nil)
+    C.snd_rawmidi_open(nil, @output.ref, "virtual", 0)
+  end
+
+  def close
+    C.snd_rawmidi_close(@output)
+  end
+
+  def message(*args)
+    format = "C" * args.size
+    bytes = args.pack(format).to_ptr
+    C.snd_rawmidi_write(@output, bytes, args.size)
+    C.snd_rawmidi_drain(@output)
+  end
 end

data/lib/midiator/drivers/core_midi.rb

@@ -22,61 +22,61 @@ require 'midiator/driver'
 require 'midiator/driver_registry'
 
 class MIDIator::Driver::CoreMIDI < MIDIator::Driver # :nodoc:
-	##########################################################################
-	### S Y S T E M   I N T E R F A C E
-	##########################################################################
-	module C # :nodoc:
-		extend DL::Importable
-		dlload '/System/Library/Frameworks/CoreMIDI.framework/Versions/Current/CoreMIDI'
+  ##########################################################################
+  ### S Y S T E M   I N T E R F A C E
+  ##########################################################################
+  module C # :nodoc:
+    extend DL::Importable
+    dlload '/System/Library/Frameworks/CoreMIDI.framework/Versions/Current/CoreMIDI'
 
-		extern "int MIDIClientCreate( void*, void*, void*, void* )"
-		extern "int MIDIClientDispose( void* )"
-		extern "int MIDIGetNumberOfDestinations()"
-		extern "void* MIDIGetDestination( int )"
-		extern "int MIDIOutputPortCreate( void*, void*, void* )"
-		extern "void* MIDIPacketListInit( void* )"
-		extern "void* MIDIPacketListAdd( void*, int, void*, int, int, int, void* )"
-		extern "int MIDISend( void*, void*, void* )"
-	end
+    extern "int MIDIClientCreate( void*, void*, void*, void* )"
+    extern "int MIDIClientDispose( void* )"
+    extern "int MIDIGetNumberOfDestinations()"
+    extern "void* MIDIGetDestination( int )"
+    extern "int MIDIOutputPortCreate( void*, void*, void* )"
+    extern "void* MIDIPacketListInit( void* )"
+    extern "void* MIDIPacketListAdd( void*, int, void*, int, int, int, void* )"
+    extern "int MIDISend( void*, void*, void* )"
+  end
 
-	module CF # :nodoc:
-		extend DL::Importable
-		dlload '/System/Library/Frameworks/CoreFoundation.framework/Versions/Current/CoreFoundation'
+  module CF # :nodoc:
+    extend DL::Importable
+    dlload '/System/Library/Frameworks/CoreFoundation.framework/Versions/Current/CoreFoundation'
 
-		extern "void* CFStringCreateWithCString( void*, char*, int )"
-	end
+    extern "void* CFStringCreateWithCString( void*, char*, int )"
+  end
 
-	##########################################################################
-	### D R I V E R   A P I
-	##########################################################################
+  ##########################################################################
+  ### D R I V E R   A P I
+  ##########################################################################
 
-	def open
-		client_name = CF.cFStringCreateWithCString( nil, "MIDIator", 0 )
-		@client = DL::PtrData.new( nil )
-		C.mIDIClientCreate( client_name, nil, nil, @client.ref )
+  def open
+    client_name = CF.cFStringCreateWithCString( nil, "MIDIator", 0 )
+    @client = DL::PtrData.new( nil )
+    C.mIDIClientCreate( client_name, nil, nil, @client.ref )
 
-		port_name = CF.cFStringCreateWithCString( nil, "Output", 0 )
-		@outport = DL::PtrData.new( nil )
-		C.mIDIOutputPortCreate( @client, port_name, @outport.ref )
+    port_name = CF.cFStringCreateWithCString( nil, "Output", 0 )
+    @outport = DL::PtrData.new( nil )
+    C.mIDIOutputPortCreate( @client, port_name, @outport.ref )
 
-		number_of_destinations = C.mIDIGetNumberOfDestinations
-		raise MIDIator::NoMIDIDestinations if number_of_destinations < 1
-		@destination = C.mIDIGetDestination( 0 )
-	end
+    number_of_destinations = C.mIDIGetNumberOfDestinations
+    raise MIDIator::NoMIDIDestinations if number_of_destinations < 1
+    @destination = C.mIDIGetDestination( 0 )
+  end
 
-	def close
-		C.mIDIClientDispose( @client )
-	end
+  def close
+    C.mIDIClientDispose( @client )
+  end
 
-	def message( *args )
-		format = "C" * args.size
-		bytes = args.pack( format ).to_ptr
-		packet_list = DL.malloc( 256 )
-		packet_ptr = C.mIDIPacketListInit( packet_list )
+  def message( *args )
+    format = "C" * args.size
+    bytes = args.pack( format ).to_ptr
+    packet_list = DL.malloc( 256 )
+    packet_ptr = C.mIDIPacketListInit( packet_list )
 
-		# Pass in two 32-bit 0s for the 64 bit time
-		packet_ptr = C.mIDIPacketListAdd( packet_list, 256, packet_ptr, 0, 0, args.size, bytes )
+    # Pass in two 32-bit 0s for the 64 bit time
+    packet_ptr = C.mIDIPacketListAdd( packet_list, 256, packet_ptr, 0, 0, args.size, bytes )
 
-		C.mIDISend( @outport, @destination, packet_list )
-	end
+    C.mIDISend( @outport, @destination, packet_list )
+  end
 end

data/lib/midiator/drivers/dls_synth.rb

@@ -15,105 +15,105 @@ 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
+  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
+  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