X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Ffilter_data_show.c;h=89e1b945a782af25134d1ce53a66c56503e1964d;hb=bf3264b9e340ba5c11cbf59835a8af3db94e0cc2;hp=fc9fb3ecb7ac18b3e0d2928dfb36b44b4063bf96;hpb=55b596a7408ddeb15d61394982776da1732a2279;p=melted

diff --git a/src/modules/core/filter_data_show.c b/src/modules/core/filter_data_show.c
index fc9fb3e..89e1b94 100644
--- a/src/modules/core/filter_data_show.c
+++ b/src/modules/core/filter_data_show.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 "filter_data.h"
@@ -83,6 +83,34 @@ static mlt_filter obtain_filter( mlt_filter filter, char *type )
 	return result;
 }
 
+/** Retrieve medatata value 
+*/
+
+const char* metadata_value(mlt_properties properties, char* name)
+{
+	if (name == NULL) return "-";
+	char *meta = malloc( strlen(name) + 18 );
+	sprintf( meta, "meta.attr.%s.markup", name);
+	return mlt_properties_get( properties, meta);
+}
+
+/** Convert frames to Timecode 
+*/
+
+const char* frame_to_timecode( int frames , int fps)
+{
+	char *res = malloc(12);
+	if (fps == 0) return "-";
+	int seconds = frames / (int) fps;
+	frames = frames % ((int) fps);
+	int minutes = seconds / 60;
+	seconds = seconds % 60;
+	int hours = minutes / 60;
+	minutes = minutes % 60;
+	sprintf(res, "%.2d:%.2d:%.2d:%.2d", hours, minutes, seconds, frames);
+	return res;
+}
+
 /** Process the frame for the requested type
 */
 
@@ -144,8 +172,39 @@ static int process_feed( mlt_properties feed, mlt_filter filter, mlt_frame frame
 				else
 				{
 					char *value = mlt_properties_get( feed, name + len );
-					if ( value != NULL )
-						mlt_properties_set( properties, key, value );
+					if ( value != NULL ) {
+						// check for metadata keywords in metadata markup if user requested so
+						if ( mlt_properties_get_int( filter_properties, "dynamic" ) == 1  && !strcmp( name + strlen( name ) - 6, "markup") )
+						{
+							// Find keywords which should be surrounded by '#', like: #title#
+							char* keywords = strtok ( value, "\\#" );
+							char result[] = "";
+							int ct = 0;
+							int fromStart = 0;
+							if ( value[0] == '\\' ) fromStart = 1;
+							
+							while (keywords != NULL) {
+								if (ct % 2 == fromStart) 
+									strcat( result, keywords);
+								else if (!strcmp(keywords, "timecode")) {
+									// special case: replace #tc# with current frame timecode
+									int pos = mlt_properties_get_int( feed, "position" );
+									const char *tc = frame_to_timecode(pos, mlt_properties_get_int( MLT_FRAME_PROPERTIES( frame ), "fps" ));
+									strcat( result, tc);
+								}
+								else {
+									// replace keyword with metadata value
+									const char * metavalue = metadata_value(MLT_FRAME_PROPERTIES( frame ), keywords);
+									if (metavalue == NULL) metavalue = "-";
+									strcat( result, metavalue);
+								}
+								keywords = strtok ( NULL, "\\#" );
+								ct++;
+							}
+							mlt_properties_set( properties, key, (char*) result );
+						}
+						else mlt_properties_set( properties, key, value );
+					}
 				}
 			}
 		}