From 7c7660adaec5af1751f29782e44c0eb1a1fbe34d Mon Sep 17 00:00:00 2001 From: Dan Dennedy Date: Sun, 30 Mar 2014 20:23:54 -0700 Subject: [PATCH] Prevent making consumer qglsl if glslManager already exists. With Qt 4 version of qt module, if -consumer qglsl was specified on melt command line, then the xml would not load without specifying "xml-nogl" as the service for the resource. This prevents the need to invoke that. --- src/modules/xml/producer_xml.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/modules/xml/producer_xml.c b/src/modules/xml/producer_xml.c index 086657f4..fdaa7dee 100644 --- a/src/modules/xml/producer_xml.c +++ b/src/modules/xml/producer_xml.c @@ -1751,7 +1751,9 @@ mlt_producer producer_xml_init( mlt_profile profile, mlt_service_type servtype, // may exist when trying to load glsl. or movit. services. // The "if requested" part can come from query string qglsl=1 or when // a service beginning with glsl. or movit. appears in the XML. - if ( mlt_properties_get_int( context->params, "qglsl" ) && strcmp( id, "xml-nogl" ) ) + if ( mlt_properties_get_int( context->params, "qglsl" ) && strcmp( id, "xml-nogl" ) + // Only if glslManager does not yet exist. + && !mlt_properties_get_data( mlt_global_properties(), "glslManager", NULL ) ) context->qglsl = mlt_factory_consumer( profile, "qglsl", NULL ); // Setup SAX callbacks for second pass -- 2.39.2