]> git.sesse.net Git - mlt/commitdiff
smarter and harder producer_westley
authorddennedy <ddennedy@d19143bc-622f-0410-bfdd-b5b2a6649095>
Mon, 22 Mar 2004 05:05:22 +0000 (05:05 +0000)
committerddennedy <ddennedy@d19143bc-622f-0410-bfdd-b5b2a6649095>
Mon, 22 Mar 2004 05:05:22 +0000 (05:05 +0000)
git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@224 d19143bc-622f-0410-bfdd-b5b2a6649095

demo/circle.svg
demo/demo.kino [new file with mode: 0644]
demo/new.westley [new file with mode: 0644]
demo/svg.westley [new file with mode: 0644]
src/framework/mlt_filter.c
src/framework/mlt_playlist.c
src/modules/fezzik.dict
src/modules/fezzik/producer_fezzik.c
src/modules/westley/producer_westley.c

index 2cc1ac5b7a2ff4b43b3058dab1449e9c5a5723bd..476ef3ce282ae8a620b031efb3da76b1a6af5925 100644 (file)
@@ -1 +1 @@
-<svg width='300' height='300'><circle cx='150' cy='150' r='150' fill='black'/></svg>
+<svg width='300' height='300'><circle cx='150' cy='150' r='150' fill='white'/></svg>
diff --git a/demo/demo.kino b/demo/demo.kino
new file mode 100644 (file)
index 0000000..99e8767
--- /dev/null
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<smil xmlns:smil2="http://www.w3.org/2001/SMIL20/Language">
+  <seq title="MLT" copyright="2004" abstract="foo man choo">
+    <video src="clip2.dv" clipBegin="171" clipEnd="450"/>
+  </seq>
+  <seq title="Demo">
+    <video src="clip2.dv" clipBegin="0" clipEnd="170"/>
+  </seq>
+  <seq>
+    <video src="clip1.dv" clipBegin="0" clipEnd="159"/>
+    <video src="clip3.dv" clipBegin="0" clipEnd="106"/>
+  </seq>
+</smil>
diff --git a/demo/new.westley b/demo/new.westley
new file mode 100644 (file)
index 0000000..70d34a3
--- /dev/null
@@ -0,0 +1,55 @@
+<playlist>
+  <entry>
+    <multitrack>
+         <playlist>
+        <producer id="foo" in="100" out="149">
+             <property name="resource">clip2.mpeg</property>
+               </producer>
+               <blank length="25"/>
+        <entry producer="foo" in="10" out="59"/>
+         </playlist>
+         <playlist>
+               <blank length="25"/>
+               <producer id="bar" in="100" out="199">
+                 <property name="resource">clip3.mpeg</property>
+               </producer>
+               <entry out="99" producer="bar"/>
+         </playlist>
+    </multitrack>
+    <filter track="0">
+      <property name="mlt_service">greyscale</property>
+    </filter>
+    <transition in="25" out="49" a_track="0" b_track="1">
+      <property name="mlt_service">luma</property>
+    </transition>
+    <transition in="75" out="99" a_track="0" b_track="1" reverse="1">
+      <property name="mlt_service">luma</property>
+    </transition>
+  </entry>
+
+  <entry>
+    <multitrack>
+         <playlist>
+        <producer id="foo" in="100" out="149">
+             <property name="resource">clip2.mpeg</property>
+               </producer>
+               <blank length="25"/>
+        <entry producer="foo" in="10" out="59"/>
+         </playlist>
+         <playlist>
+               <blank length="25"/>
+               <producer id="bar" in="100" out="199">
+                 <property name="resource">clip3.mpeg</property>
+               </producer>
+               <entry out="99" producer="bar"/>
+         </playlist>
+    </multitrack>
+    <transition in="25" out="49" a_track="0" b_track="1">
+      <property name="mlt_service">luma</property>
+    </transition>
+    <transition in="75" out="99" a_track="0" b_track="1" reverse="1">
+      <property name="mlt_service">luma</property>
+    </transition>
+  </entry>
+
+</playlist>
diff --git a/demo/svg.westley b/demo/svg.westley
new file mode 100644 (file)
index 0000000..a41ff4a
--- /dev/null
@@ -0,0 +1,50 @@
+<?xml version="1.0"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20000303 Stylable//EN"   "http://www.w3.org/TR/2000/03/WD-SVG-20000303/DTD/svg-20000303-stylable.dtd" [
+       <!ENTITY st0 "fill-rule:evenodd;clip-rule:evenodd;fill:url(#aigrd1);stroke:none;">
+       <!ENTITY st1 "stroke-width:0.8755;">
+       <!ENTITY st2 "fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;stroke:none;">
+       <!ENTITY st3 "fill:none;stroke:none;">
+       <!ENTITY st4 "fill-rule:evenodd;clip-rule:evenodd;fill:url(#aigrd2);stroke:none;">
+       <!ENTITY st5 "fill-rule:evenodd;clip-rule:evenodd;stroke:none;">
+       <!ENTITY st6 "fill-rule:nonzero;clip-rule:nonzero;stroke:#000000;stroke-miterlimit:4;">
+]>
+<westley>
+<playlist>
+  <entry>
+    <producer out="99" length="99">
+      <property name="mlt_service">pixbuf</property>
+      <property name="resource">
+         
+<!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In  -->
+<svg  width="24pt" height="24pt" viewBox="0 0 24 24" xml:space="preserve">
+       <g id="Layer_x0020_2" style="&st6;">
+               <path style="&st1;" d="M1,12.1c0,6.1,5,11.1,11.1,11.1c6.1,0,11.1-5,11.1-11.1c0-6.1-5-11.1-11.1-11.1C5.9,1.1,1,6,1,12.1z"/>
+               <radialGradient id="aigrd1" cx="8.7681" cy="8.0513" r="13.7645" fx="8.7681" fy="8.0513" gradientUnits="userSpaceOnUse">
+                       <stop  offset="0" style="stop-color:#FED182"/>
+                       <stop  offset="0.2809" style="stop-color:#FFB310"/>
+                       <stop  offset="1" style="stop-color:#996E04"/>
+               </radialGradient>
+               <path style="&st0;" d="M21.3,12c0,5.2-4.2,9.4-9.4,9.4c-5.2,0-9.4-4.2-9.4-9.4c0-5.2,4.2-9.4,9.4-9.4c5.2,0,9.4,4.2,9.4,9.4z"/>
+       </g>
+       <g id="Layer_x0020_3" style="&st6;">
+               <path style="&st5;" d="M16.4,7.2c-0.5,0.1-0.9,0.3-1.2,0.7c0,0-3,4.2-4.1,5.6c-0.9-0.9-2.5-2.5-2.5-2.5c-0.3-0.3-0.8-0.5-1.3-0.5c-0.5,0-0.9,0.2-1.3,0.5c-0.7,0.7-0.7,1.8,0,2.5l3.9,3.9c0.4,0.4,0.9,0.5,1.4,0.5c0.5,0,1-0.3,1.3-0.7l5.4-7.1
+                       c0.6-0.8,0.5-1.9-0.3-2.5c-0.4-0.3-0.8-0.4-1.3-0.4z"/>
+               <path style="&st2;" d="M16.6,7.4c-0.5,0.1-0.9,0.3-1.2,0.7c0,0-3,4.2-4.1,5.6c-0.9-0.9-2.5-2.5-2.5-2.5c-0.3-0.3-0.8-0.5-1.3-0.5c-0.5,0-0.9,0.2-1.3,0.5c-0.7,0.7-0.7,1.8,0,2.5l3.9,3.9c0.4,0.4,0.9,0.5,1.4,0.5c0.5,0,1-0.3,1.3-0.7l5.4-7.1
+                       c0.6-0.8,0.5-1.9-0.3-2.5c-0.4-0.3-0.8-0.4-1.3-0.4z"/>
+               <radialGradient id="aigrd2" cx="8.6733" cy="8.6187" r="11.0872" fx="8.6733" fy="8.6187" gradientUnits="userSpaceOnUse">
+                       <stop  offset="0" style="stop-color:#FFFFFF"/>
+                       <stop  offset="1" style="stop-color:#F0E1BD"/>
+               </radialGradient>
+               <path style="&st4;" d="M16.5,7.3c-0.5,0.1-0.9,0.3-1.2,0.7c0,0-3,4.2-4.1,5.6C10.3,12.6,8.6,11,8.6,11c-0.3-0.3-0.8-0.5-1.3-0.5c-0.5,0-0.9,0.2-1.3,0.5c-0.7,0.7-0.7,1.8,0,2.5l3.9,3.9c0.4,0.4,0.9,0.5,1.4,0.5c0.5,0,1-0.3,1.3-0.7l5.4-7.1
+                       c0.6-0.8,0.5-1.9-0.3-2.5c-0.4-0.3-0.8-0.4-1.3-0.4z"/>
+       </g>
+       <g id="Layer_x0020_4" style="&st6;">
+               <path style="&st3;" d="M24,24H0V0h24v24z"/>
+       </g>
+</svg>
+
+      </property>
+    </producer>
+  </entry>
+</playlist>
+</westley>
index d83e42fbd4436848164b64e9cad6baabffa3d61b..11f4db7520cffd983a5f0781c8b6770a875fe2ba 100644 (file)
@@ -169,7 +169,7 @@ static int filter_get_frame( mlt_service service, mlt_frame_ptr frame, int index
                if ( ret == 0 )
                {
                        mlt_position position = mlt_frame_get_position( *frame );
-                       if ( position >= in && ( out == 0 || position < out ) )
+                       if ( position >= in && ( out == 0 || position <= out ) )
                                *frame = mlt_filter_process( this, *frame );
                        return 0;
                }
@@ -195,4 +195,3 @@ void mlt_filter_close( mlt_filter this )
        else
                mlt_service_close( &this->parent );
 }
