Cleanup license declarations and remove dv1394d references.

[melted] / src / framework / mlt_property.h

diff --git a/src/framework/mlt_property.h b/src/framework/mlt_property.h
index 8fb209c..01d0729 100644 (file)
--- 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,9 +31,10 @@ 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_data = 16,
+       mlt_prop_int64 = 32
 }
 mlt_property_type;
 
@@ -47,8 +48,9 @@ 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;
 
        // String handling
        char *prop_string;
@@ -65,18 +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_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 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