diff options
author | Colin Guthrie <cguthrie@mandriva.org> | 2011-03-24 09:08:05 +0000 |
---|---|---|
committer | Colin Guthrie <cguthrie@mandriva.org> | 2011-03-24 09:08:05 +0000 |
commit | ae35ec1ed5f76aab6a0a60a27adf1d6b92323e70 (patch) | |
tree | dce87fc98f6429a679cec0353be3d94f0455c88e /src/modules | |
parent | 11da057d81a1a5d28134d1cc8cc2c6469524561d (diff) | |
parent | fc339a608e0a295312a1887b6cfb78883f7c556c (diff) |
Merge remote-tracking branch 'zonique/osx'
Diffstat (limited to 'src/modules')
-rw-r--r-- | src/modules/macosx/module-bonjour-publish.c (renamed from src/modules/module-bonjour-publish.c) | 0 | ||||
-rw-r--r-- | src/modules/macosx/module-coreaudio-detect.c (renamed from src/modules/coreaudio/module-coreaudio-detect.c) | 4 | ||||
-rw-r--r-- | src/modules/macosx/module-coreaudio-device.c (renamed from src/modules/coreaudio/module-coreaudio-device.c) | 0 |
3 files changed, 3 insertions, 1 deletions
diff --git a/src/modules/module-bonjour-publish.c b/src/modules/macosx/module-bonjour-publish.c index 095a1d29..095a1d29 100644 --- a/src/modules/module-bonjour-publish.c +++ b/src/modules/macosx/module-bonjour-publish.c diff --git a/src/modules/coreaudio/module-coreaudio-detect.c b/src/modules/macosx/module-coreaudio-detect.c index 1d26b84e..263fc72d 100644 --- a/src/modules/coreaudio/module-coreaudio-detect.c +++ b/src/modules/macosx/module-coreaudio-detect.c @@ -232,12 +232,14 @@ fail: void pa__done(pa_module *m) { struct userdata *u; - struct ca_device *dev = u->devices; + struct ca_device *dev; AudioObjectPropertyAddress property_address; pa_assert(m); pa_assert_se(u = m->userdata); + dev = u->devices; + property_address.mSelector = kAudioHardwarePropertyDevices; property_address.mScope = kAudioObjectPropertyScopeGlobal; property_address.mElement = kAudioObjectPropertyElementMaster; diff --git a/src/modules/coreaudio/module-coreaudio-device.c b/src/modules/macosx/module-coreaudio-device.c index cc4600b5..cc4600b5 100644 --- a/src/modules/coreaudio/module-coreaudio-device.c +++ b/src/modules/macosx/module-coreaudio-device.c |