-
index 928c76d0c9af402b1dc35a074f9d7ce639556535..8e332e592af1c5a696d9b17691293ac0b4413771 100644 (file)
@@ -84,6 +84,7 @@ mlt_playlist mlt_playlist_init( )
                // Specify the eof condition
                mlt_properties_set( mlt_playlist_properties( this ), "eof", "pause" );
                mlt_properties_set( mlt_playlist_properties( this ), "resource", "<playlist>" );
+               mlt_properties_set( mlt_playlist_properties( this ), "mlt_type", "mlt_producer" );
        }
        
        return this;
index d299d3cbc2729c6e8a2227066d83400976f4b66f..818c55db52693a2ba36eb435ce0e12f3d41f573b 100644 (file)
@@ -8,6 +8,7 @@ http://*=avformat
 *.gif=pixbuf
 *.jpg=pixbuf
 *.jpeg=pixbuf
+*.kino=westley
 *.mp3=avformat
 *.mpg=mcmpeg,avformat
 *.mpeg=mcmpeg,avformat
index 297655772c606a4cbe497fe12e01649cf3b7019d..2eafbc6582f1e38a8d4e276c77eed5b067a06c2a 100644 (file)
@@ -108,6 +108,10 @@ static mlt_producer create_producer( char *file )
                free( lookup );
        }
 
+       // Finally, try just loading as service
+       if ( result == NULL )
+               result = mlt_factory_producer( file, NULL );
+
        return result;
 }
 
