diff options
Diffstat (limited to 'audio/out/ao_openal.c')
| -rw-r--r-- | audio/out/ao_openal.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/audio/out/ao_openal.c b/audio/out/ao_openal.c index 6b2e3bc176..7172908e70 100644 --- a/audio/out/ao_openal.c +++ b/audio/out/ao_openal.c @@ -19,8 +19,6 @@ * License along with mpv. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <stdlib.h> #include <stdio.h> #include <inttypes.h> @@ -58,7 +56,7 @@ struct priv { ALenum al_format; int num_buffers; int num_samples; - int direct_channels; + bool direct_channels; }; static int control(struct ao *ao, enum aocontrol cmd, void *arg) @@ -67,13 +65,13 @@ static int control(struct ao *ao, enum aocontrol cmd, void *arg) case AOCONTROL_GET_VOLUME: case AOCONTROL_SET_VOLUME: { ALfloat volume; - ao_control_vol_t *vol = (ao_control_vol_t *)arg; + float *vol = arg; if (cmd == AOCONTROL_SET_VOLUME) { - volume = (vol->left + vol->right) / 200.0; + volume = *vol / 100.0; alListenerf(AL_GAIN, volume); } alGetListenerf(AL_GAIN, &volume); - vol->left = vol->right = volume * 100; + *vol = volume * 100; return CONTROL_TRUE; } case AOCONTROL_GET_MUTE: @@ -391,12 +389,12 @@ const struct ao_driver audio_out_openal = { .priv_defaults = &(const struct priv) { .num_buffers = 4, .num_samples = 8192, - .direct_channels = 1, + .direct_channels = true, }, .options = (const struct m_option[]) { {"num-buffers", OPT_INT(num_buffers), M_RANGE(2, MAX_BUF)}, {"num-samples", OPT_INT(num_samples), M_RANGE(256, MAX_SAMPLES)}, - {"direct-channels", OPT_FLAG(direct_channels)}, + {"direct-channels", OPT_BOOL(direct_channels)}, {0} }, .options_prefix = "openal", |