int i_bytes_per_sample;
CFArrayRef device_list;
+ vlc_mutex_t device_list_lock;
float f_volume;
bool b_mute;
OSStatus err = noErr;
+ vlc_mutex_init(&p_sys->device_list_lock);
vlc_mutex_init(&p_sys->lock);
vlc_cond_init(&p_sys->cond);
p_sys->b_digital = false;
if (err != noErr)
msg_Err(p_aout, "AudioHardwareRemovePropertyListener failed [%4.4s]", (char *)&err);
+ vlc_mutex_lock(&p_sys->device_list_lock);
/* remove streams callbacks */
CFIndex count = CFArrayGetCount(p_sys->device_list);
if (count > 0) {
}
}
+ CFRelease(p_sys->device_list);
+ vlc_mutex_unlock(&p_sys->device_list_lock);
+
config_PutPsz(p_aout, "auhal-audio-device", aout_DeviceGet(p_aout));
- CFRelease(p_sys->device_list);
+ vlc_mutex_destroy(&p_sys->device_list_lock);
vlc_mutex_destroy(&p_sys->lock);
vlc_cond_destroy(&p_sys->cond);
free(psz_name);
}
+ vlc_mutex_lock(&p_sys->device_list_lock);
CFIndex count = 0;
if (p_sys->device_list)
count = CFArrayGetCount(p_sys->device_list);
if(!CFArrayContainsValue(p_sys->device_list, CFRangeMake(0, CFArrayGetCount(p_sys->device_list)),CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &p_sys->i_selected_dev)))
aout_RestartRequest(p_aout, AOUT_RESTART_OUTPUT);
+ vlc_mutex_unlock(&p_sys->device_list_lock);
+
free(deviceIDs);
}