X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_property.h;h=fcf15c183ef04d97e76fbabdd32ef6b3f6993acb;hb=1971a6aa9301e7c841b7dda42eab6fff7d69763c;hp=8b6a0e99ecc9e827c5d42069b77feb672a5a2c41;hpb=206ff6b48bd54bee6d1ac679c352296f374c7590;p=melted diff --git a/src/framework/mlt_property.h b/src/framework/mlt_property.h index 8b6a0e9..fcf15c1 100644 --- a/src/framework/mlt_property.h +++ b/src/framework/mlt_property.h @@ -1,21 +1,23 @@ -/* - * mlt_property.h -- property class - * Copyright (C) 2003-2004 Ushodaya Enterprises Limited - * Author: Charles Yates +/** + * \file mlt_property.h + * \brief Property class declaration * - * 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-2008 Ushodaya Enterprises Limited + * \author Charles Yates * - * 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,49 +25,6 @@ #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 int mlt_property_set_int( mlt_property self, int value ); extern int mlt_property_set_double( mlt_property self, double value ); @@ -84,4 +43,3 @@ extern void mlt_property_close( mlt_property self ); extern void mlt_property_pass( mlt_property this, mlt_property that ); #endif -