From f44a242258c282eb1407899a64571c39d010285b Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 25 May 2013 19:56:52 +0200 Subject: Replace calls to usec_sleep() This is just dumb sed replacement to mp_sleep_us(). Also remove the now unused usec_sleep() wrapper. --- audio/out/ao_coreaudio.c | 4 ++-- audio/out/ao_dsound.c | 2 +- audio/out/ao_jack.c | 4 ++-- audio/out/ao_openal.c | 2 +- audio/out/ao_rsound.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) (limited to 'audio') diff --git a/audio/out/ao_coreaudio.c b/audio/out/ao_coreaudio.c index 083c50faff..bec849d8ca 100644 --- a/audio/out/ao_coreaudio.c +++ b/audio/out/ao_coreaudio.c @@ -1019,7 +1019,7 @@ static int AudioStreamChangeFormat( AudioStreamID i_stream_id, AudioStreamBasicD AudioStreamBasicDescription actual_format; int j; for (j = 0; !stream_format_changed && j < 50; ++j) - usec_sleep(10000); + mp_sleep_us(10000); if (stream_format_changed) stream_format_changed = 0; else @@ -1143,7 +1143,7 @@ static void uninit(int immed) if (!immed) { long long timeleft=(1000000LL*av_fifo_size(ao->buffer))/ao_data.bps; ao_msg(MSGT_AO,MSGL_DBG2, "%d bytes left @%d bps (%d usec)\n", av_fifo_size(ao->buffer), ao_data.bps, (int)timeleft); - usec_sleep((int)timeleft); + mp_sleep_us((int)timeleft); } if (!ao->b_digital) { diff --git a/audio/out/ao_dsound.c b/audio/out/ao_dsound.c index 967084d3ae..f57d7cd96e 100644 --- a/audio/out/ao_dsound.c +++ b/audio/out/ao_dsound.c @@ -531,7 +531,7 @@ static void audio_resume(void) static void uninit(int immed) { if (!immed) - usec_sleep(get_delay() * 1000000); + mp_sleep_us(get_delay() * 1000000); reset(); DestroyBuffer(); diff --git a/audio/out/ao_jack.c b/audio/out/ao_jack.c index 1807a11c44..c93d07c2a2 100644 --- a/audio/out/ao_jack.c +++ b/audio/out/ao_jack.c @@ -311,10 +311,10 @@ err_out: // close audio device static void uninit(int immed) { if (!immed) - usec_sleep(get_delay() * 1000 * 1000); + mp_sleep_us(get_delay() * 1000 * 1000); // HACK, make sure jack doesn't loop-output dirty buffers reset(); - usec_sleep(100 * 1000); + mp_sleep_us(100 * 1000); jack_client_close(client); av_fifo_free(buffer); buffer = NULL; diff --git a/audio/out/ao_openal.c b/audio/out/ao_openal.c index 08f8bc1978..c622c5f140 100644 --- a/audio/out/ao_openal.c +++ b/audio/out/ao_openal.c @@ -211,7 +211,7 @@ static void uninit(int immed) { ALint state; alGetSourcei(sources[0], AL_SOURCE_STATE, &state); while (state == AL_PLAYING) { - usec_sleep(10000); + mp_sleep_us(10000); alGetSourcei(sources[0], AL_SOURCE_STATE, &state); } } diff --git a/audio/out/ao_rsound.c b/audio/out/ao_rsound.c index 78ea2c63f5..1c0b534ab4 100644 --- a/audio/out/ao_rsound.c +++ b/audio/out/ao_rsound.c @@ -153,7 +153,7 @@ static void uninit(struct ao *ao, bool cut_audio) * guaranteed by backend drivers, so we approximate this behavior. */ if (!cut_audio) - usec_sleep(rsd_delay_ms(priv->rd) * 1000); + mp_sleep_us(rsd_delay_ms(priv->rd) * 1000); rsd_stop(priv->rd); rsd_free(priv->rd); -- cgit v1.2.3