int i_bytes_per_sample;
CFArrayRef device_list;
- vlc_mutex_t device_list_lock;
+
+ vlc_mutex_t var_lock; /* protects access to device_list and i_selected_dev */
float f_volume;
bool b_mute;
OSStatus err = noErr;
- vlc_mutex_init(&p_sys->device_list_lock);
+ vlc_mutex_init(&p_sys->var_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);
+ vlc_mutex_lock(&p_sys->var_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);
+ vlc_mutex_unlock(&p_sys->var_lock);
char *psz_device = aout_DeviceGet(p_aout);
config_PutPsz(p_aout, "auhal-audio-device", psz_device);
free(psz_device);
- vlc_mutex_destroy(&p_sys->device_list_lock);
+ vlc_mutex_destroy(&p_sys->var_lock);
vlc_mutex_destroy(&p_sys->lock);
vlc_cond_destroy(&p_sys->cond);
p_sys->b_changed_mixing = false;
p_sys->i_bytes_per_sample = 0;
+ vlc_mutex_lock(&p_sys->var_lock);
p_sys->i_selected_dev = p_sys->i_new_selected_dev;
aout_FormatPrint(p_aout, "VLC is looking for:", fmt);
b_success = true;
}
}
+ vlc_mutex_unlock(&p_sys->var_lock);
if (b_success) {
p_aout->play = Play;
error:
/* If we reach this, this aout has failed */
+ vlc_mutex_unlock(&p_sys->var_lock);
msg_Err(p_aout, "opening auhal output failed");
return VLC_EGENERIC;
}
verify_noerr(AudioComponentInstanceDispose(p_sys->au_unit));
}
+ vlc_mutex_lock(&p_sys->var_lock);
if (p_sys->b_digital) {
/* Stop device */
err = AudioDeviceStop(p_sys->i_selected_dev,
msg_Warn(p_aout, "failed to remove audio device life checker [%4.4s]", (char *)&err);
}
-
+ vlc_mutex_unlock(&p_sys->var_lock);
p_sys->i_bytes_per_sample = 0;
p_sys->b_digital = false;
free(psz_name);
}
- vlc_mutex_lock(&p_sys->device_list_lock);
+ vlc_mutex_lock(&p_sys->var_lock);
CFIndex count = 0;
if (p_sys->device_list)
count = CFArrayGetCount(p_sys->device_list);
CFRelease(p_sys->device_list);
p_sys->device_list = CFArrayCreateCopy(kCFAllocatorDefault, currentListOfDevices);
CFRelease(currentListOfDevices);
- vlc_mutex_unlock(&p_sys->device_list_lock);
+ vlc_mutex_unlock(&p_sys->var_lock);
free(deviceIDs);
}
msg_Dbg(p_aout, "audio device configuration changed, resetting cache");
RebuildDeviceList(p_aout);
- vlc_mutex_lock(&p_sys->device_list_lock);
+ vlc_mutex_lock(&p_sys->var_lock);
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);
+ vlc_mutex_unlock(&p_sys->var_lock);
return noErr;
}
/*
* check if changed stream id belongs to current device
*/
+ vlc_mutex_lock(&p_sys->var_lock);
AudioObjectPropertyAddress streamsAddress = { kAudioDevicePropertyStreams, kAudioDevicePropertyScopeOutput, kAudioObjectPropertyElementMaster };
err = AudioObjectGetPropertyDataSize(p_sys->i_selected_dev, &streamsAddress, 0, NULL, &i_param_size);
if (err != noErr) {
msg_Err(p_aout, "could not get list of streams [%4.4s]", (char *)&err);
return VLC_EGENERIC;
}
+ vlc_mutex_unlock(&p_sys->var_lock);
for (int i = 0; i < i_streams; i++) {
if (p_streams[i] == inObjectID) {