+ Correction to the disabled case (should be disable-motion_est and plugins should...

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

diff --git a/src/modules/sdl/consumer_sdl.c b/src/modules/sdl/consumer_sdl.c
index b8ce536..4bc6660 100644 (file)
--- a/src/modules/sdl/consumer_sdl.c
+++ b/src/modules/sdl/consumer_sdl.c
@@ -193,17 +193,8 @@ int consumer_start( mlt_consumer parent )
                this->running = 1;
                this->joined = 0;
 
-               // Allow the user to force resizing to window size
-               if ( mlt_properties_get_int( this->properties, "resize" ) )
-               {
-                       mlt_properties_set_int( this->properties, "width", this->width );
-                       mlt_properties_set_int( this->properties, "height", this->height );
-               }
-               else
-               {
-                       this->width = mlt_properties_get_int( this->properties, "width" );
-                       this->height = mlt_properties_get_int( this->properties, "height" );
-               }
+               this->width = mlt_properties_get_int( this->properties, "width" );
+               this->height = mlt_properties_get_int( this->properties, "height" );
 
                pthread_create( &this->thread, NULL, consumer_thread, this );
        }
@@ -602,10 +593,10 @@ static void *video_thread( void *arg )
                if ( mlt_properties_get_int( properties, "rendered" ) == 1 && this->running )
                {
                        // Obtain the scheduled playout time
-                       mlt_position scheduled = mlt_properties_get_position( properties, "playtime" );
+                       int64_t scheduled = mlt_properties_get_int( properties, "playtime" );
 
                        // Determine the difference between the elapsed time and the scheduled playout time
-                       mlt_position difference = scheduled - elapsed;
+                       int64_t difference = scheduled - elapsed;
 
                        // Smooth playback a bit
                        if ( real_time && ( difference > 20000 && speed == 1.0 ) )
@@ -723,7 +714,7 @@ static void *consumer_thread( void *arg )
                        }
 
                        // Set playtime for this frame
-                       mlt_properties_set_position( properties, "playtime", playtime );
+                       mlt_properties_set_int( properties, "playtime", playtime );
 
                        while ( this->running && mlt_deque_count( this->queue ) > 15 )
                                nanosleep( &tm, NULL );