lumas/Makefile

+ Correction for non-gui app build on darwin

lumas/luma.c
+ Handle sdl events

sdl/consumer_sdl.c
+ Audio on Darwin

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

diff --git a/src/modules/lumas/Makefile b/src/modules/lumas/Makefile
index 94a9fa7b2d855c1bf2f463a477109c25b5a0902d..fe436bdcddc2c8587c4da404bf66686faec2bb6e 100644 (file)
--- a/src/modules/lumas/Makefile
+++ b/src/modules/lumas/Makefile
@@ -1,4 +1,5 @@
 include ../../../config.mak
+LDFLAGS=
 
 all:   luma create_lumas
        @./create_lumas 

diff --git a/src/modules/sdl/consumer_sdl.c b/src/modules/sdl/consumer_sdl.c
index 844a0557cd7a4ae8f7de590f46708249212d004a..381006991dc42a2fdd0c4d6c61aa796f2096c72f 100644 (file)
--- a/src/modules/sdl/consumer_sdl.c
+++ b/src/modules/sdl/consumer_sdl.c
@@ -289,9 +289,6 @@ static void sdl_fill_audio( void *udata, uint8_t *stream, int len )
                // Just to be safe, wipe the stream first
                memset( stream, 0, len );
 
-               // Copy what we have into the stream
-               memcpy( stream, this->audio_buffer, this->audio_avail );
-
                // Mix the audio 
                SDL_MixAudio( stream, this->audio_buffer, len, ( int )( ( float )SDL_MIX_MAXVOLUME * volume ) );
 
@@ -343,7 +340,7 @@ static int consumer_play_audio( consumer_sdl this, mlt_frame frame, int init_aud
                memset( &request, 0, sizeof( SDL_AudioSpec ) );
                this->playing = 0;
                request.freq = frequency;
-               request.format = AUDIO_S16;
+               request.format = AUDIO_S16SYS;
                request.channels = channels;
                request.samples = audio_buffer;
                request.callback = sdl_fill_audio;