* 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 "mlt_repository.h"
struct mlt_repository_s
{
struct mlt_properties_s parent;
- mlt_properties object_list;
};
-static char *construct_full_file( char *output, char *prefix, char *file )
+static char *construct_full_file( char *output, const char *prefix, const char *file )
{
strcpy( output, prefix );
if ( prefix[ strlen( prefix ) - 1 ] != '/' )
return input;
}
-static mlt_properties construct_object( char *prefix, char *id )
+static mlt_properties construct_object( const char *prefix, const char *id )
{
mlt_properties output = mlt_properties_new( );
- mlt_properties_init( output, NULL );
mlt_properties_set( output, "prefix", prefix );
mlt_properties_set( output, "id", id );
return output;
}
-static mlt_properties construct_service( mlt_properties object, char *id )
+static mlt_properties construct_service( mlt_properties object, const char *id )
{
mlt_properties output = mlt_properties_new( );
- mlt_properties_init( output, NULL );
mlt_properties_set_data( output, "object", object, 0, NULL, NULL );
mlt_properties_set( output, "id", id );
return output;
}
-static void *construct_instance( mlt_properties service_properties, char *symbol, void *input )
+static void *construct_instance( mlt_properties service_properties, const char *symbol, void *input )
{
// Extract the service
char *service = mlt_properties_get( service_properties, "id" );
void *object = mlt_properties_get_data( object_properties, "dlopen", NULL );
// Get the dlsym'd symbol
- void *( *symbol_ptr )( char *, void * ) = mlt_properties_get_data( object_properties, symbol, NULL );
+ void *( *symbol_ptr )( const char *, void * ) = mlt_properties_get_data( object_properties, symbol, NULL );
// Check that we have object and open if we don't
if ( object == NULL )
// Get the prefix and id of the shared object
char *prefix = mlt_properties_get( object_properties, "prefix" );
char *file = mlt_properties_get( object_properties, "id" );
+ int flags = RTLD_NOW;
+
+ // Very temporary hack to allow the quicktime plugins to work
+ // TODO: extend repository to allow this to be used on a case by case basis
+ if ( !strcmp( service, "kino" ) )
+ flags |= RTLD_GLOBAL;
// Construct the full file
construct_full_file( full_file, prefix, file );
// Open the shared object
- object = dlopen( full_file, RTLD_NOW | RTLD_GLOBAL );
- if ( object == NULL )
+ object = dlopen( full_file, flags );
+ if ( object != NULL )
+ {
+ // Set it on the properties
+ mlt_properties_set_data( object_properties, "dlopen", object, 0, ( mlt_destructor )dlclose, NULL );
+ }
+ else
+ {
fprintf( stderr, "Failed to load plugin: %s\n", dlerror() );
-
- // Set it on the properties
- mlt_properties_set_data( object_properties, "dlopen", object, 0, ( void (*)( void * ) )dlclose, NULL );
+ }
}
// Now check if we have this symbol pointer
return symbol_ptr != NULL ? symbol_ptr( service, input ) : NULL;
}
-mlt_repository mlt_repository_init( mlt_properties object_list, char *prefix, char *data, char *symbol )
+mlt_repository mlt_repository_init( mlt_properties object_list, const char *prefix, const char *data, const char *symbol )
{
char full_file[ 512 ];
FILE *file;
// Add the symbol to THIS repository properties.
mlt_properties_set( &this->parent, "_symbol", symbol );
- // Asociate the repository to the global object_list
- this->object_list = object_list;
-
// Construct full file
construct_full_file( full_file, prefix, data );
+ strcat( full_file, ".dat" );
// Open the file
file = fopen( full_file, "r" );
return this;
}
-void *mlt_repository_fetch( mlt_repository this, char *service, void *input )
+void *mlt_repository_fetch( mlt_repository this, const char *service, void *input )
{
// Get the service properties
mlt_properties service_properties = mlt_properties_get_data( &this->parent, service, NULL );
projects / mlt / blobdiff