Merge lp:~michael-sheldon/jokosher/pulse_fixes into lp:jokosher

[Michael Sheldon]

Fixes some problems with multichannel recording and works around some bugs in pulsesrc.

[lp:~michael-sheldon/jokosher/pulse_fixes]

1110. By Michael Sheldon on 2010-04-05

Allow other events to continue while waiting for gstreamer async operation to complete

=== modified file 'Jokosher/AudioBackend.py'
--- Jokosher/AudioBackend.py	2009-03-22 18:31:29 +0000
+++ Jokosher/AudioBackend.py	2010-04-05 22:38:23 +0000
@@ -10,7 +10,8 @@
 #
 #-------------------------------------------------------------------------------
 
-import gst, gobject
+import gst, gtk, gobject
+import time
 import Globals
 
 #=========================================================================
@@ -63,16 +64,22 @@
 		if gobject.type_is_a(element, gst.interfaces.PropertyProbe):
 			element.probe_property_name("device")
 			devices = element.probe_get_values_name("device")
-			
-			if not default_device in devices:
+	
+			if (default_device != None) and (default_device not in devices):
 				dev_info_list.append((default_device, ""))
 			
 			if probe_name and hasattr(element.props, "device-name"):
 				for dev in devices:
 					element.set_property("device", dev)
 					
-					element.set_state(gst.STATE_PAUSED)
-					# certain elements like pulsesrc won't load the device-name until STATE_PAUSED
+					# certain elements like pulsesrc won't load the device-name until STATE_PLAYING
+					state_change_type = element.set_state(gst.STATE_PLAYING)
+					if state_change_type == gst.STATE_CHANGE_ASYNC:
+						new_state = None
+						while new_state != gst.STATE_PLAYING and new_state != gst.STATE_READY:
+							gtk.main_iteration()
+							state_change_type, new_state, pending = element.get_state(0)
+							time.sleep(0.01)
 					name = element.get_property("device-name")
 					element.set_state(gst.STATE_NULL)
 					

=== modified file 'Jokosher/Instrument.py'
--- Jokosher/Instrument.py	2009-04-04 23:06:39 +0000
+++ Jokosher/Instrument.py	2010-04-05 22:38:23 +0000
@@ -119,7 +119,7 @@
 		self.id = project.GenerateUniqueID(id)	#check is id is already being used before setting
 		
 		self.input = None	# the device to use for recording on this instrument.
-		self.inTrack = -1	# Input track to record from if device is multichannel.
+		self.inTrack = 0	# Input track to record from if device is multichannel.
 	
 		# CREATE GSTREAMER ELEMENTS #
 		self.playbackbin = gst.element_factory_make("bin", "Instrument_%d"%self.id)

=== modified file 'Jokosher/Project.py'
--- Jokosher/Project.py	2009-06-08 12:42:25 +0000
+++ Jokosher/Project.py	2010-04-05 22:38:23 +0000
@@ -315,6 +315,7 @@
 					devices[default_device].append(instr)
 		
 
+		recbin = 0
 		for device, recInstruments in devices.iteritems():
 			if len(recInstruments) == 0:
 				#Nothing to record on this device
@@ -329,11 +330,13 @@
 
 			
 			if channelsNeeded > 1: #We're recording from a multi-input device
-				recordingbin = gst.Bin("recording bin")
+				#Need multiple recording bins with unique names when we're
+				#recording from multiple devices
+				recordingbin = gst.Bin("recordingbin_%d" % recbin)
 				recordString = Globals.settings.recording["audiosrc"]
 				srcBin = gst.parse_bin_from_description(recordString, True)
 				try:
-					src_element = recordingbin.iterate_sources().next()
+					src_element = srcBin.iterate_sources().next()
 				except StopIteration:
 					pass
 				else:
@@ -370,8 +373,9 @@
 				
 				split.connect("pad-added", self.__RecordingPadAddedCb, recInstruments, recordingbin)
 				Globals.debug("Recording in multi-input mode")
-				Globals.debug("adding recordingbin")
+				Globals.debug("adding recordingbin_%d" % recbin)
 				self.mainpipeline.add(recordingbin)
+				recbin += 1
 			else:
 				instr = recInstruments[0]
 				event = instr.GetRecordingEvent()