X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_factory.c;fp=src%2Fframework%2Fmlt_factory.c;h=d81c0c231d864651cc3a550332dbe7325b5a4a83;hb=a162148e8a943e50f41941104b6c418ac8b95236;hp=4a14decc98ef02ed28e9335b81a629522d68ca7a;hpb=9bee7421e4b65a36f9977482a88027e8a5260eeb;p=melted diff --git a/src/framework/mlt_factory.c b/src/framework/mlt_factory.c index 4a14dec..d81c0c2 100644 --- a/src/framework/mlt_factory.c +++ b/src/framework/mlt_factory.c @@ -18,7 +18,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "config.h" #include "mlt.h" #include "mlt_repository.h" @@ -26,6 +25,9 @@ #include #include +#define PREFIX_LIB LIBDIR "/mlt" +#define PREFIX_DATA PREFIX "/share/mlt" + /** Singleton repositories */ @@ -68,7 +70,7 @@ int mlt_factory_init( const char *prefix ) // If no directory is specified, default to install directory if ( prefix == NULL ) - prefix = PREFIX_DATA; + prefix = PREFIX_LIB; // Store the prefix for later retrieval mlt_prefix = strdup( prefix ); @@ -112,6 +114,7 @@ int mlt_factory_init( const char *prefix ) 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" ) ); mlt_properties_set_or_default( global_properties, "MLT_PROFILE", getenv( "MLT_PROFILE" ), "dv_pal" ); + mlt_properties_set_or_default( global_properties, "MLT_DATA", getenv( "MLT_DATA" ), PREFIX_DATA ); }