X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Ffilter_data_feed.c;h=bc9860539ed0cd455916e8e366e8c1d28735f287;hb=bf3264b9e340ba5c11cbf59835a8af3db94e0cc2;hp=1f5c76c2d21080291d4260990dfe00bad3fa60c2;hpb=f00476101550ec7d8e863f6516aa83bc1b524570;p=melted

diff --git a/src/modules/core/filter_data_feed.c b/src/modules/core/filter_data_feed.c
index 1f5c76c..bc98605 100644
--- a/src/modules/core/filter_data_feed.c
+++ b/src/modules/core/filter_data_feed.c
@@ -3,19 +3,19 @@
  * Copyright (C) 2004-2005 Ushodaya Enterprises Limited
  * Author: Charles Yates <charles.yates@pandora.be>
  *
- * 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 <stdlib.h>
@@ -85,35 +85,39 @@ static mlt_frame filter_process( mlt_filter this, mlt_frame frame )
 	{
 		int i = 0;
 		int count = mlt_properties_count( frame_properties );
-		char inactive[ 512 ];
 
 		for ( i = 0; i < count; i ++ )
 		{
 			char *name = mlt_properties_get_name( frame_properties, i );
-			if ( !strncmp( name, "meta.attr.", 10 ) && strstr( name, ".inactive" ) == NULL )
+
+			// 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 )
 			{
-				char *value = mlt_properties_get( frame_properties, name );
-				sprintf( inactive, "%s.inactive", name );
-				if ( value != NULL && mlt_properties_get_int( frame_properties, inactive ) == 0 )
-				{
-					// 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" ) );
-
-					// Assign the value to the feed
-					mlt_properties_set( feed, "markup", value );
-
-					// Push it on to the queue
-					mlt_deque_push_back( data_queue, feed );
-				}
+				// 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 );
 			}
 		}
 	}