* 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"
/** Construct the factories.
*/
-int mlt_factory_init( char *prefix )
+int mlt_factory_init( const char *prefix )
{
// Only initialise once
if ( mlt_prefix == NULL )
// Create the global properties
global_properties = mlt_properties_new( );
- mlt_properties_set_or_default( global_properties, "MLT_NORMALISATION", getenv( "MLT_NORMALISATION" ), "PAL" );
- mlt_properties_set_or_default( global_properties, "MLT_PRODUCER", getenv( "MLT_PRODUCER" ), "fezzik" );
- mlt_properties_set_or_default( global_properties, "MLT_CONSUMER", getenv( "MLT_CONSUMER" ), "sdl" );
- mlt_properties_set( global_properties, "MLT_TEST_CARD", getenv( "MLT_TEST_CARD" ) );
// Create the object list.
object_list = mlt_properties_new( );
atexit( mlt_factory_close );
}
+ // Allow property refresh on a subsequent initialisation
+ if ( global_properties != NULL )
+ {
+ mlt_properties_set_or_default( global_properties, "MLT_NORMALISATION", getenv( "MLT_NORMALISATION" ), "PAL" );
+ mlt_properties_set_or_default( global_properties, "MLT_PRODUCER", getenv( "MLT_PRODUCER" ), "fezzik" );
+ mlt_properties_set_or_default( global_properties, "MLT_CONSUMER", getenv( "MLT_CONSUMER" ), "sdl" );
+ mlt_properties_set( global_properties, "MLT_TEST_CARD", getenv( "MLT_TEST_CARD" ) );
+ }
+
return 0;
}
/** Get a value from the environment.
*/
-char *mlt_environment( char *name )
+char *mlt_environment( const char *name )
{
return mlt_properties_get( global_properties, name );
}
/** Fetch a producer from the repository.
*/
-mlt_producer mlt_factory_producer( char *service, void *input )
+mlt_producer mlt_factory_producer( const char *service, void *input )
{
mlt_producer obj = NULL;
mlt_events_fire( event_object, "producer-create-done", service, input, obj, NULL );
if ( obj != NULL )
{
- mlt_properties properties = mlt_producer_properties( obj );
+ mlt_properties properties = MLT_PRODUCER_PROPERTIES( obj );
mlt_properties_set_int( properties, "_unique_id", ++ unique_id );
mlt_properties_set( properties, "mlt_type", "producer" );
if ( mlt_properties_get_int( properties, "_mlt_service_hidden" ) == 0 )
/** Fetch a filter from the repository.
*/
-mlt_filter mlt_factory_filter( char *service, void *input )
+mlt_filter mlt_factory_filter( const char *service, void *input )
{
mlt_filter obj = NULL;
if ( obj != NULL )
{
- mlt_properties properties = mlt_filter_properties( obj );
+ mlt_properties properties = MLT_FILTER_PROPERTIES( obj );
mlt_properties_set_int( properties, "_unique_id", ++ unique_id );
mlt_properties_set( properties, "mlt_type", "filter" );
mlt_properties_set( properties, "mlt_service", service );
/** Fetch a transition from the repository.
*/
-mlt_transition mlt_factory_transition( char *service, void *input )
+mlt_transition mlt_factory_transition( const char *service, void *input )
{
mlt_transition obj = NULL;
if ( obj != NULL )
{
- mlt_properties properties = mlt_transition_properties( obj );
+ mlt_properties properties = MLT_TRANSITION_PROPERTIES( obj );
mlt_properties_set_int( properties, "_unique_id", ++ unique_id );
mlt_properties_set( properties, "mlt_type", "transition" );
mlt_properties_set( properties, "mlt_service", service );
/** Fetch a consumer from the repository
*/
-mlt_consumer mlt_factory_consumer( char *service, void *input )
+mlt_consumer mlt_factory_consumer( const char *service, void *input )
{
mlt_consumer obj = NULL;
if ( obj != NULL )
{
mlt_filter filter = mlt_factory_filter( "data_show", NULL );
- mlt_properties properties = mlt_consumer_properties( obj );
+ mlt_properties properties = MLT_CONSUMER_PROPERTIES( obj );
mlt_properties_set_int( properties, "_unique_id", ++ unique_id );
mlt_properties_set( properties, "mlt_type", "consumer" );
mlt_properties_set( properties, "mlt_service", service );
- mlt_service_attach( mlt_consumer_service( obj ), filter );
+ mlt_service_attach( MLT_CONSUMER_SERVICE( obj ), filter );
mlt_filter_close( filter );
}
return obj;
projects / melted / blobdiff