X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_property.h;h=01d0729a2e60a778380dd00958bc9093cab93b19;hb=9bee7421e4b65a36f9977482a88027e8a5260eeb;hp=6b0def55d781c7dbf0d50342843a05c1a328aa3c;hpb=80a5c8297b313b09add80814a637a71ba9e0fa05;p=melted

diff --git a/src/framework/mlt_property.h b/src/framework/mlt_property.h
index 6b0def5..01d0729 100644
--- a/src/framework/mlt_property.h
+++ b/src/framework/mlt_property.h
@@ -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
  */
 
 #ifndef _MLT_PROPERTY_H_
@@ -31,7 +31,7 @@ typedef enum
 	mlt_prop_none = 0,
 	mlt_prop_int = 1,
 	mlt_prop_string = 2,
-	mlt_prop_timecode = 4,
+	mlt_prop_position = 4,
 	mlt_prop_double = 8,
 	mlt_prop_data = 16,
 	mlt_prop_int64 = 32
@@ -48,7 +48,7 @@ typedef struct mlt_property_s
 
 	// Atomic type handling
 	int prop_int;
-	mlt_timecode prop_timecode;
+	mlt_position prop_position;
 	double prop_double;
 	int64_t prop_int64;
 
@@ -67,20 +67,21 @@ typedef struct mlt_property_s
 */
 
 extern mlt_property mlt_property_init( );
-extern void mlt_property_clear( mlt_property this );
-extern int mlt_property_set_int( mlt_property this, int value );
-extern int mlt_property_set_double( mlt_property this, double value );
-extern int mlt_property_set_timecode( mlt_property this, mlt_timecode value );
-extern int mlt_property_set_uint64( mlt_property this, uint64_t value );
-extern int mlt_property_set_string( mlt_property this, char *value );
-extern int mlt_property_set_data( mlt_property this, void *value, int length, mlt_destructor destructor, mlt_serialiser serialiser );
-extern int mlt_property_get_int( mlt_property this );
-extern double mlt_property_get_double( mlt_property this );
-extern mlt_timecode mlt_property_get_timecode( mlt_property this );
-extern int64_t mlt_property_get_int64( mlt_property this );
-extern char *mlt_property_get_string( mlt_property this );
-extern void *mlt_property_get_data( mlt_property this, int *length );
-extern void mlt_property_close( mlt_property this );
+extern int mlt_property_set_int( mlt_property self, int value );
+extern int mlt_property_set_double( mlt_property self, double value );
+extern int mlt_property_set_position( mlt_property self, mlt_position value );
+extern int mlt_property_set_int64( mlt_property self, int64_t value );
+extern int mlt_property_set_string( mlt_property self, const char *value );
+extern int mlt_property_set_data( mlt_property self, void *value, int length, mlt_destructor destructor, mlt_serialiser serialiser );
+extern int mlt_property_get_int( mlt_property self );
+extern double mlt_property_get_double( mlt_property self );
+extern mlt_position mlt_property_get_position( mlt_property self );
+extern int64_t mlt_property_get_int64( mlt_property self );
+extern char *mlt_property_get_string( mlt_property self );
+extern void *mlt_property_get_data( mlt_property self, int *length );
+extern void mlt_property_close( mlt_property self );
+
+extern void mlt_property_pass( mlt_property this, mlt_property that );
 
 #endif