Browse Source

audio_output: ensure callbacks are set before calling

This fixes a crash when changing the volume while using the file aout module.

Regression from:

commit 8fb81d08d6
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Sat May 5 13:06:19 2018 +0300

    aout: inline some functions
pull/104/head
Tristan Matthews 6 years ago
parent
commit
84412e3792
  1. 6
      src/audio_output/output.c

6
src/audio_output/output.c

@ -653,7 +653,7 @@ int aout_VolumeSet (audio_output_t *aout, float vol)
int ret;
vlc_mutex_lock(&owner->lock);
ret = aout->volume_set(aout, vol);
ret = aout->volume_set ? aout->volume_set(aout, vol) : -1;
vlc_mutex_unlock(&owner->lock);
return ret ? -1 : 0;
}
@ -704,7 +704,7 @@ int aout_MuteSet (audio_output_t *aout, bool mute)
int ret;
vlc_mutex_lock(&owner->lock);
ret = aout->mute_set(aout, mute);
ret = aout->mute_set ? aout->mute_set(aout, mute) : -1;
vlc_mutex_unlock(&owner->lock);
return ret ? -1 : 0;
}
@ -730,7 +730,7 @@ int aout_DeviceSet (audio_output_t *aout, const char *id)
int ret;
vlc_mutex_lock(&owner->lock);
ret = aout->device_select(aout, id);
ret = aout->device_select ? aout->device_select(aout, id) : -1;
vlc_mutex_unlock(&owner->lock);
return ret ? -1 : 0;
}

Loading…
Cancel
Save