From a3aa7ca02d29f18fcf1e018a833a928d2df1e8d8 Mon Sep 17 00:00:00 2001 From: Dan Dennedy Date: Sun, 26 Feb 2012 20:49:51 -0800 Subject: [PATCH] the audio also stutters on Linux when paused --- src/modules/sdl/consumer_sdl_audio.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/modules/sdl/consumer_sdl_audio.c b/src/modules/sdl/consumer_sdl_audio.c index 5c340d71..59b651bd 100644 --- a/src/modules/sdl/consumer_sdl_audio.c +++ b/src/modules/sdl/consumer_sdl_audio.c @@ -33,8 +33,6 @@ extern pthread_mutex_t mlt_sdl_mutex; -#define MIN(a,b) ((a) > (b) ? (b) : (a)) - /** This classes definition. */ @@ -230,7 +228,7 @@ static void sdl_fill_audio( void *udata, uint8_t *stream, int len ) pthread_mutex_lock( &self->audio_mutex ); // Block until audio received -#ifndef WIN32 +#ifdef __DARWIN__ while ( self->running && len > self->audio_avail ) pthread_cond_wait( &self->audio_cond, &self->audio_mutex ); #endif @@ -255,7 +253,7 @@ static void sdl_fill_audio( void *udata, uint8_t *stream, int len ) memset( stream, 0, len ); // Mix the audio - SDL_MixAudio( stream, self->audio_buffer, MIN(len, self->audio_avail), + SDL_MixAudio( stream, self->audio_buffer, self->audio_avail, ( int )( ( float )SDL_MIX_MAXVOLUME * volume ) ); // No audio left -- 2.39.2