[soundflower] r111 committed - soundflowerbed: when headphones are plugged-in or unplugged while play...

[sound...@googlecode.com]

Revision: 111
Author: t...@electrotap.com
Date: Fri Mar 12 10:30:43 2010
Log: soundflowerbed: when headphones are plugged-in or unplugged while
playing back from soundflower to the built-in output the audio now runs
correctly instead of producing noise. closes googlecode issue 17.
http://code.google.com/p/soundflower/source/detail?r=111

Modified:
/trunk/SoundflowerBed/AppController.mm

=======================================
--- /trunk/SoundflowerBed/AppController.mm Fri Mar 12 10:30:02 2010
+++ /trunk/SoundflowerBed/AppController.mm Fri Mar 12 10:30:43 2010
@@ -23,7 +23,7 @@
void* inClientData)
{
AppController *app = (AppController *)inClientData;
-
+printf("HardwareListenerProc\n");
switch(inPropertyID)
{
case kAudioHardwarePropertyDevices:
@@ -97,6 +97,14 @@
// printf("kAudioDevicePropertyDeviceHasChanged\n");
break;

+ case kAudioDevicePropertyDataSource:
+ // printf("DeviceListenerProc : HEADPHONES! \n");
+ if (gThruEngine2->IsRunning() && gThruEngine2->GetOutputDevice() ==
inDevice)
+ [NSThread detachNewThreadSelector:@selector(srChanged2chOutput)
toTarget:app withObject:nil];
+ else if (gThruEngine16->IsRunning() && gThruEngine16->GetOutputDevice()
== inDevice)
+ [NSThread detachNewThreadSelector:@selector(srChanged16chOutput)
toTarget:app withObject:nil];
+ break;
+
case kAudioDevicePropertyDeviceIsRunning:
// printf("kAudioDevicePropertyDeviceIsRunning\n");
break;
@@ -392,6 +400,10 @@
verify_noerr (AudioDeviceAddPropertyListener((*i).mID, 0, false,
kAudioDevicePropertyStreamConfiguration, DeviceListenerProc, self));
verify_noerr (AudioDeviceAddPropertyListener((*i).mID, 0, false,
kAudioDevicePropertyStreams, DeviceListenerProc, self));
//verify_noerr (AudioDeviceAddPropertyListener((*i).mID, 0, false,
kAudioDevicePropertyAvailableNominalSampleRates, DeviceListenerProc, self));
+
+ // this provides us, for example, with notification when the headphones
are plugged/unplugged during playback
+ verify_noerr (AudioDeviceAddPropertyListener((*i).mID, 0, false,
kAudioDevicePropertyDataSource, DeviceListenerProc, self));
+
}
}

@@ -423,6 +435,7 @@
verify_noerr (AudioDeviceRemovePropertyListener((*i).mID, 0, false,
kAudioDevicePropertyNominalSampleRate, DeviceListenerProc));
verify_noerr (AudioDeviceRemovePropertyListener((*i).mID, 0, false,
kAudioDevicePropertyStreamConfiguration, DeviceListenerProc));
verify_noerr (AudioDeviceRemovePropertyListener((*i).mID, 0, false,
kAudioDevicePropertyStreams, DeviceListenerProc));
+ verify_noerr (AudioDeviceRemovePropertyListener((*i).mID, 0, false,
kAudioDevicePropertyDataSource, DeviceListenerProc));
}
}