lumas/Makefile

[melted] / src / modules / sdl / consumer_sdl.c

diff --git a/src/modules/sdl/consumer_sdl.c b/src/modules/sdl/consumer_sdl.c
index 378a78b..3810069 100644 (file)
--- a/src/modules/sdl/consumer_sdl.c
+++ b/src/modules/sdl/consumer_sdl.c
@@ -195,16 +195,14 @@ int consumer_start( mlt_consumer parent )
                else
                {
                        if ( SDL_GetVideoSurface( ) != NULL )
-                       {
                                this->sdl_screen = SDL_GetVideoSurface( );
-                               consumer_get_dimensions( &this->window_width, &this->window_height );
-                               mlt_properties_set_int( this->properties, "changed", 0 );
-                       }
                }
 
                if ( !mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( parent ), "audio_off" ) )
                        SDL_InitSubSystem( SDL_INIT_AUDIO );
 
+               this->sdl_screen = SDL_SetVideoMode( this->window_width, this->window_height, 0, this->sdl_flags );
+
                pthread_create( &this->thread, NULL, consumer_thread, this );
        }
 
@@ -291,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 ) );
 
@@ -345,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;
@@ -409,7 +404,9 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame )
                {
                        SDL_Event event;
        
+                       sdl_lock_display( );
                        changed = consumer_get_dimensions( &this->window_width, &this->window_height );
+                       sdl_unlock_display( );
 
                        while ( SDL_PollEvent( &event ) )
                        {
@@ -441,6 +438,8 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame )
                        }
                }
        
+               sdl_lock_display();
+
                if ( width != this->width || height != this->height )
                {
                        if ( this->sdl_overlay != NULL )
@@ -456,21 +455,9 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame )
                        this->sdl_overlay = NULL;
 
                        // open SDL window with video overlay, if possible
-                       sdl_lock_display();
                        this->sdl_screen = SDL_SetVideoMode( this->window_width, this->window_height, this->bpp, this->sdl_flags );
-                       sdl_unlock_display();
                        if ( consumer_get_dimensions( &this->window_width, &this->window_height ) )
                                this->sdl_screen = SDL_SetVideoMode( this->window_width, this->window_height, this->bpp, this->sdl_flags );
-                       //SDL_Flip( this->sdl_screen );
-                       mlt_properties_set_int( properties, "changed", 0 );
-               }
-               else if ( mlt_properties_get_int( properties, "changed" ) )
-               {
-                       sdl_lock_display();
-                       this->sdl_screen = SDL_SetVideoMode( this->window_width, this->window_height, this->bpp, this->sdl_flags );
-                       SDL_SetClipRect( this->sdl_screen, &this->rect );
-                       sdl_unlock_display();
-                       mlt_properties_set_int( properties, "changed", 0 );
                }
 
                if ( this->running )
@@ -534,16 +521,12 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame )
                if ( this->running && this->sdl_screen != NULL && this->sdl_overlay == NULL )
                {
                        SDL_SetClipRect( this->sdl_screen, &this->rect );
-                       SDL_Flip( this->sdl_screen );
-                       sdl_lock_display();
                        this->sdl_overlay = SDL_CreateYUVOverlay( width, height, SDL_YUY2_OVERLAY, this->sdl_screen );
-                       sdl_unlock_display();
                }
 
                if ( this->running && this->sdl_screen != NULL && this->sdl_overlay != NULL )
                {
                        this->buffer = this->sdl_overlay->pixels[ 0 ];
-                       sdl_lock_display();
                        if ( SDL_LockYUVOverlay( this->sdl_overlay ) >= 0 )
                        {
                                if ( image != NULL )
@@ -551,8 +534,9 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame )
                                SDL_UnlockYUVOverlay( this->sdl_overlay );
                                SDL_DisplayYUVOverlay( this->sdl_overlay, &this->sdl_screen->clip_rect );
                        }
-                       sdl_unlock_display();
                }
+
+               sdl_unlock_display();
        }
 
        return 0;
@@ -727,7 +711,6 @@ static void *consumer_thread( void *arg )
                mlt_frame_close( mlt_deque_pop_back( this->queue ) );
 
        this->sdl_screen = NULL;
-       this->sdl_overlay = NULL;
        this->audio_avail = 0;
 
        return NULL;
@@ -744,7 +727,7 @@ static int consumer_get_dimensions( int *width, int *height )
        SDL_VERSION( &wm.version );
 
        // Lock the display
-       sdl_lock_display();
+       //sdl_lock_display();
 
 #ifndef __DARWIN__
        // Get the wm structure
@@ -774,7 +757,7 @@ static int consumer_get_dimensions( int *width, int *height )
 #endif
 
        // Unlock the display
-       sdl_unlock_display();
+       //sdl_unlock_display();
 
        return changed;
 }