X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Ffilter_data_feed.c;h=4cf0e732b20fcea19086896619c1f0f2bfaa1183;hb=a709a2d7ec2e94fefda3a2989e171f497f2c7318;hp=a49052517a251c9ac772730936ac01e7c28ab352;hpb=95f429b56026f5897ebad9060608b6631dcf7515;p=melted

diff --git a/src/modules/core/filter_data_feed.c b/src/modules/core/filter_data_feed.c
index a490525..4cf0e73 100644
--- a/src/modules/core/filter_data_feed.c
+++ b/src/modules/core/filter_data_feed.c
@@ -18,6 +18,8 @@
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include <stdlib.h>
+#include <string.h>
 #include "filter_data.h"
 #include <framework/mlt.h>
 
@@ -53,14 +55,21 @@ static void destroy_data_queue( void *arg )
 static mlt_frame filter_process( mlt_filter this, mlt_frame frame )
 {
 	// Get the filter properties
-	mlt_properties filter_properties = mlt_filter_properties( this );
+	mlt_properties filter_properties = MLT_FILTER_PROPERTIES( this );
 
 	// Get the frame properties
-	mlt_properties frame_properties = mlt_frame_properties( frame );
+	mlt_properties frame_properties = MLT_FRAME_PROPERTIES( frame );
 
 	// Get the data queue
 	mlt_deque data_queue = mlt_properties_get_data( frame_properties, "data_queue", NULL );
 
+	// Get the type of the data feed
+	char *type = mlt_properties_get( filter_properties, "type" );
+
+	// Get the in and out points of this filter
+	int in = mlt_filter_get_in( this );
+	int out = mlt_filter_get_out( this );
+
 	// Create the data queue if it doesn't exist
 	if ( data_queue == NULL )
 	{
@@ -72,18 +81,51 @@ static mlt_frame filter_process( mlt_filter this, mlt_frame frame )
 	}
 
 	// Now create the data feed
-	if ( data_queue != NULL )
+	if ( data_queue != NULL && type != NULL && !strcmp( type, "attr_check" ) )
+	{
+		int i = 0;
+		int count = mlt_properties_count( frame_properties );
+
+		for ( i = 0; i < count; i ++ )
+		{
+			char *name = mlt_properties_get_name( frame_properties, i );
+
+			// Only deal with meta.attr.name values here - these should have a value of 1 to be considered
+			// Additional properties of the form are meta.attr.name.property are passed down on the feed
+			if ( !strncmp( name, "meta.attr.", 10 ) && strchr( name + 10, '.' ) == NULL && mlt_properties_get_int( frame_properties, name ) == 1 )
+			{
+				// Temp var to hold name + '.' for pass method
+				char temp[ 132 ];
+
+				// Create a new data feed
+				mlt_properties feed = mlt_properties_new( );
+
+				// Assign it the base properties
+				mlt_properties_set( feed, "id", mlt_properties_get( filter_properties, "_unique_id" ) );
+				mlt_properties_set( feed, "type", strrchr( name, '.' ) + 1 );
+				mlt_properties_set_position( feed, "position", mlt_frame_get_position( frame ) );
+
+				// Assign in/out of service we're connected to
+				mlt_properties_set_position( feed, "in", mlt_properties_get_position( frame_properties, "in" ) );
+				mlt_properties_set_position( feed, "out", mlt_properties_get_position( frame_properties, "out" ) );
+
+				// Pass all meta properties 
+				sprintf( temp, "%s.", name );
+				mlt_properties_pass( feed, frame_properties, temp );
+
+				// Push it on to the queue
+				mlt_deque_push_back( data_queue, feed );
+
+				// Make sure this attribute only gets processed once
+				mlt_properties_set_int( frame_properties, name, 0 );
+			}
+		}
+	}
+	else if ( data_queue != NULL )
 	{
-		// Get the in and out points of this filter
-		int in = mlt_filter_get_in( this );
-		int out = mlt_filter_get_out( this );
-
 		// Create a new data feed
 		mlt_properties feed = mlt_properties_new( );
 
-		// Get the type of the data feed
-		char *type = mlt_properties_get( filter_properties, "type" );
-
 		// Assign it the base properties
 		mlt_properties_set( feed, "id", mlt_properties_get( filter_properties, "_unique_id" ) );
 		mlt_properties_set( feed, "type", type );
@@ -122,7 +164,7 @@ mlt_filter filter_data_feed_init( char *arg )
 	if ( this != NULL )
 	{
 		// Get the properties
-		mlt_properties properties = mlt_filter_properties( this );
+		mlt_properties properties = MLT_FILTER_PROPERTIES( this );
 
 		// Assign the argument (default to titles)
 		mlt_properties_set( properties, "type", arg == NULL ? "titles" : arg );