X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_property.h;h=f33aa88213e3b3ff8349a729345961b9263b61c4;hb=ced3d0b8c0520e4c8208166e3218e0caacba1efa;hp=3f59ad27e630c68b032e73bfd226545f79c9100e;hpb=7c518e80321a87a22d2e48835442c9f5b70dcd17;p=melted

diff --git a/src/framework/mlt_property.h b/src/framework/mlt_property.h
index 3f59ad2..f33aa88 100644
--- a/src/framework/mlt_property.h
+++ b/src/framework/mlt_property.h
@@ -1,21 +1,24 @@
-/*
- * mlt_property.h -- property class
- * Copyright (C) 2003-2004 Ushodaya Enterprises Limited
- * Author: Charles Yates <charles.yates@pandora.be>
+/**
+ * \file mlt_property.h
+ * \brief Property class declaration
+ * \see mlt_property_s
  *
- * 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.
+ * Copyright (C) 2003-2009 Ushodaya Enterprises Limited
+ * \author Charles Yates <charles.yates@pandora.be>
  *
- * This program is distributed in the hope that it will be useful,
+ * 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 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_
@@ -23,64 +26,21 @@
 
 #include "mlt_types.h"
 
-/** Bit pattern for properties.
-*/
-
-typedef enum
-{
-	mlt_prop_none = 0,
-	mlt_prop_int = 1,
-	mlt_prop_string = 2,
-	mlt_prop_position = 4,
-	mlt_prop_double = 8,
-	mlt_prop_data = 16,
-	mlt_prop_int64 = 32
-}
-mlt_property_type;
-
-/** Property structure.
-*/
-
-typedef struct mlt_property_s
-{
-	// Stores a bit pattern of types available for this property
-	mlt_property_type types;
-
-	// Atomic type handling
-	int prop_int;
-	mlt_position prop_position;
-	double prop_double;
-	int64_t prop_int64;
-
-	// String handling
-	char *prop_string;
-
-	// Generic type handling
-	void *data;
-	int length;
-	mlt_destructor destructor;
-	mlt_serialiser serialiser;
-}
-*mlt_property;
-
-/** API
-*/
-
 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_position( mlt_property this, mlt_position 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_position mlt_property_get_position( 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
-