X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_producer.c;h=56d1d3f36fa8d935b03abae7341670264bb91730;hb=40b169c095486ba1b868486eb98a47c41f36ce8c;hp=f3233f92087b8f21fecf36ca7905440276a26399;hpb=efd5f25f6fe70f75f9787e9c7f2b53730ecf6048;p=melted

diff --git a/src/framework/mlt_producer.c b/src/framework/mlt_producer.c
index f3233f9..56d1d3f 100644
--- a/src/framework/mlt_producer.c
+++ b/src/framework/mlt_producer.c
@@ -3,19 +3,19 @@
  * Copyright (C) 2003-2004 Ushodaya Enterprises Limited
  * Author: Charles Yates <charles.yates@pandora.be>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -23,6 +23,8 @@
 #include "mlt_factory.h"
 #include "mlt_frame.h"
 #include "mlt_parser.h"
+#include "mlt_profile.h"
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -66,9 +68,6 @@ int mlt_producer_init( mlt_producer this, void *child )
 		// Initialise the service
 		if ( mlt_service_init( &this->parent, this ) == 0 )
 		{
-			// Get the normalisation preference
-			char *normalisation = mlt_environment( "MLT_NORMALISATION" );
-
 			// The parent is the service
 			mlt_service parent = &this->parent;
 	
@@ -86,20 +85,10 @@ int mlt_producer_init( mlt_producer this, void *child )
 			mlt_properties_set( properties, "mlt_type", "mlt_producer" );
 			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_int( properties, "frame_rate_num", 25 );
-				mlt_properties_set_int( properties, "frame_rate_den", 1 );
-				mlt_properties_set_double( properties, "aspect_ratio", 59.0 / 54.0 );
-			}
-			else
-			{
-				mlt_properties_set_double( properties, "fps", 30000.0 / 1001.0 );
-				mlt_properties_set_int( properties, "frame_rate_num", 30000 );
-				mlt_properties_set_int( properties, "frame_rate_den", 1001 );
-				mlt_properties_set_double( properties, "aspect_ratio", 10.0 / 11.0 );
-			}
+			mlt_properties_set_double( properties, "fps", mlt_profile_fps( NULL ) );
+			mlt_properties_set_int( properties, "frame_rate_num", mlt_profile_get()->frame_rate_num );
+			mlt_properties_set_int( properties, "frame_rate_den", mlt_profile_get()->frame_rate_den );
+			mlt_properties_set_double( properties, "aspect_ratio", mlt_profile_sar( NULL ) );
 			mlt_properties_set_double( properties, "_speed", 1.0 );
 			mlt_properties_set_position( properties, "in", 0 );
 			mlt_properties_set_position( properties, "out", 14999 );
@@ -205,14 +194,9 @@ mlt_producer mlt_producer_cut( mlt_producer this, int in, int out )
 	mlt_properties_set_int( properties, "_cut", 1 );
 	mlt_properties_set_data( properties, "_cut_parent", parent, 0, ( mlt_destructor )mlt_producer_close, NULL );
 	mlt_properties_set_position( properties, "length", mlt_properties_get_position( parent_props, "length" ) );
+	mlt_properties_set_double( properties, "aspect_ratio", mlt_properties_get_double( parent_props, "aspect_ratio" ) );
 	mlt_producer_set_in_and_out( result, in, out );
 
-	// Mini fezzik :-/
-	mlt_filter filter = mlt_factory_filter( "data_feed", "attr_check" );
-	mlt_properties_set_int( MLT_FILTER_PROPERTIES( filter ), "_fezzik", 1 );
-	mlt_producer_attach( result, filter );
-	mlt_filter_close( filter );
-
 	return result;
 }
 
@@ -252,14 +236,14 @@ int mlt_producer_seek( mlt_producer this, mlt_position position )
 	{
 		position = 0;
 	}
-	else if ( use_points && !strcmp( eof, "pause" ) && position >= mlt_producer_get_playtime( this ) )
+	else if ( use_points && ( eof == NULL || !strcmp( eof, "pause" ) ) && position >= mlt_producer_get_playtime( this ) )
 	{
 		mlt_producer_set_speed( this, 0 );
 		position = mlt_producer_get_playtime( this ) - 1;
 	}
 	else if ( use_points && !strcmp( eof, "loop" ) && position >= mlt_producer_get_playtime( this ) )
 	{
-		position = position % mlt_producer_get_playtime( this );
+		position = (int)position % (int)mlt_producer_get_playtime( this );
 	}
 
 	// Set the position