index 094558be945d5ddaa5fad986cef8a84cf2f91d1b..8fd8783ad140ce3d05088d9bee172ed493f41263 100644 (file)
@@ -20,8 +20,8 @@
 
 // TODO: destroy unreferenced producers (they are currently destroyed
 //       when the returned producer is closed).
-// TODO: try using XmlReader interface to avoid global context issues in sax.
+// TODO: determine why deserialise_context can not be released.
+
 #include "producer_westley.h"
 #include <framework/mlt.h>
 #include <stdlib.h>
@@ -29,6 +29,8 @@
 #include <stdio.h>
 
 #include <libxml/parser.h>
+#include <libxml/parserInternals.h> // for xmlCreateFileParserCtxt
+#include <libxml/tree.h>
 
 #define STACK_SIZE 1000
 
@@ -40,6 +42,11 @@ struct deserialise_context_s
        mlt_properties destructors;
        char *property;
        mlt_properties producer_properties;
+       int is_value;
+       xmlDocPtr value_doc;
+       xmlNodePtr stack_node[ STACK_SIZE ];
+       int stack_node_size;
+       xmlDocPtr entity_doc;
 };
 typedef struct deserialise_context_s *deserialise_context;
 
@@ -49,7 +56,7 @@ typedef struct deserialise_context_s *deserialise_context;
 
 static int context_push_service( deserialise_context this, mlt_service that )
 {
-       int ret = this->stack_service_size >= STACK_SIZE;
+       int ret = this->stack_service_size >= STACK_SIZE - 1;
        if ( ret == 0 )
                this->stack_service[ this->stack_service_size ++ ] = that;
        return ret;
@@ -66,6 +73,29 @@ static mlt_service context_pop_service( deserialise_context this )
        return result;
 }
 
