X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Ffrei0r%2Ffactory.c;h=132123f4a9e3fe16716071877db74faa571ade0b;hb=b9402bbbbcc5c6569d55700564275f59cd9e2242;hp=52eb9bb60e81244d7beb68806ea9b90431ec6c1e;hpb=c079de116b132025ee09e8766d773424f17605e9;p=melted

diff --git a/src/modules/frei0r/factory.c b/src/modules/frei0r/factory.c
index 52eb9bb..132123f 100644
--- a/src/modules/frei0r/factory.c
+++ b/src/modules/frei0r/factory.c
@@ -23,10 +23,14 @@
 
 #include <stddef.h>
 #include <stdio.h>
+#include <sys/stat.h>
 #include <sys/types.h>
 #include <dirent.h>
 #include <dlfcn.h>
 #include <stdlib.h>
+#include <limits.h>
+
+#define FREI0R_PLUGIN_PATH "/usr/lib/frei0r-1:/usr/local/lib/frei0r-1:/opt/local/lib/frei0r-1"
 
 extern mlt_filter filter_frei0r_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg );
 extern mlt_frame filter_process( mlt_filter this, mlt_frame frame );
@@ -34,63 +38,81 @@ extern void filter_close( mlt_filter this );
 extern void transition_close( mlt_transition this );
 extern mlt_frame transition_process( mlt_transition transition, mlt_frame a_frame, mlt_frame b_frame );
 
