in point fix, low latency sdl, minor fixes

[melted] / src / framework / mlt_producer.c

diff --git a/src/framework/mlt_producer.c b/src/framework/mlt_producer.c
index c4508ba..74441f9 100644 (file)
--- a/src/framework/mlt_producer.c
+++ b/src/framework/mlt_producer.c
@@ -20,6 +20,7 @@
 
 #include "config.h"
 #include "mlt_producer.h"
+#include "mlt_factory.h"
 #include "mlt_frame.h"
 #include <stdio.h>
 #include <string.h>
@@ -52,7 +53,7 @@ int mlt_producer_init( mlt_producer this, void *child )
                if ( mlt_service_init( &this->parent, this ) == 0 )
                {
                        // Get the normalisation preference
-                       char *normalisation = getenv( "MLT_NORMALISATION" );
+                       char *normalisation = mlt_environment( "MLT_NORMALISATION" );
 
                        // The parent is the service
                        mlt_service parent = &this->parent;
@@ -65,14 +66,19 @@ int mlt_producer_init( mlt_producer this, void *child )
                        mlt_properties_set_position( properties, "_position", 0.0 );
                        mlt_properties_set_double( properties, "_frame", 0 );
                        if ( normalisation == NULL || strcmp( normalisation, "NTSC" ) )
+                       {
                                mlt_properties_set_double( properties, "fps", 25.0 );
+                               mlt_properties_set_double( properties, "aspect_ratio", 72.0 / 79.0 );
+                       }
                        else
+                       {
                                mlt_properties_set_double( properties, "fps", 30000.0 / 1001.0 );
+                               mlt_properties_set_double( properties, "aspect_ratio", 128.0 / 117.0 );
+                       }
                        mlt_properties_set_double( properties, "_speed", 1.0 );
                        mlt_properties_set_position( properties, "in", 0 );
-                       mlt_properties_set_position( properties, "out", 1799999 );
-                       mlt_properties_set_position( properties, "length", 1800000 );
-                       mlt_properties_set_double( properties, "aspect_ratio", 4.0 / 3.0 );
+                       mlt_properties_set_position( properties, "out", 14999 );
+                       mlt_properties_set_position( properties, "length", 15000 );
                        mlt_properties_set( properties, "eof", "pause" );
                        mlt_properties_set( properties, "resource", "<producer>" );
 
@@ -84,6 +90,16 @@ int mlt_producer_init( mlt_producer this, void *child )
        return error;
 }
 
+/** Create a new producer.
+*/
+
+mlt_producer mlt_producer_new( )
+{
+       mlt_producer this = malloc( sizeof( struct mlt_producer_s ) );
+       mlt_producer_init( this, NULL );
+       return this;
+}
+
 /** Get the parent service object.
 */
 
@@ -107,18 +123,19 @@ int mlt_producer_seek( mlt_producer this, mlt_position position )
 {
        // Determine eof handling
        char *eof = mlt_properties_get( mlt_producer_properties( this ), "eof" );
+       int use_points = 1 - mlt_properties_get_int( mlt_producer_properties( this ), "ignore_points" );
 
        // Check bounds
        if ( position < 0 )
        {
                position = 0;
        }
-       else if ( !strcmp( eof, "pause" ) && position >= mlt_producer_get_playtime( this ) )
+       else if ( use_points && !strcmp( eof, "pause" ) && position >= mlt_producer_get_playtime( this ) )
        {
                mlt_producer_set_speed( this, 0 );
                position = mlt_producer_get_playtime( this ) - 1;
        }
-       else if ( !strcmp( eof, "loop" ) && position >= mlt_producer_get_playtime( this ) )
+       else if ( use_points && !strcmp( eof, "loop" ) && position >= mlt_producer_get_playtime( this ) )
        {
                position = position % mlt_producer_get_playtime( this );
        }
@@ -127,7 +144,7 @@ int mlt_producer_seek( mlt_producer this, mlt_position position )
        mlt_properties_set_position( mlt_producer_properties( this ), "_position", position );
 
        // Calculate the absolute frame
-       mlt_properties_set_position( mlt_producer_properties( this ), "_frame", mlt_producer_get_in( this ) + position );
+       mlt_properties_set_position( mlt_producer_properties( this ), "_frame", use_points * mlt_producer_get_in( this ) + position );
 
        return 0;
 }