Bug 1266753 - Fix mac bustage: use the old enum values, on a CLOSED TREE. r=padenot
authorAlex Chronopoulos <achronop@gmail.com>
Fri, 22 Apr 2016 18:42:11 +0200
changeset 332436 cd38098913193cc5415fe799d6a146d48690a4e4
parent 332435 ebf23fb059f5ab37598ed92ba7901aac9023d708
child 332437 cf2cff1fd1942412e36586ab9c42d5baed7cb454
push id6048
push userkmoir@mozilla.com
push dateMon, 06 Jun 2016 19:02:08 +0000
treeherdermozilla-beta@46d72a56c57d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerspadenot
bugs1266753
milestone48.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1266753 - Fix mac bustage: use the old enum values, on a CLOSED TREE. r=padenot MozReview-Commit-ID: 3wr3iTG6IWY
media/libcubeb/src/cubeb_audiounit.c
--- a/media/libcubeb/src/cubeb_audiounit.c
+++ b/media/libcubeb/src/cubeb_audiounit.c
@@ -504,17 +504,17 @@ audiounit_install_device_changed_callbac
      * headphone jack. */
     AudioDeviceID output_dev_id;
     r = audiounit_get_output_device_id(&output_dev_id);
     if (r != noErr) {
       return CUBEB_ERROR;
     }
 
     r = audiounit_add_listener(stm, output_dev_id, kAudioDevicePropertyDataSource,
-        kAudioObjectPropertyScopeOutput, &audiounit_property_listener_callback);
+        kAudioDevicePropertyScopeOutput, &audiounit_property_listener_callback);
     if (r != noErr) {
       return CUBEB_ERROR;
     }
 
     /* This event will notify us when the default audio device changes,
      * for example when the user plugs in a USB headset and the system chooses it
      * automatically as the default, or when another device is chosen in the
      * dropdown list. */
@@ -529,17 +529,17 @@ audiounit_install_device_changed_callbac
     /* This event will notify us when the data source on the input device changes. */
     AudioDeviceID input_dev_id;
     r = audiounit_get_input_device_id(&input_dev_id);
     if (r != noErr) {
       return CUBEB_ERROR;
     }
 
     r = audiounit_add_listener(stm, input_dev_id, kAudioDevicePropertyDataSource,
-        kAudioObjectPropertyScopeInput, &audiounit_property_listener_callback);
+        kAudioDevicePropertyScopeInput, &audiounit_property_listener_callback);
     if (r != noErr) {
       return CUBEB_ERROR;
     }
 
     /* This event will notify us when the default input device changes. */
     r = audiounit_add_listener(stm, kAudioObjectSystemObject, kAudioHardwarePropertyDefaultInputDevice,
         kAudioObjectPropertyScopeGlobal, &audiounit_property_listener_callback);
     if (r != noErr) {
@@ -558,17 +558,17 @@ audiounit_uninstall_device_changed_callb
   if (stm->output_unit) {
     AudioDeviceID output_dev_id;
     r = audiounit_get_output_device_id(&output_dev_id);
     if (r != noErr) {
       return CUBEB_ERROR;
     }
 
     r = audiounit_remove_listener(stm, output_dev_id, kAudioDevicePropertyDataSource,
-        kAudioObjectPropertyScopeOutput, &audiounit_property_listener_callback);
+        kAudioDevicePropertyScopeOutput, &audiounit_property_listener_callback);
     if (r != noErr) {
       return CUBEB_ERROR;
     }
 
     r = audiounit_remove_listener(stm, kAudioObjectSystemObject, kAudioHardwarePropertyDefaultOutputDevice,
         kAudioObjectPropertyScopeGlobal, &audiounit_property_listener_callback);
     if (r != noErr) {
       return CUBEB_ERROR;
@@ -578,17 +578,17 @@ audiounit_uninstall_device_changed_callb
   if (stm->input_unit) {
     AudioDeviceID input_dev_id;
     r = audiounit_get_input_device_id(&input_dev_id);
     if (r != noErr) {
       return CUBEB_ERROR;
     }
 
     r = audiounit_remove_listener(stm, input_dev_id, kAudioDevicePropertyDataSource,
-        kAudioObjectPropertyScopeInput, &audiounit_property_listener_callback);
+        kAudioDevicePropertyScopeInput, &audiounit_property_listener_callback);
     if (r != noErr) {
       return CUBEB_ERROR;
     }
 
     r = audiounit_remove_listener(stm, kAudioObjectSystemObject, kAudioHardwarePropertyDefaultInputDevice,
         kAudioObjectPropertyScopeGlobal, &audiounit_property_listener_callback);
     if (r != noErr) {
       return CUBEB_ERROR;