-void fill_param_info ( mlt_repository repository , void* handle, f0r_plugin_info_t* info , mlt_service_type type , char* name ) {
-	
-	int j=0;
-	void (*param_info)(f0r_param_info_t*,int param_index)=dlsym(handle,"f0r_get_param_info");
-	mlt_properties metadata_properties=NULL;
-	switch (type){
+static mlt_properties fill_param_info ( mlt_service_type type, const char *service_name, char *name )
+{
+	char file[ PATH_MAX ];
+	char servicetype[ 1024 ]="";
+	struct stat stat_buff;
+
+	switch ( type ) {
 		case filter_type:
-			metadata_properties=mlt_repository_filters(repository);
+			strcpy ( servicetype , "filter" );
+			break;
+		case transition_type:
+			strcpy ( servicetype , "transition" ) ;
 			break;
 		default:
-			metadata_properties=NULL;
-	}
-	
-	if (!metadata_properties){
-		return;
+			strcpy ( servicetype , "" );
+	};
+
+	snprintf( file, PATH_MAX, "%s/frei0r/%s_%s.yml", mlt_environment( "MLT_DATA" ), servicetype, service_name );
+	stat(file,&stat_buff);
+
+	if (S_ISREG(stat_buff.st_mode)){
+		return mlt_properties_parse_yaml( file );
 	}
-	
-	mlt_properties this_item_properties = mlt_properties_get_data( metadata_properties , name , NULL );
-	mlt_properties metadata = mlt_properties_get_data( this_item_properties , "metadata" , NULL );
-	if (!metadata){
-		metadata = mlt_properties_new( );
-		mlt_properties_set_data( this_item_properties , "metadata" , metadata , 0 , NULL, NULL );
+
+	void* handle=dlopen(name,RTLD_LAZY);
+	if (!handle) return NULL;
+	void (*plginfo)(f0r_plugin_info_t*)=dlsym(handle,"f0r_get_plugin_info");
+	void (*param_info)(f0r_param_info_t*,int param_index)=dlsym(handle,"f0r_get_param_info");
+	if (!plginfo || !param_info) {
+		dlclose(handle);
+		return NULL;
 	}
-	char descstr[2048];
-	snprintf ( descstr, 2048 , "%s (Version: %d.%d)" , info->explanation , info->major_version , info->minor_version );
-	mlt_properties_set ( metadata, "title" , info->name );
-	mlt_properties_set ( metadata, "identifier" , name );
-	mlt_properties_set ( metadata, "description" , descstr );
-	mlt_properties_set ( metadata, "creator" , info->author );
-	
-	mlt_properties parameter = mlt_properties_get_data( metadata , "parameters" , NULL );
-	
-	if (!parameter){
-		parameter = mlt_properties_new ( );
-		mlt_properties_set_data ( metadata , "parameters" , parameter , 0 , NULL, NULL );
+	mlt_properties metadata = mlt_properties_new();
+	f0r_plugin_info_t info;
+	char string[48];
+	int j=0;
+
+	plginfo(&info);
+	snprintf ( string, sizeof(string) , "%d.%d" , info.major_version , info.minor_version );
+	mlt_properties_set ( metadata, "schema_version" , "0.1" );
+	mlt_properties_set ( metadata, "title" , info.name );
+	mlt_properties_set ( metadata, "version", string );
+	mlt_properties_set ( metadata, "identifier" , service_name );
+	mlt_properties_set ( metadata, "description" , info.explanation );
+	mlt_properties_set ( metadata, "creator" , info.author );
+	switch (type){
+		case filter_type:
+			mlt_properties_set ( metadata, "type" , "filter" );
+			break;
+		case transition_type:
+			mlt_properties_set ( metadata, "type" , "transition" );
+			break;
+		default:
+			break;
 	}
-	
-	char numstr[512];
-	
-	for (j=0;j<info->num_params;j++){
-		snprintf ( numstr , 512 , "%d" , j );
-		mlt_properties pnum = mlt_properties_get_data( metadata , numstr , NULL );
-		if (!pnum){
-			pnum = mlt_properties_new ( );
-			mlt_properties_set_data ( parameter , numstr , pnum , 0 , NULL, NULL );
-		}
-		
+
+	mlt_properties parameter = mlt_properties_new ( );
+	mlt_properties_set_data ( metadata , "parameters" , parameter , 0 , ( mlt_destructor )mlt_properties_close, NULL );
+	mlt_properties tags = mlt_properties_new ( );
+	mlt_properties_set_data ( metadata , "tags" , tags , 0 , ( mlt_destructor )mlt_properties_close, NULL );
+	mlt_properties_set ( tags , "0" , "Video" );
+
+	for (j=0;j<info.num_params;j++){
+		snprintf ( string , sizeof(string), "%d" , j );
+		mlt_properties pnum = mlt_properties_new ( );
+		mlt_properties_set_data ( parameter , string , pnum , 0 , ( mlt_destructor )mlt_properties_close, NULL );
 		f0r_param_info_t paraminfo;
 		param_info(&paraminfo,j);
 		mlt_properties_set ( pnum , "identifier" , paraminfo.name );
 		mlt_properties_set ( pnum , "title" , paraminfo.name );
 		mlt_properties_set ( pnum , "description" , paraminfo.explanation);
-		
 		if ( paraminfo.type == F0R_PARAM_DOUBLE ){
-			mlt_properties_set ( pnum , "type" , "integer" );
+			mlt_properties_set ( pnum , "type" , "float" );
 			mlt_properties_set ( pnum , "minimum" , "0" );
-			mlt_properties_set ( pnum , "maximum" , "1000" );
+			mlt_properties_set ( pnum , "maximum" , "1" );
 			mlt_properties_set ( pnum , "readonly" , "no" );
 			mlt_properties_set ( pnum , "widget" , "spinner" );
 		}else
@@ -100,15 +122,23 @@ void fill_param_info ( mlt_repository repository , void* handle, f0r_plugin_info
 			mlt_properties_set ( pnum , "maximum" , "1" );
 			mlt_properties_set ( pnum , "readonly" , "no" );
 		}else
+		if ( paraminfo.type == F0R_PARAM_COLOR ){
+			mlt_properties_set ( pnum , "type" , "color" );
+			mlt_properties_set ( pnum , "readonly" , "no" );
+		}else
 		if ( paraminfo.type == F0R_PARAM_STRING ){
 			mlt_properties_set ( pnum , "type" , "string" );
 			mlt_properties_set ( pnum , "readonly" , "no" );
 		}
 	}
+	dlclose(handle);
+	free(name);
+
+	return metadata;
 }
 
-void * load_lib(  mlt_profile profile, mlt_service_type type , void* handle){
-	
+static void * load_lib(  mlt_profile profile, mlt_service_type type , void* handle){
+
 	int i=0;
 	void (*f0r_get_plugin_info)(f0r_plugin_info_t*),
 		*f0r_construct , *f0r_update , *f0r_destruct,
@@ -118,41 +148,41 @@ void * load_lib(  mlt_profile profile, mlt_service_type type , void* handle){
 		(*f0r_get_param_value)(f0r_instance_t instance, f0r_param_t param, int param_index),
 		(*f0r_update2) (f0r_instance_t instance, double time,	const uint32_t* inframe1,
 		  const uint32_t* inframe2,const uint32_t* inframe3, uint32_t* outframe);
-				
-	if ( ( f0r_construct = dlsym(handle, "f0r_construct") ) && 
-				(f0r_update = dlsym(handle,"f0r_update") ) && 
-				(f0r_destruct = dlsym(handle,"f0r_destruct") ) && 
-				(f0r_get_plugin_info = dlsym(handle,"f0r_get_plugin_info") ) && 
-				(f0r_get_param_info = dlsym(handle,"f0r_get_param_info") ) && 
+
+	if ( ( f0r_construct = dlsym(handle, "f0r_construct") ) &&
+				(f0r_update = dlsym(handle,"f0r_update") ) &&
+				(f0r_destruct = dlsym(handle,"f0r_destruct") ) &&
+				(f0r_get_plugin_info = dlsym(handle,"f0r_get_plugin_info") ) &&
+				(f0r_get_param_info = dlsym(handle,"f0r_get_param_info") ) &&
 				(f0r_set_param_value= dlsym(handle,"f0r_set_param_value" ) ) &&
 				(f0r_get_param_value= dlsym(handle,"f0r_get_param_value" ) ) &&
 				(f0r_init= dlsym(handle,"f0r_init" ) ) &&
-				(f0r_deinit= dlsym(handle,"f0r_deinit" ) ) 
+				(f0r_deinit= dlsym(handle,"f0r_deinit" ) )
 		){
-	
+
 		f0r_update2=dlsym(handle,"f0r_update2");
-		
+
 		f0r_plugin_info_t info;
 		f0r_get_plugin_info(&info);
-		
-		void* ret=NULL;	
+
+		void* ret=NULL;
 		mlt_properties properties=NULL;
-		
+
 		if (type == filter_type && info.plugin_type == F0R_PLUGIN_TYPE_FILTER ){
 			mlt_filter this = mlt_filter_new( );
 			if ( this != NULL )
 			{
 				this->process = filter_process;
-				this->close = filter_close;			
+				this->close = filter_close;
 				f0r_init();
 				properties=MLT_FILTER_PROPERTIES ( this );
-							
+
 				for (i=0;i<info.num_params;i++){
 					f0r_param_info_t pinfo;
 					f0r_get_param_info(&pinfo,i);
-					
+
 				}
-				
+
 				ret=this;
 			}
 		}else if (type == transition_type && info.plugin_type == F0R_PLUGIN_TYPE_MIXER2){
@@ -178,8 +208,8 @@ void * load_lib(  mlt_profile profile, mlt_service_type type , void* handle){
 		mlt_properties_set_data(properties, "f0r_get_param_info", f0r_get_param_info , sizeof(void*),NULL,NULL);
 		mlt_properties_set_data(properties, "f0r_set_param_value", f0r_set_param_value , sizeof(void*),NULL,NULL);
 		mlt_properties_set_data(properties, "f0r_get_param_value", f0r_get_param_value , sizeof(void*),NULL,NULL);
-		
-		
+
+
 		return ret;
 	}else{
 		printf("some was wrong\n");
@@ -188,28 +218,28 @@ void * load_lib(  mlt_profile profile, mlt_service_type type , void* handle){
 	return NULL;
 }
 
-void * create_frei0r_item ( mlt_profile profile, mlt_service_type type, const char *id, void *arg){
+static void * create_frei0r_item ( mlt_profile profile, mlt_service_type type, const char *id, void *arg){
 
 	mlt_tokeniser tokeniser = mlt_tokeniser_init ( );
 	int dircount=mlt_tokeniser_parse_new (
-		tokeniser ,
-		getenv("MLT_FREI0R_PLUGIN_PATH") ? getenv("MLT_FREI0R_PLUGIN_PATH") : "/usr/lib/frei0r-1" ,
+		tokeniser,
+		getenv("MLT_FREI0R_PLUGIN_PATH") ? getenv("MLT_FREI0R_PLUGIN_PATH") : FREI0R_PLUGIN_PATH,
 		 ":"
 	);
 	void* ret=NULL;
 	while (dircount--){
 		char soname[1024]="";
-		
-		char *save_firstptr;
+
+		char *save_firstptr = NULL;
 		char *firstname=strtok_r(strdup(id),".",&save_firstptr);
-		
+
 		firstname=strtok_r(NULL,".",&save_firstptr);
 		sprintf(soname,"%s/%s.so", mlt_tokeniser_get_string( tokeniser , dircount ) , firstname );
 
 		if (firstname){
-			
+
 			void* handle=dlopen(soname,RTLD_LAZY);
-			
+
 			if (handle ){
 				ret=load_lib ( profile , type , handle );
 			}else{
@@ -228,44 +258,44 @@ MLT_REPOSITORY
 	mlt_tokeniser tokeniser = mlt_tokeniser_init ( );
 	int dircount=mlt_tokeniser_parse_new (
 		tokeniser ,
-   	getenv("MLT_FREI0R_PLUGIN_PATH") ? getenv("MLT_FREI0R_PLUGIN_PATH") : "/usr/lib/frei0r-1" ,
+   	getenv("MLT_FREI0R_PLUGIN_PATH") ? getenv("MLT_FREI0R_PLUGIN_PATH") : FREI0R_PLUGIN_PATH,
 		":"
 	);
-	
+
 	while (dircount--){
-		
+
 		mlt_properties direntries = mlt_properties_new();
 		char* dirname = mlt_tokeniser_get_string ( tokeniser , dircount ) ;
 		mlt_properties_dir_list(direntries, dirname ,"*.so",1);
-	
+
 		for (i=0;i<mlt_properties_count(direntries);i++){
-			char* name=mlt_properties_get_value(direntries,i);	
+			char* name=mlt_properties_get_value(direntries,i);
 			char* shortname=name+strlen(dirname)+1;
 			char fname[1024]="";
-			
+
 			strcat(fname,dirname);
 			strcat(fname,shortname);
-			
-			char *save_firstptr;
+
+			char *save_firstptr = NULL;
 			char pluginname[1024]="frei0r.";
 			char* firstname = strtok_r ( shortname , "." , &save_firstptr );
 			strcat(pluginname,firstname);
-	
+
 			void* handle=dlopen(strcat(name,".so"),RTLD_LAZY);
 			if (handle){
 				void (*plginfo)(f0r_plugin_info_t*)=dlsym(handle,"f0r_get_plugin_info");
-				
+
 				if (plginfo){
 					f0r_plugin_info_t info;
 					plginfo(&info);
-					
+
 					if (firstname && info.plugin_type==F0R_PLUGIN_TYPE_FILTER){
 						MLT_REGISTER( filter_type, pluginname, create_frei0r_item );
-						fill_param_info ( repository , handle, &info , filter_type , pluginname );
+						MLT_REGISTER_METADATA( filter_type, pluginname, fill_param_info, strdup(name) );
 					}
 					else if (firstname && info.plugin_type==F0R_PLUGIN_TYPE_MIXER2 ){
 						MLT_REGISTER( transition_type, pluginname, create_frei0r_item );
-						fill_param_info ( repository , handle, &info , transition_type , pluginname );
+						MLT_REGISTER_METADATA( transition_type, pluginname, fill_param_info, strdup(name) );
 					}
 				}
 				dlclose(handle);