* Copyright (C) 2003-2004 Ushodaya Enterprises Limited
* Author: Dan Dennedy <dan@dennedy.org>
*
- * 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 "consumer_westley.h"
#include <framework/mlt.h>
#include <stdio.h>
#include <stdlib.h>
#define ID_SIZE 128
+#define _x (const xmlChar*)
+#define _s (const char*)
+
// This maintains counters for adding ids to elements
struct serialise_context_s
{
int pass;
mlt_properties hide_map;
char *root;
+ char *store;
};
typedef struct serialise_context_s* serialise_context;
if ( i >= mlt_properties_count( map ) && type != westley_existing )
{
// Attempt to reuse existing id
- id = mlt_properties_get( mlt_service_properties( service ), "id" );
+ id = mlt_properties_get( MLT_SERVICE_PROPERTIES( service ), "id" );
// If no id, or the id is used in the map (for another service), then
// create a new one.
via the argument, but keep it simple.
*/
-mlt_consumer consumer_westley_init( char *arg )
+mlt_consumer consumer_westley_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg )
{
// Create the consumer object
mlt_consumer this = calloc( sizeof( struct mlt_consumer_s ), 1 );
// If no malloc'd and consumer init ok
- if ( this != NULL && mlt_consumer_init( this, NULL ) == 0 )
+ if ( this != NULL && mlt_consumer_init( this, NULL, profile ) == 0 )
{
// Allow thread to be started/stopped
this->start = consumer_start;
this->is_stopped = consumer_is_stopped;
- mlt_properties_set( mlt_consumer_properties( this ), "resource", arg );
+ mlt_properties_set( MLT_CONSUMER_PROPERTIES( this ), "resource", arg );
// Return the consumer produced
return this;
return NULL;
}
-static inline void serialise_properties( serialise_context context, mlt_properties properties, xmlNode *node )
+static void serialise_properties( serialise_context context, mlt_properties properties, xmlNode *node )
{
int i;
xmlNode *p;
strcmp( name, "in" ) != 0 &&
strcmp( name, "out" ) != 0 &&
strcmp( name, "id" ) != 0 &&
+ strcmp( name, "title" ) != 0 &&
strcmp( name, "root" ) != 0 &&
strcmp( name, "width" ) != 0 &&
strcmp( name, "height" ) != 0 )
{
char *value = mlt_properties_get_value( properties, i );
- p = xmlNewChild( node, NULL, "property", NULL );
- xmlNewProp( p, "name", mlt_properties_get_name( properties, i ) );
if ( strcmp( context->root, "" ) && !strncmp( value, context->root, strlen( context->root ) ) )
- xmlNodeSetContent( p, value + strlen( context->root ) + 1 );
- else
- xmlNodeSetContent( p, value );
+ value += strlen( context->root ) + 1;
+ p = xmlNewTextChild( node, NULL, _x("property"), _x(value) );
+ xmlNewProp( p, _x("name"), _x(name) );
+ }
+ }
+}
+
+static void serialise_store_properties( serialise_context context, mlt_properties properties, xmlNode *node, char *store )
+{
+ int i;
+ xmlNode *p;
+
+ // Enumerate the properties
+ for ( i = 0; store != NULL && i < mlt_properties_count( properties ); i++ )
+ {
+ char *name = mlt_properties_get_name( properties, i );
+ if ( !strncmp( name, store, strlen( store ) ) )
+ {
+ char *value = mlt_properties_get_value( properties, i );
+ if ( value != NULL )
+ {
+ if ( strcmp( context->root, "" ) && !strncmp( value, context->root, strlen( context->root ) ) )
+ value += strlen( context->root ) + 1;
+ p = xmlNewTextChild( node, NULL, _x("property"), _x(value) );
+ xmlNewProp( p, _x("name"), _x(name) );
+ }
}
}
}
// Enumerate the filters
for ( i = 0; ( filter = mlt_producer_filter( MLT_PRODUCER( service ), i ) ) != NULL; i ++ )
{
- mlt_properties properties = mlt_filter_properties( filter );
+ mlt_properties properties = MLT_FILTER_PROPERTIES( filter );
if ( mlt_properties_get_int( properties, "_fezzik" ) == 0 )
{
// Get a new id - if already allocated, do nothing
- char *id = westley_get_id( context, mlt_filter_service( filter ), westley_filter );
+ char *id = westley_get_id( context, MLT_FILTER_SERVICE( filter ), westley_filter );
if ( id != NULL )
{
int in = mlt_properties_get_position( properties, "in" );
int out = mlt_properties_get_position( properties, "out" );
- p = xmlNewChild( node, NULL, "filter", NULL );
- xmlNewProp( p, "id", id );
+ p = xmlNewChild( node, NULL, _x("filter"), NULL );
+ xmlNewProp( p, _x("id"), _x(id) );
+ if ( mlt_properties_get( properties, "title" ) )
+ xmlNewProp( p, _x("title"), _x(mlt_properties_get( properties, "title" )) );
if ( in != 0 || out != 0 )
{
char temp[ 20 ];
sprintf( temp, "%d", in );
- xmlNewProp( p, "in", temp );
+ xmlNewProp( p, _x("in"), _x(temp) );
sprintf( temp, "%d", out );
- xmlNewProp( p, "out", temp );
+ xmlNewProp( p, _x("out"), _x(temp) );
}
serialise_properties( context, properties, p );
- serialise_service_filters( context, mlt_filter_service( filter ), p );
+ serialise_service_filters( context, MLT_FILTER_SERVICE( filter ), p );
}
}
}
if ( context->pass == 0 )
{
- mlt_properties properties = mlt_service_properties( parent );
+ mlt_properties properties = MLT_SERVICE_PROPERTIES( parent );
// Get a new id - if already allocated, do nothing
char *id = westley_get_id( context, parent, westley_producer );
if ( id == NULL )
return;
- child = xmlNewChild( node, NULL, "producer", NULL );
+ child = xmlNewChild( node, NULL, _x("producer"), NULL );
// Set the id
- xmlNewProp( child, "id", id );
- xmlNewProp( child, "in", mlt_properties_get( properties, "in" ) );
- xmlNewProp( child, "out", mlt_properties_get( properties, "out" ) );
+ xmlNewProp( child, _x("id"), _x(id) );
+ if ( mlt_properties_get( properties, "title" ) )
+ xmlNewProp( child, _x("title"), _x(mlt_properties_get( properties, "title" )) );
+ xmlNewProp( child, _x("in"), _x(mlt_properties_get( properties, "in" )) );
+ xmlNewProp( child, _x("out"), _x(mlt_properties_get( properties, "out" )) );
serialise_properties( context, properties, child );
serialise_service_filters( context, service, child );
else
{
char *id = westley_get_id( context, parent, westley_existing );
- mlt_properties properties = mlt_service_properties( service );
- xmlNewProp( node, "parent", id );
- xmlNewProp( node, "in", mlt_properties_get( properties, "in" ) );
- xmlNewProp( node, "out", mlt_properties_get( properties, "out" ) );
+ mlt_properties properties = MLT_SERVICE_PROPERTIES( service );
+ xmlNewProp( node, _x("parent"), _x(id) );
+ xmlNewProp( node, _x("in"), _x(mlt_properties_get( properties, "in" )) );
+ xmlNewProp( node, _x("out"), _x(mlt_properties_get( properties, "out" )) );
}
}
+static void serialise_tractor( serialise_context context, mlt_service service, xmlNode *node );
+
static void serialise_multitrack( serialise_context context, mlt_service service, xmlNode *node )
{
int i;
{
// Iterate over the tracks to collect the producers
for ( i = 0; i < mlt_multitrack_count( MLT_MULTITRACK( service ) ); i++ )
- serialise_service( context, MLT_SERVICE( mlt_multitrack_track( MLT_MULTITRACK( service ), i ) ), node );
+ {
+ mlt_producer producer = mlt_producer_cut_parent( mlt_multitrack_track( MLT_MULTITRACK( service ), i ) );
+ serialise_service( context, MLT_SERVICE( producer ), node );
+ }
}
else
{
// Serialise the tracks
for ( i = 0; i < mlt_multitrack_count( MLT_MULTITRACK( service ) ); i++ )
{
- xmlNode *track = xmlNewChild( node, NULL, "track", NULL );
+ xmlNode *track = xmlNewChild( node, NULL, _x("track"), NULL );
int hide = 0;
mlt_producer producer = mlt_multitrack_track( MLT_MULTITRACK( service ), i );
- mlt_properties properties = mlt_producer_properties( producer );
+ mlt_properties properties = MLT_PRODUCER_PROPERTIES( producer );
mlt_service parent = MLT_SERVICE( mlt_producer_cut_parent( producer ) );
char *id = westley_get_id( context, MLT_SERVICE( parent ), westley_existing );
- xmlNewProp( track, "producer", id );
- if ( mlt_properties_get_int( properties, "cut" ) == 1 )
+ xmlNewProp( track, _x("producer"), _x(id) );
+ if ( mlt_producer_is_cut( producer ) )
{
- xmlNewProp( track, "in", mlt_properties_get( properties, "in" ) );
- xmlNewProp( track, "out", mlt_properties_get( properties, "out" ) );
+ xmlNewProp( track, _x("in"), _x(mlt_properties_get( properties, "in" )) );
+ xmlNewProp( track, _x("out"), _x(mlt_properties_get( properties, "out" )) );
+ serialise_store_properties( context, MLT_PRODUCER_PROPERTIES( producer ), track, context->store );
+ serialise_store_properties( context, MLT_PRODUCER_PROPERTIES( producer ), track, "meta." );
+ serialise_service_filters( context, MLT_PRODUCER_SERVICE( producer ), track );
}
hide = mlt_properties_get_int( context->hide_map, id );
if ( hide )
- xmlNewProp( track, "hide", hide == 1 ? "video" : ( hide == 2 ? "audio" : "both" ) );
+ xmlNewProp( track, _x("hide"), _x( hide == 1 ? "video" : ( hide == 2 ? "audio" : "both" ) ) );
}
serialise_service_filters( context, service, node );
}
}
-static void serialise_tractor( serialise_context context, mlt_service service, xmlNode *node );
-
static void serialise_playlist( serialise_context context, mlt_service service, xmlNode *node )
{
int i;
xmlNode *child = node;
mlt_playlist_clip_info info;
- mlt_properties properties = mlt_service_properties( service );
+ mlt_properties properties = MLT_SERVICE_PROPERTIES( service );
if ( context->pass == 0 )
{
if ( info.producer != NULL )
{
mlt_producer producer = mlt_producer_cut_parent( info.producer );
- char *service_s = mlt_properties_get( mlt_producer_properties( producer ), "mlt_service" );
- char *resource_s = mlt_properties_get( mlt_producer_properties( producer ), "resource" );
- if ( resource_s != NULL && !strcmp( resource_s, "<tractor>" ) )
- {
- serialise_tractor( context, MLT_SERVICE( producer ), node );
- context->pass ++;
- serialise_tractor( context, MLT_SERVICE( producer ), node );
- context->pass --;
- }
+ char *service_s = mlt_properties_get( MLT_PRODUCER_PROPERTIES( producer ), "mlt_service" );
+ char *resource_s = mlt_properties_get( MLT_PRODUCER_PROPERTIES( producer ), "resource" );
+ if ( resource_s != NULL && !strcmp( resource_s, "<playlist>" ) )
+ serialise_playlist( context, MLT_SERVICE( producer ), node );
else if ( service_s != NULL && strcmp( service_s, "blank" ) != 0 )
serialise_service( context, MLT_SERVICE( producer ), node );
- else if ( resource_s != NULL && !strcmp( resource_s, "<playlist>" ) )
- serialise_playlist( context, MLT_SERVICE( producer ), node );
}
}
}
- child = xmlNewChild( node, NULL, "playlist", NULL );
+ child = xmlNewChild( node, NULL, _x("playlist"), NULL );
// Set the id
- xmlNewProp( child, "id", id );
+ xmlNewProp( child, _x("id"), _x(id) );
+ if ( mlt_properties_get( properties, "title" ) )
+ xmlNewProp( child, _x("title"), _x(mlt_properties_get( properties, "title" )) );
+
+ // Store application specific properties
+ serialise_store_properties( context, properties, child, context->store );
+ serialise_store_properties( context, properties, child, "meta." );
// Add producer to the map
mlt_properties_set_int( context->hide_map, id, mlt_properties_get_int( properties, "hide" ) );
if ( ! mlt_playlist_get_clip_info( MLT_PLAYLIST( service ), &info, i ) )
{
mlt_producer producer = mlt_producer_cut_parent( info.producer );
- char *service_s = mlt_properties_get( mlt_producer_properties( producer ), "mlt_service" );
+ char *service_s = mlt_properties_get( MLT_PRODUCER_PROPERTIES( producer ), "mlt_service" );
if ( service_s != NULL && strcmp( service_s, "blank" ) == 0 )
{
char length[ 20 ];
length[ 19 ] = '\0';
- xmlNode *entry = xmlNewChild( child, NULL, "blank", NULL );
- snprintf( length, 19, "%d", info.frame_count );
- xmlNewProp( entry, "length", length );
+ xmlNode *entry = xmlNewChild( child, NULL, _x("blank"), NULL );
+ snprintf( length, 19, "%d", (int)info.frame_count );
+ xmlNewProp( entry, _x("length"), _x(length) );
}
else
{
char temp[ 20 ];
- xmlNode *entry = xmlNewChild( child, NULL, "entry", NULL );
+ xmlNode *entry = xmlNewChild( child, NULL, _x("entry"), NULL );
id = westley_get_id( context, MLT_SERVICE( producer ), westley_existing );
- xmlNewProp( entry, "producer", id );
- sprintf( temp, "%d", info.frame_in );
- xmlNewProp( entry, "in", temp );
- sprintf( temp, "%d", info.frame_out );
- xmlNewProp( entry, "out", temp );
- if ( mlt_producer_is_cut( info.producer ) )
- serialise_service_filters( context, mlt_producer_service( info.producer ), entry );
+ xmlNewProp( entry, _x("producer"), _x(id) );
+ sprintf( temp, "%d", (int)info.frame_in );
+ xmlNewProp( entry, _x("in"), _x(temp) );
+ sprintf( temp, "%d", (int)info.frame_out );
+ xmlNewProp( entry, _x("out"), _x(temp) );
+ if ( info.repeat > 1 )
+ {
+ sprintf( temp, "%d", info.repeat );
+ xmlNewProp( entry, _x("repeat"), _x(temp) );
+ }
+ if ( mlt_producer_is_cut( info.cut ) )
+ {
+ serialise_store_properties( context, MLT_PRODUCER_PROPERTIES( info.cut ), entry, context->store );
+ serialise_store_properties( context, MLT_PRODUCER_PROPERTIES( info.cut ), entry, "meta." );
+ serialise_service_filters( context, MLT_PRODUCER_SERVICE( info.cut ), entry );
+ }
}
}
}
serialise_service_filters( context, service, child );
}
- else if ( strcmp( (const char*) node->name, "tractor" ) != 0 )
+ else if ( xmlStrcmp( node->name, _x("tractor") ) != 0 )
{
char *id = westley_get_id( context, service, westley_existing );
- xmlNewProp( node, "producer", id );
+ xmlNewProp( node, _x("producer"), _x(id) );
}
}
static void serialise_tractor( serialise_context context, mlt_service service, xmlNode *node )
{
xmlNode *child = node;
- mlt_properties properties = mlt_service_properties( service );
+ mlt_properties properties = MLT_SERVICE_PROPERTIES( service );
if ( context->pass == 0 )
{
if ( id == NULL )
return;
- child = xmlNewChild( node, NULL, "tractor", NULL );
+ child = xmlNewChild( node, NULL, _x("tractor"), NULL );
// Set the id
- xmlNewProp( child, "id", id );
- xmlNewProp( child, "in", mlt_properties_get( properties, "in" ) );
- xmlNewProp( child, "out", mlt_properties_get( properties, "out" ) );
+ xmlNewProp( child, _x("id"), _x(id) );
+ if ( mlt_properties_get( properties, "title" ) )
+ xmlNewProp( child, _x("title"), _x(mlt_properties_get( properties, "title" )) );
+ if ( mlt_properties_get( properties, "global_feed" ) )
+ xmlNewProp( child, _x("global_feed"), _x(mlt_properties_get( properties, "global_feed" )) );
+ xmlNewProp( child, _x("in"), _x(mlt_properties_get( properties, "in" )) );
+ xmlNewProp( child, _x("out"), _x(mlt_properties_get( properties, "out" )) );
+
+ // Store application specific properties
+ serialise_store_properties( context, MLT_SERVICE_PROPERTIES( service ), child, context->store );
+ serialise_store_properties( context, MLT_SERVICE_PROPERTIES( service ), child, "meta." );
// Recurse on connected producer
serialise_service( context, mlt_service_producer( service ), child );
static void serialise_filter( serialise_context context, mlt_service service, xmlNode *node )
{
xmlNode *child = node;
- mlt_properties properties = mlt_service_properties( service );
+ mlt_properties properties = MLT_SERVICE_PROPERTIES( service );
// Recurse on connected producer
serialise_service( context, mlt_service_producer( service ), node );
if ( id == NULL )
return;
- child = xmlNewChild( node, NULL, "filter", NULL );
+ child = xmlNewChild( node, NULL, _x("filter"), NULL );
// Set the id
- xmlNewProp( child, "id", id );
- xmlNewProp( child, "in", mlt_properties_get( properties, "in" ) );
- xmlNewProp( child, "out", mlt_properties_get( properties, "out" ) );
+ xmlNewProp( child, _x("id"), _x(id) );
+ if ( mlt_properties_get( properties, "title" ) )
+ xmlNewProp( child, _x("title"), _x(mlt_properties_get( properties, "title" )) );
+ xmlNewProp( child, _x("in"), _x(mlt_properties_get( properties, "in" )) );
+ xmlNewProp( child, _x("out"), _x(mlt_properties_get( properties, "out" )) );
serialise_properties( context, properties, child );
serialise_service_filters( context, service, child );
static void serialise_transition( serialise_context context, mlt_service service, xmlNode *node )
{
xmlNode *child = node;
- mlt_properties properties = mlt_service_properties( service );
+ mlt_properties properties = MLT_SERVICE_PROPERTIES( service );
// Recurse on connected producer
serialise_service( context, MLT_SERVICE( MLT_TRANSITION( service )->producer ), node );
if ( id == NULL )
return;
- child = xmlNewChild( node, NULL, "transition", NULL );
+ child = xmlNewChild( node, NULL, _x("transition"), NULL );
// Set the id
- xmlNewProp( child, "id", id );
- xmlNewProp( child, "in", mlt_properties_get( properties, "in" ) );
- xmlNewProp( child, "out", mlt_properties_get( properties, "out" ) );
+ xmlNewProp( child, _x("id"), _x(id) );
+ if ( mlt_properties_get( properties, "title" ) )
+ xmlNewProp( child, _x("title"), _x(mlt_properties_get( properties, "title" )) );
+ xmlNewProp( child, _x("in"), _x(mlt_properties_get( properties, "in" )) );
+ xmlNewProp( child, _x("out"), _x(mlt_properties_get( properties, "out" )) );
serialise_properties( context, properties, child );
serialise_service_filters( context, service, child );
// Iterate over consumer/producer connections
while ( service != NULL )
{
- mlt_properties properties = mlt_service_properties( service );
+ mlt_properties properties = MLT_SERVICE_PROPERTIES( service );
char *mlt_type = mlt_properties_get( properties, "mlt_type" );
// Tell about the producer
if ( strcmp( mlt_type, "producer" ) == 0 )
{
- serialise_producer( context, service, node );
+ char *mlt_service = mlt_properties_get( properties, "mlt_service" );
+ if ( mlt_properties_get( properties, "westley" ) == NULL && ( mlt_service != NULL && !strcmp( mlt_service, "tractor" ) ) )
+ {
+ context->pass = 0;
+ serialise_tractor( context, service, node );
+ context->pass = 1;
+ serialise_tractor( context, service, node );
+ context->pass = 0;
+ break;
+ }
+ else
+ {
+ serialise_producer( context, service, node );
+ }
if ( mlt_properties_get( properties, "westley" ) != NULL )
break;
}
// Recurse on tractor's producer
else if ( strcmp( resource, "<tractor>" ) == 0 )
{
+ context->pass = 0;
+ serialise_tractor( context, service, node );
+ context->pass = 1;
serialise_tractor( context, service, node );
+ context->pass = 0;
break;
}
}
}
-xmlDocPtr westley_make_doc( mlt_service service )
+xmlDocPtr westley_make_doc( mlt_consumer consumer, mlt_service service )
{
- mlt_properties properties = mlt_service_properties( service );
- xmlDocPtr doc = xmlNewDoc( "1.0" );
- xmlNodePtr root = xmlNewNode( NULL, "westley" );
+ mlt_properties properties = MLT_SERVICE_PROPERTIES( service );
+ xmlDocPtr doc = xmlNewDoc( _x("1.0") );
+ xmlNodePtr root = xmlNewNode( NULL, _x("westley") );
struct serialise_context_s *context = calloc( 1, sizeof( struct serialise_context_s ) );
xmlDocSetRootElement( doc, root );
// If we have root, then deal with it now
if ( mlt_properties_get( properties, "root" ) != NULL )
{
- xmlNewProp( root, "root", mlt_properties_get( properties, "root" ) );
+ xmlNewProp( root, _x("root"), _x(mlt_properties_get( properties, "root" )) );
context->root = strdup( mlt_properties_get( properties, "root" ) );
}
else
context->root = strdup( "" );
}
+ // Assign the additional 'storage' pattern for properties
+ context->store = mlt_properties_get( MLT_CONSUMER_PROPERTIES( consumer ), "store" );
+
// Assign a title property
if ( mlt_properties_get( properties, "title" ) != NULL )
- xmlNewProp( root, "title", mlt_properties_get( properties, "title" ) );
+ xmlNewProp( root, _x("title"), _x(mlt_properties_get( properties, "title" )) );
+ mlt_properties_set_int( properties, "global_feed", 1 );
// Construct the context maps
context->id_map = mlt_properties_new();
context->hide_map = mlt_properties_new();
// Ensure producer is a framework producer
- mlt_properties_set( mlt_service_properties( service ), "mlt_type", "mlt_producer" );
+ mlt_properties_set( MLT_SERVICE_PROPERTIES( service ), "mlt_type", "mlt_producer" );
// In pass one, we serialise the end producers and playlists,
// adding them to a map keyed by address.
xmlDocPtr doc = NULL;
// Get the producer service
- mlt_service service = mlt_service_producer( mlt_consumer_service( this ) );
+ mlt_service service = mlt_service_producer( MLT_CONSUMER_SERVICE( this ) );
if ( service != NULL )
{
- mlt_properties properties = mlt_consumer_properties( this );
+ mlt_properties properties = MLT_CONSUMER_PROPERTIES( this );
char *resource = mlt_properties_get( properties, "resource" );
// Set the title if provided
if ( mlt_properties_get( properties, "title" ) )
- mlt_properties_set( mlt_service_properties( service ), "title", mlt_properties_get( properties, "title" ) );
- else if ( mlt_properties_get( mlt_service_properties( service ), "title" ) == NULL )
- mlt_properties_set( mlt_service_properties( service ), "title", "Anonymous Submission" );
+ mlt_properties_set( MLT_SERVICE_PROPERTIES( service ), "title", mlt_properties_get( properties, "title" ) );
+ else if ( mlt_properties_get( MLT_SERVICE_PROPERTIES( service ), "title" ) == NULL )
+ mlt_properties_set( MLT_SERVICE_PROPERTIES( service ), "title", "Anonymous Submission" );
// Check for a root on the consumer properties and pass to service
if ( mlt_properties_get( properties, "root" ) )
- mlt_properties_set( mlt_service_properties( service ), "root", mlt_properties_get( properties, "root" ) );
+ mlt_properties_set( MLT_SERVICE_PROPERTIES( service ), "root", mlt_properties_get( properties, "root" ) );
// Specify roots in other cases...
if ( resource != NULL && mlt_properties_get( properties, "root" ) == NULL )
{
// Get the current working directory
char *cwd = getcwd( NULL, 0 );
- mlt_properties_set( mlt_service_properties( service ), "root", cwd );
+ mlt_properties_set( MLT_SERVICE_PROPERTIES( service ), "root", cwd );
free( cwd );
}
// Make the document
- doc = westley_make_doc( service );
+ doc = westley_make_doc( this, service );
// Handle the output
if ( resource == NULL || !strcmp( resource, "" ) )
{
xmlDocFormatDump( stdout, doc, 1 );
}
- else if ( !strcmp( resource, "buffer" ) )
+ else if ( strchr( resource, '.' ) == NULL )
{
xmlChar *buffer = NULL;
int length = 0;
- xmlDocDumpMemory( doc, &buffer, &length );
- mlt_properties_set_data( properties, "buffer", buffer, length, xmlFree, NULL );
+ xmlDocDumpMemoryEnc( doc, &buffer, &length, "utf-8" );
+ mlt_properties_set( properties, resource, _s(buffer) );
+ xmlFree( buffer );
}
else
{
- xmlSaveFormatFile( resource, doc, 1 );
+ xmlSaveFormatFileEnc( resource, doc, "utf-8", 1 );
}
// Close the document
projects / melted / blobdiff