From 96053d53a75f69ff1662a0641e009f7cbad3cbc2 Mon Sep 17 00:00:00 2001 From: Kevin Mitchell Date: Wed, 16 Mar 2016 23:41:30 -0700 Subject: ao_wasapi: use new af_select_best_samplerate function It duplicates the logic that was previously used here. --- audio/out/ao_wasapi_utils.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'audio') diff --git a/audio/out/ao_wasapi_utils.c b/audio/out/ao_wasapi_utils.c index 8d0ea30bd7..0e7dec885a 100644 --- a/audio/out/ao_wasapi_utils.c +++ b/audio/out/ao_wasapi_utils.c @@ -364,17 +364,9 @@ static bool search_samplerates(struct ao *ao, WAVEFORMATEXTENSIBLE *wformat, } } - for (int i = 0; supported[i]; i++) { - // first choose the lowest integer multiple of the sample rate - if (!(supported[i] % ao->samplerate)) { - change_waveformat_samplerate(wformat, supported[i]); - return true; - } - } - - // then choose the highest supported (if any) - if (n) { - change_waveformat_samplerate(wformat, supported[n-1]); + int samplerate = af_select_best_samplerate(ao->samplerate, supported); + if (samplerate > 0) { + change_waveformat_samplerate(wformat, samplerate); return true; } -- cgit v1.2.3