From: lilo_booter <lilo_booter@d19143bc-622f-0410-bfdd-b5b2a6649095>
Date: Mon, 27 Jun 2005 16:48:11 +0000 (+0000)
Subject: src/modules/sdl/consumer_sdl.c
X-Git-Url: http://research.m1stereo.tv/gitweb?a=commitdiff_plain;h=74acd162455a590ca335bb7cf4de7956b37016f3;p=melted

src/modules/sdl/consumer_sdl.c
+ (Re)Added audio volume control


git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@746 d19143bc-622f-0410-bfdd-b5b2a6649095
---

diff --git a/src/modules/sdl/consumer_sdl.c b/src/modules/sdl/consumer_sdl.c
index adc60b4..b8ce536 100644
--- a/src/modules/sdl/consumer_sdl.c
+++ b/src/modules/sdl/consumer_sdl.c
@@ -262,7 +262,10 @@ static void sdl_fill_audio( void *udata, uint8_t *stream, int len )
 	if ( this->audio_avail >= len )
 	{
 		// Place in the audio buffer
-		memcpy( stream, this->audio_buffer, len );
+		if ( volume != 1.0 )
+			SDL_MixAudio( stream, this->audio_buffer, len, ( int )( ( float )SDL_MIX_MAXVOLUME * volume ) );
+		else
+			memcpy( stream, this->audio_buffer, len );
 
 		// Remove len from the audio available
 		this->audio_avail -= len;
@@ -279,7 +282,7 @@ static void sdl_fill_audio( void *udata, uint8_t *stream, int len )
 		memcpy( stream, this->audio_buffer, this->audio_avail );
 
 		// Mix the audio 
-		SDL_MixAudio( stream, stream, len, ( int )( ( double )SDL_MIX_MAXVOLUME * volume ) );
+		SDL_MixAudio( stream, this->audio_buffer, len, ( int )( ( float )SDL_MIX_MAXVOLUME * volume ) );
 
 		// No audio left
 		this->audio_avail = 0;