+/** Push a node.
+*/
+
+static int context_push_node( deserialise_context this, xmlNodePtr node )
+{
+       int ret = this->stack_node_size >= STACK_SIZE - 1;
+       if ( ret == 0 )
+               this->stack_node[ this->stack_node_size ++ ] = node;
+       return ret;
+}
+
+/** Pop a node.
+*/
+
+static xmlNodePtr context_pop_node( deserialise_context this )
+{
+       xmlNodePtr result = NULL;
+       if ( this->stack_node_size > 0 )
+               result = this->stack_node[ -- this->stack_node_size ];
+       return result;
+}
+
+
 // Set the destructor on a new service
 static void track_service( mlt_properties properties, void *service, mlt_destructor destructor )
 {
@@ -75,6 +105,11 @@ static void track_service( mlt_properties properties, void *service, mlt_destruc
        mlt_properties_set_int( properties, "registered", ++ registered );
 }
 
+
+// Forward declarations
+static void on_end_track( deserialise_context context, const xmlChar *name );
+static void on_end_entry( deserialise_context context, const xmlChar *name );
+
 static void on_start_tractor( deserialise_context context, const xmlChar *name, const xmlChar **atts)
 {
        mlt_service service = mlt_tractor_service( mlt_tractor_init() );
@@ -111,6 +146,9 @@ static void on_start_multitrack( deserialise_context context, const xmlChar *nam
        for ( ; atts != NULL && *atts != NULL; atts += 2 )
                mlt_properties_set( properties, (char*) atts[0], (char*) atts[1] );
 
+       if ( mlt_properties_get( properties, "id" ) != NULL )
+               mlt_properties_set_data( context->producer_map, mlt_properties_get( properties, "id" ), service, 0, NULL, NULL );
+
        context_push_service( context, service );
 }
 
@@ -153,7 +191,10 @@ static void on_start_blank( deserialise_context context, const xmlChar *name, co
        // Get the playlist from the stack
        mlt_service service = context_pop_service( context );
        mlt_position length = 0;
-
+       
+       if ( service == NULL )
+               return;
+       
        // Look for the length attribute
        for ( ; atts != NULL && *atts != NULL; atts += 2 )
        {
@@ -173,7 +214,7 @@ static void on_start_blank( deserialise_context context, const xmlChar *name, co
 
 static void on_start_entry_track( deserialise_context context, const xmlChar *name, const xmlChar **atts)
 {
-       // Use a dummy service to hold properties to allow arbitratry nesting
+       // Use a dummy service to hold properties to allow arbitrary nesting
        mlt_service service = calloc( 1, sizeof( struct mlt_service_s ) );
        mlt_service_init( service, NULL );
 
@@ -235,33 +276,101 @@ static void on_start_property( deserialise_context context, const xmlChar *name,
 
        if ( context->property != NULL && value != NULL )
                mlt_properties_set( properties, context->property, value );
+       
+       // Tell parser to collect any further nodes for serialisation
+       context->is_value = 1;
+}
+
+
+/** This function adds a producer to a playlist or multitrack when
+    there is no entry or track element.
+*/
+
+static int add_producer( deserialise_context context, mlt_service service, mlt_position in, mlt_position out )
+{
+       // Get the parent producer
+       mlt_service producer = context_pop_service( context );
+       if ( producer != NULL )
+       {
+               char *resource = mlt_properties_get( mlt_service_properties( producer ), "resource" );
+               
+               // Put the parent producer back
+               context_push_service( context, producer );
+                       
+               // If the parent producer is a multitrack or playlist (not a track or entry)
+               if ( resource && ( strcmp( resource, "<playlist>" ) == 0 ||
+                       strcmp( resource, "<multitrack>" ) == 0 ) )
+               {
+                       if ( strcmp( resource, "<playlist>" ) == 0 )
+                       {
+                               // Append this producer to the playlist
+                               mlt_playlist_append_io( MLT_PLAYLIST( producer ), 
+                                       MLT_PRODUCER( service ), in, out );
+                       }
+                       else
+                       {
+                               // Set this producer on the multitrack
+                               mlt_multitrack_connect( MLT_MULTITRACK( producer ),
+                                       MLT_PRODUCER( service ),
+                                       mlt_multitrack_count( MLT_MULTITRACK( producer ) ) );
+                       }
+                       // Normally, the enclosing entry or track will pop this service off
+                       // In its absence we do not push it on.
+                       return 1;
+               }
+       }
+       return 0;
 }
 
 static void on_end_multitrack( deserialise_context context, const xmlChar *name )
 {
-       // Get the producer (multitrack) from the stack
+       // Get the multitrack from the stack
        mlt_service producer = context_pop_service( context );
+       if ( producer == NULL )
+               return;
 
        // Get the tractor from the stack
        mlt_service service = context_pop_service( context );
-
-       // Connect the tractor to the producer
+       
+       // Create a tractor if one does not exist
+       char *resource = NULL;
+       if ( service != NULL )
+               resource = mlt_properties_get( mlt_service_properties( service ), "resource" );
+       if ( service == NULL || resource == NULL || strcmp( resource, "<tractor>" ) )
+       {
+               // Put the anonymous service back onto the stack!
+               context_push_service( context, service );
+               
+               service = mlt_tractor_service( mlt_tractor_init() );
+               track_service( context->destructors, service, (mlt_destructor) mlt_tractor_close );
+               
+               // Inherit the producer's properties
+               mlt_properties properties = mlt_service_properties( service );
+               mlt_properties_set_position( properties, "length", mlt_producer_get_out( MLT_PRODUCER( producer ) ) + 1 );
+               mlt_producer_set_in_and_out( MLT_PRODUCER( service ), 0, mlt_producer_get_out( MLT_PRODUCER( producer ) ) );
+               mlt_properties_set_double( properties, "fps", mlt_producer_get_fps( MLT_PRODUCER( producer ) ) );
+       }
+       
+       // Connect the tractor to the multitrack
        mlt_tractor_connect( MLT_TRACTOR( service ), producer );
        mlt_properties_set_data( mlt_service_properties( service ), "multitrack",
                MLT_MULTITRACK( producer ), 0, NULL, NULL );
 
-       // Push the tractor back onto the stack
-       context_push_service( context, service );
-
-       // Push the producer back onto the stack
+       // See if the producer should be added to a playlist or multitrack
+       add_producer( context, service, 0, mlt_producer_get_out( MLT_PRODUCER( producer ) ) );
+       
+       // Always push the multitrack back onto the stack for filters and transitions
        context_push_service( context, producer );
+       
+       // Always push the tractor back onto the stack for filters and transitions
+       context_push_service( context, service );
 }
 
 static void on_end_playlist( deserialise_context context, const xmlChar *name )
 {
        // Get the playlist from the stack
-       mlt_service service = context_pop_service( context );
-       mlt_properties properties = mlt_service_properties( service );
+       mlt_service producer = context_pop_service( context );
+       mlt_properties properties = mlt_service_properties( producer );
 
        mlt_position in = mlt_properties_get_position( properties, "in" );
        mlt_position out;
@@ -274,22 +383,43 @@ static void on_end_playlist( deserialise_context context, const xmlChar *name )
        if ( mlt_properties_get_position( properties, "length" ) < out )
                mlt_properties_set_position( properties, "length", out  + 1 );
 
-       mlt_producer_set_in_and_out( MLT_PRODUCER( service ), in, out );
-
-       // Push the playlist back onto the stack
-       context_push_service( context, service );
+       mlt_producer_set_in_and_out( MLT_PRODUCER( producer ), in, out );
+       
+       // See if the playlist should be added to a playlist or multitrack
+       if ( add_producer( context, producer, in, out ) == 0 )
+               
+               // Otherwise, push the playlist back onto the stack
+               context_push_service( context, producer );
 }
 
 static void on_end_track( deserialise_context context, const xmlChar *name )
 {
        // Get the producer from the stack
        mlt_service producer = context_pop_service( context );
+       if ( producer == NULL )
+               return;
+
+       // See if the producer is a tractor
+       char *resource = mlt_properties_get( mlt_service_properties( producer ), "resource" );
+       if ( resource && strcmp( resource, "<tractor>" ) == 0 )
+               // If so chomp its producer
+               context_pop_service( context );
 
        // Get the dummy track service from the stack
        mlt_service track = context_pop_service( context );
+       if ( track == NULL )
+       {
+               context_push_service( context, producer );
+               return;
+       }
 
        // Get the multitrack from the stack
        mlt_service service = context_pop_service( context );
+       if ( service == NULL )
+       {
+               context_push_service( context, producer );
+               return;
+       }
 
        // Set the track on the multitrack
        mlt_multitrack_connect( MLT_MULTITRACK( service ),
@@ -315,12 +445,30 @@ static void on_end_entry( deserialise_context context, const xmlChar *name )
 {
        // Get the producer from the stack
        mlt_service producer = context_pop_service( context );
+       if ( producer == NULL )
+               return;
+       
+       // See if the producer is a tractor
+       char *resource = mlt_properties_get( mlt_service_properties( producer ), "resource" );
+       if ( resource && strcmp( resource, "<tractor>" ) == 0 )
+               // If so chomp its producer
+               context_pop_service( context );
 
        // Get the dummy entry service from the stack
        mlt_service entry = context_pop_service( context );
+       if ( entry == NULL )
+       {
+               context_push_service( context, producer );
+               return;
+       }
 
        // Get the playlist from the stack
        mlt_service service = context_pop_service( context );
+       if ( service == NULL )
+       {
+               context_push_service( context, producer );
+               return;
+       }
 
        // Append the producer to the playlist
        if ( mlt_properties_get( mlt_service_properties( entry ), "in" ) != NULL ||
@@ -344,25 +492,48 @@ static void on_end_entry( deserialise_context context, const xmlChar *name )
 
 static void on_end_tractor( deserialise_context context, const xmlChar *name )
 {
-       // Get and discard the last producer
-       mlt_producer multitrack = MLT_PRODUCER( context_pop_service( context ) );
-
        // Get the tractor
        mlt_service tractor = context_pop_service( context );
-       multitrack = mlt_properties_get_data( mlt_service_properties( tractor ), "multitrack", NULL );
-
-       // Inherit the producer's properties
-       mlt_properties properties = mlt_producer_properties( multitrack );
-       mlt_properties_set_position( properties, "length", mlt_producer_get_out( multitrack ) + 1 );
-       mlt_producer_set_in_and_out( multitrack, 0, mlt_producer_get_out( multitrack ) );
-       mlt_properties_set_double( properties, "fps", mlt_producer_get_fps( multitrack ) );
+       if ( tractor == NULL )
+               return;
+       
+       // Get the tractor's multitrack
+       mlt_producer multitrack = mlt_properties_get_data( mlt_service_properties( tractor ), "multitrack", NULL );
+       if ( multitrack != NULL )
+       {
+               // Inherit the producer's properties
+               mlt_properties properties = mlt_producer_properties( MLT_PRODUCER( tractor ) );
+               mlt_properties_set_position( properties, "length", mlt_producer_get_out( multitrack ) + 1 );
+               mlt_producer_set_in_and_out( multitrack, 0, mlt_producer_get_out( multitrack ) );
+               mlt_properties_set_double( properties, "fps", mlt_producer_get_fps( multitrack ) );
+       }
 
-       // Push the playlist back onto the stack
-       context_push_service( context, tractor );
+       // See if the tractor should be added to a playlist or multitrack
+       if ( add_producer( context, tractor, 0, mlt_producer_get_out( MLT_PRODUCER( tractor ) ) ) == 0 )
+               
+               // Otherwise, push the tractor back onto the stack
+               context_push_service( context, tractor );
 }
 
 static void on_end_property( deserialise_context context, const xmlChar *name )
 {
+       // Tell parser to stop building a tree
+       context->is_value = 0;
+       
+       // See if there is a xml tree for the value
+       if ( context->property != NULL && context->value_doc != NULL )
+       {
+               xmlChar *value;
+               int size;
+               
+               // Serialise the tree to get value
+               xmlDocDumpMemory( context->value_doc, &value, &size );
+               mlt_properties_set( context->producer_properties, context->property, value );
+               xmlFree( value );
+               xmlFreeDoc( context->value_doc );
+               context->value_doc = NULL;
+       }
+       
        // Close this property handling
        free( context->property );
        context->property = NULL;
@@ -376,15 +547,19 @@ static void on_end_producer( deserialise_context context, const xmlChar *name )
        if ( properties == NULL )
                return;
                
+       char *resource = mlt_properties_get( properties, "resource" );
+       // Let Kino-SMIL src be a synonym for resource
+       if ( resource == NULL )
+               resource = mlt_properties_get( properties, "src" );
+       
        // Instantiate the producer
        if ( mlt_properties_get( properties, "mlt_service" ) != NULL )
        {
                service = MLT_SERVICE( mlt_factory_producer( "fezzik", mlt_properties_get( properties, "mlt_service" ) ) );
        }
-       if ( service == NULL && mlt_properties_get( properties, "resource" ) != NULL )
+       if ( service == NULL && resource != NULL )
        {
                char *root = mlt_properties_get( context->producer_map, "_root" );
-               char *resource = mlt_properties_get( properties, "resource" );
                char *full_resource = malloc( strlen( root ) + strlen( resource ) + 1 );
                if ( resource[ 0 ] != '/' )
                {
@@ -398,25 +573,79 @@ static void on_end_producer( deserialise_context context, const xmlChar *name )
                service = MLT_SERVICE( mlt_factory_producer( "fezzik", full_resource ) );
                free( full_resource );
        }
-
+       if ( service == NULL )
+               return;
        track_service( context->destructors, service, (mlt_destructor) mlt_producer_close );
 
        // Add the producer to the producer map
        if ( mlt_properties_get( properties, "id" ) != NULL )
                mlt_properties_set_data( context->producer_map, mlt_properties_get( properties, "id" ), service, 0, NULL, NULL );
 
+       // Handle in/out properties separately
+       mlt_position in = -1;
+       mlt_position out = -1;
+       
+       // Get in
+       if ( mlt_properties_get( properties, "in" ) != NULL )
+               in = mlt_properties_get_position( properties, "in" );
+       // Let Kino-SMIL clipBegin be a synonym for in
+       if ( mlt_properties_get( properties, "clipBegin" ) != NULL )
+               in = mlt_properties_get_position( properties, "clipBegin" );
+       // Get out
+       if ( mlt_properties_get( properties, "out" ) != NULL )
+               out = mlt_properties_get_position( properties, "out" );
+       // Let Kino-SMIL clipEnd be a synonym for out
+       if ( mlt_properties_get( properties, "clipEnd" ) != NULL )
+               out = mlt_properties_get_position( properties, "clipEnd" );
+       
+       // Remove in and out
+       mlt_properties_set( properties, "in", NULL );
+       mlt_properties_set( properties, "out", NULL );
+       
        mlt_properties_inherit( mlt_service_properties( service ), properties );
        mlt_properties_close( properties );
        context->producer_properties = NULL;
-       properties = mlt_service_properties( service );
 
-       // Set in and out
-       mlt_producer_set_in_and_out( MLT_PRODUCER( service ),
-               mlt_properties_get_position( properties, "in" ),
-               mlt_properties_get_position( properties, "out" ) );
-
-       // Push the new producer onto the stack
-       context_push_service( context, service );
+       // See if the producer should be added to a playlist or multitrack
+       if ( add_producer( context, service, in, out ) == 0 )
+       {
+               // Otherwise, set in and out on...
+               if ( in != -1 || out != -1 )
+               {
+                       // Get the parent service
+                       mlt_service parent = context_pop_service( context );
+                       if ( parent != NULL )
+                       {
+                               // Get the parent properties
+                               properties = mlt_service_properties( parent );
+                               
+                               char *resource = mlt_properties_get( properties, "resource" );
+                               
+                               // Put the parent producer back
+                               context_push_service( context, parent );
+                                       
+                               // If the parent is a track or entry
+                               if ( resource && ( strcmp( resource, "<entry_track>" ) == 0 ) )
+                               {
+                                       mlt_properties_set_position( properties, "in", in );
+                                       mlt_properties_set_position( properties, "out", out );
+                               }
+                               else
+                               {
+                                       // Otherwise, set in and out on producer directly
+                                       mlt_producer_set_in_and_out( MLT_PRODUCER( service ), in, out );
+                               }
+                       }
+                       else
+                       {
+                               // Otherwise, set in and out on producer directly
+                               mlt_producer_set_in_and_out( MLT_PRODUCER( service ), in, out );
+                       }
+               }
+       
+               // Push the producer onto the stack
+               context_push_service( context, service );
+       }
 }
 
 static void on_end_filter( deserialise_context context, const xmlChar *name )
@@ -428,14 +657,31 @@ static void on_end_filter( deserialise_context context, const xmlChar *name )
        char *id;
        char key[11];
        key[ 10 ] = '\0';
-
+       mlt_service tractor = NULL;
+       
        // Get the producer from the stack
        mlt_service producer = context_pop_service( context );
+       if ( producer == NULL )
+               return;
+       
+       // See if the producer is a tractor
+       char *resource = mlt_properties_get( mlt_service_properties( producer ), "resource" );
+       if ( resource != NULL && strcmp( resource, "<tractor>" ) == 0 )
+       {
+               // If so, then get the next producer
+               tractor = producer;
+               producer = context_pop_service( context );
+       }
+       
 //fprintf( stderr, "connecting filter to %s\n", mlt_properties_get( mlt_service_properties( producer ), "resource" ) );
 
        // Create the filter
        mlt_service service = MLT_SERVICE( mlt_factory_filter( mlt_properties_get( properties, "mlt_service" ), NULL ) );
-
+       if ( service == NULL )
+       {
+               context_push_service( context, producer );
+               return;
+       }
        track_service( context->destructors, service, (mlt_destructor) mlt_filter_close );
 
        // Connect the filter to the producer
@@ -454,27 +700,11 @@ static void on_end_filter( deserialise_context context, const xmlChar *name )
        context->producer_properties = NULL;
        properties = mlt_service_properties( service );
 
-       // Set in and out
-//fprintf( stderr, "setting filter in %d out %d\n", mlt_properties_get_position( properties, "in" ), mlt_properties_get_position( properties, "out" ) );
+       // Set in and out again due to inheritance
        mlt_filter_set_in_and_out( MLT_FILTER( service ), 
                mlt_properties_get_position( properties, "in" ),
                mlt_properties_get_position( properties, "out" ) );
 
-       // Get the parent producer from the stack
-       mlt_service tractor = context_pop_service( context );
-
-       if ( tractor != NULL )
-       {
-//fprintf( stderr, "connecting tractor %s to filter\n", mlt_properties_get( mlt_service_properties( tractor ), "resource" ) );
-               // Connect the tractor to the filter
-               if ( strcmp( mlt_properties_get( mlt_service_properties( tractor ), "resource" ), "<tractor>" ) == 0 )
-                       mlt_tractor_connect( MLT_TRACTOR( tractor ), service );
-
-               // Push the parent producer back onto the stack
-               context_push_service( context, tractor );
-       }
-
-//fprintf( stderr, "setting filter in %d out %d\n", mlt_properties_get_position( properties, "in" ), mlt_properties_get_position( properties, "out" ) );
        // If a producer alias is in the producer_map, get it
        snprintf( key, 10, "%p", producer );
        if ( mlt_properties_get_data( context->producer_map, key, NULL ) != NULL )
@@ -488,24 +718,48 @@ static void on_end_filter( deserialise_context context, const xmlChar *name )
        // For filter chain support, add an alias to the producer map
        snprintf( key, 10, "%p", service );
        mlt_properties_set_data( context->producer_map, key, producer, 0, NULL, NULL );
-
+       
        // Push the filter onto the stack
        context_push_service( context, service );
+       
+       if ( tractor != NULL )
+       {
+               // Connect the tractor to the filter
+               mlt_tractor_connect( MLT_TRACTOR( tractor ), service );
 
+               // Push the tractor back onto the stack
+               context_push_service( context, tractor );
+       }
 }
 
 static void on_end_transition( deserialise_context context, const xmlChar *name )
 {
+       mlt_service tractor = NULL;
        mlt_properties properties = context->producer_properties;
        if ( properties == NULL )
                return;
 
        // Get the producer from the stack
        mlt_service producer = context_pop_service( context );
+       if ( producer == NULL )
+               return;
 
+       // See if the producer is a tractor
+       char *resource = mlt_properties_get( mlt_service_properties( producer ), "resource" );
+       if ( resource != NULL && strcmp( resource, "<tractor>" ) == 0 )
+       {
+               // If so, then get the next producer
+               tractor = producer;
+               producer = context_pop_service( context );
+       }
+       
        // Create the transition
        mlt_service service = MLT_SERVICE( mlt_factory_transition( mlt_properties_get( properties, "mlt_service" ), NULL ) );
-
+       if ( service == NULL )
+       {
+               context_push_service( context, producer );
+               return;
+       }
        track_service( context->destructors, service, (mlt_destructor) mlt_transition_close );
 
        // Propogate the properties
@@ -514,40 +768,63 @@ static void on_end_transition( deserialise_context context, const xmlChar *name
        context->producer_properties = NULL;
        properties = mlt_service_properties( service );
 
-       // Set in and out
+       // Set in and out again due to inheritance
        mlt_transition_set_in_and_out( MLT_TRANSITION( service ),
                mlt_properties_get_position( properties, "in" ),
                mlt_properties_get_position( properties, "out" ) );
 
-       // Connect the filter to the producer
+       // Connect the transition to the producer
        mlt_transition_connect( MLT_TRANSITION( service ), producer,
                mlt_properties_get_int( properties, "a_track" ),
                mlt_properties_get_int( properties, "b_track" ) );
 
-       // Get the tractor from the stack
-       mlt_service tractor = context_pop_service( context );
-
-       // Connect the tractor to the transition
-       mlt_tractor_connect( MLT_TRACTOR( tractor ), service );
-
-       // Push the tractor back onto the stack
-       context_push_service( context, tractor );
-
        // Push the transition onto the stack
        context_push_service( context, service );
+       
+       if ( tractor != NULL )
+       {
+               // Connect the tractor to the transition
+               mlt_tractor_connect( MLT_TRACTOR( tractor ), service );
+
+               // Push the tractor back onto the stack
+               context_push_service( context, tractor );
+       }
 }
 
 static void on_start_element( void *ctx, const xmlChar *name, const xmlChar **atts)
 {
-       deserialise_context context = ( deserialise_context ) ctx;
+       struct _xmlParserCtxt *xmlcontext = ( struct _xmlParserCtxt* )ctx;
+       deserialise_context context = ( deserialise_context )( xmlcontext->_private );
        
-       if ( strcmp( name, "tractor" ) == 0 )
+       // Build a tree from nodes within a property value
+       if ( context->is_value == 1 )
+       {
+               xmlNodePtr node = xmlNewNode( NULL, name );
+               
+               if ( context->value_doc == NULL )
+               {
+                       // Start a new tree
+                       context->value_doc = xmlNewDoc( "1.0" );
+                       xmlDocSetRootElement( context->value_doc, node );
+               }
+               else
+               {
+                       // Append child to tree
+                       xmlAddChild( context->stack_node[ context->stack_node_size - 1 ], node );
+               }
+               context_push_node( context, node );
+               
+               // Set the attributes
+               for ( ; atts != NULL && *atts != NULL; atts += 2 )
+                       xmlSetProp( node, atts[ 0 ], atts[ 1 ] );
+       }
+       else if ( strcmp( name, "tractor" ) == 0 )
                on_start_tractor( context, name, atts );
        else if ( strcmp( name, "multitrack" ) == 0 )
                on_start_multitrack( context, name, atts );
-       else if ( strcmp( name, "playlist" ) == 0 )
+       else if ( strcmp( name, "playlist" ) == 0 || strcmp( name, "seq" ) == 0 || strcmp( name, "smil" ) == 0 )
                on_start_playlist( context, name, atts );
-       else if ( strcmp( name, "producer" ) == 0 )
+       else if ( strcmp( name, "producer" ) == 0 || strcmp( name, "video" ) == 0 )
                on_start_producer( context, name, atts );
        else if ( strcmp( name, "blank" ) == 0 )
                on_start_blank( context, name, atts );
@@ -563,11 +840,14 @@ static void on_start_element( void *ctx, const xmlChar *name, const xmlChar **at
 
 static void on_end_element( void *ctx, const xmlChar *name )
 {
-       deserialise_context context = ( deserialise_context ) ctx;
+       struct _xmlParserCtxt *xmlcontext = ( struct _xmlParserCtxt* )ctx;
+       deserialise_context context = ( deserialise_context )( xmlcontext->_private );
        
-       if ( strcmp( name, "multitrack" ) == 0 )
+       if ( context->is_value == 1 && strcmp( name, "property" ) != 0 )
+               context_pop_node( context );
+       else if ( strcmp( name, "multitrack" ) == 0 )
                on_end_multitrack( context, name );
-       else if ( strcmp( name, "playlist" ) == 0 )
+       else if ( strcmp( name, "playlist" ) == 0 || strcmp( name, "seq" ) == 0 || strcmp( name, "smil" ) == 0 )
                on_end_playlist( context, name );
        else if ( strcmp( name, "track" ) == 0 )
                on_end_track( context, name );
@@ -577,7 +857,7 @@ static void on_end_element( void *ctx, const xmlChar *name )
                on_end_tractor( context, name );
        else if ( strcmp( name, "property" ) == 0 )
                on_end_property( context, name );
-       else if ( strcmp( name, "producer" ) == 0 )
+       else if ( strcmp( name, "producer" ) == 0 || strcmp( name, "video" ) == 0 )
                on_end_producer( context, name );
        else if ( strcmp( name, "filter" ) == 0 )
                on_end_filter( context, name );
@@ -587,25 +867,59 @@ static void on_end_element( void *ctx, const xmlChar *name )
 
 static void on_characters( void *ctx, const xmlChar *ch, int len )
 {
-       deserialise_context context = ( deserialise_context ) ctx;
+       struct _xmlParserCtxt *xmlcontext = ( struct _xmlParserCtxt* )ctx;
+       deserialise_context context = ( deserialise_context )( xmlcontext->_private );
        char *value = calloc( len + 1, 1 );
 
        value[ len ] = 0;
        strncpy( value, (const char*) ch, len );
+       
+       if ( context->stack_node_size > 0 )
+               xmlNodeAddContent( context->stack_node[ context->stack_node_size - 1 ], ( xmlChar* )value );
 
-       if ( context->property != NULL && context->producer_properties != NULL )
+       else if ( context->property != NULL && context->producer_properties != NULL )
                mlt_properties_set( context->producer_properties, context->property, value );
                
        free( value);
 }
 
+// The following 3 facilitate entity substitution in the SAX parser
+static void on_internal_subset( void *ctx, const xmlChar* name,
+       const xmlChar* publicId, const xmlChar* systemId )
+{
+       struct _xmlParserCtxt *xmlcontext = ( struct _xmlParserCtxt* )ctx;
+       deserialise_context context = ( deserialise_context )( xmlcontext->_private );
+       
+       xmlCreateIntSubset( context->entity_doc, name, publicId, systemId );
+}
+
+static void on_entity_declaration( void *ctx, const xmlChar* name, int type, 
+       const xmlChar* publicId, const xmlChar* systemId, xmlChar* content)
+{
+       struct _xmlParserCtxt *xmlcontext = ( struct _xmlParserCtxt* )ctx;
+       deserialise_context context = ( deserialise_context )( xmlcontext->_private );
+       
+       xmlAddDocEntity( context->entity_doc, name, type, publicId, systemId, content );
+}
+
+xmlEntityPtr on_get_entity( void *ctx, const xmlChar* name )
+{
+       struct _xmlParserCtxt *xmlcontext = ( struct _xmlParserCtxt* )ctx;
+       deserialise_context context = ( deserialise_context )( xmlcontext->_private );
+
+       return xmlGetDocEntity( context->entity_doc, name );
+}
+
+
 mlt_producer producer_westley_init( char *filename )
 {
        xmlSAXHandler *sax = calloc( 1, sizeof( xmlSAXHandler ) );
        struct deserialise_context_s *context = calloc( 1, sizeof( struct deserialise_context_s ) );
        mlt_properties properties = NULL;
        int i = 0;
-
+       struct _xmlParserCtxt *xmlcontext;
+       int well_formed = 0;
+       
        context->producer_map = mlt_properties_new();
        context->destructors = mlt_properties_new();
 
@@ -622,25 +936,52 @@ mlt_producer producer_westley_init( char *filename )
                *( strrchr( root, '/' ) + 1 ) = '\0';
        }
 
+       // Setup SAX callbacks
        sax->startElement = on_start_element;
        sax->endElement = on_end_element;
        sax->characters = on_characters;
        sax->cdataBlock = on_characters;
-
-       // I REALLY DON'T GET THIS - HOW THE HELL CAN YOU REFERENCE A WESTLEY IN A WESTLEY???
-       xmlInitParser();
-
-       xmlSAXUserParseFile( sax, context, filename );
-
-       // Need the complete producer list for various reasons
-       properties = context->destructors;
+       sax->internalSubset = on_internal_subset;
+       sax->entityDecl = on_entity_declaration;
+       sax->getEntity = on_get_entity;
+
+       // Setup libxml2 SAX parsing
+       xmlInitParser(); 
+       xmlSubstituteEntitiesDefault( 1 );
+       // This is used to facilitate entity substitution in the SAX parser
+       context->entity_doc = xmlNewDoc( "1.0" );
+       xmlcontext = xmlCreateFileParserCtxt( filename );
+       xmlcontext->sax = sax;
+       xmlcontext->_private = ( void* )context;
+       
+       // Parse
+       xmlParseDocument( xmlcontext );
+       well_formed = xmlcontext->wellFormed;
+       
+       // Cleanup after parsing
+       xmlFreeDoc( context->entity_doc );
+       free( sax );
+       xmlcontext->sax = NULL;
+       xmlcontext->_private = NULL;
+       xmlFreeParserCtxt( xmlcontext );
+       xmlMemoryDump( ); // for debugging
 
        // Get the last producer on the stack
        mlt_service service = context_pop_service( context );
+       if ( well_formed && service != NULL )
+       {
+               // Verify it is a producer service (mlt_type="mlt_producer")
+               // (producer, playlist, multitrack)
+               char *type = mlt_properties_get( mlt_service_properties( service ), "mlt_type" );
+               if ( type == NULL || ( strcmp( type, "mlt_producer" ) != 0 ) )
+                       service = NULL;
+       }
 
-       // Do we actually have a producer here?
-       if ( service != NULL )
+       if ( well_formed && service != NULL )
        {
+               // Need the complete producer list for various reasons
+               properties = context->destructors;
+
                // Now make sure we don't have a reference to the service in the properties
                for ( i = mlt_properties_count( properties ) - 1; i >= 1; i -- )
                {
@@ -667,17 +1008,16 @@ mlt_producer producer_westley_init( char *filename )
        }
        else
        {
+               // Return null if not well formed
+               service = NULL;
+               
                // Clean up
-               mlt_properties_close( properties );
+               mlt_properties_close( context->destructors );
        }
 
        free( context->stack_service );
        mlt_properties_close( context->producer_map );
        //free( context );
-       free( sax );
-       //xmlCleanupParser();
-       xmlMemoryDump( );
-
 
        return MLT_PRODUCER( service );
 }