X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmiracle%2Fmiracle_connection.c;h=30eef7a756ea4a6aeb86a8aa3e41108bc7978dfd;hb=4580365ba2f57f530aa4bdeb57788822fab09e2f;hp=6bf496cfcbdbd8165ef72a56aec5bd38f44a197e;hpb=8cf0f77981284b7549c811b67283eb73d0c520d6;p=melted

diff --git a/src/miracle/miracle_connection.c b/src/miracle/miracle_connection.c
index 6bf496c..30eef7a 100644
--- a/src/miracle/miracle_connection.c
+++ b/src/miracle/miracle_connection.c
@@ -201,6 +201,7 @@ void *parser_thread( void *arg )
 {
 	struct hostent *he;
 	connection_t *connection = arg;
+	mlt_properties owner = connection->owner;
 	char address[ 512 ];
 	char command[ 1024 ];
 	int fd = connection->fd;
@@ -223,6 +224,8 @@ void *parser_thread( void *arg )
 
 		while( !error && connection_read( fd, command, 1024 ) )
 		{
+			response = NULL;
+
 			if ( !strncmp( command, "PUSH ", 5 ) )
 			{
 				char temp[ 20 ];
@@ -244,8 +247,19 @@ void *parser_thread( void *arg )
 				}
 				buffer[ bytes ] = '\0';
 				if ( bytes > 0 && total == bytes )
-					service = ( mlt_service )mlt_factory_producer( "westley-xml", buffer );
-				response = valerie_parser_push( parser, command, service );
+				{
+					if ( mlt_properties_get( owner, "push-parser-off" ) == 0 )
+					{
+						service = ( mlt_service )mlt_factory_producer( "westley-xml", buffer );
+						mlt_events_fire( owner, "push-received", &response, command, service, NULL );
+						if ( response == NULL )
+							response = valerie_parser_push( parser, command, service );
+					}
+					else
+					{
+						response = valerie_parser_received( parser, command, buffer );
+					}
+				}
 				error = connection_send( fd, response );
 				valerie_response_close( response );
 				mlt_service_close( service );
@@ -253,7 +267,9 @@ void *parser_thread( void *arg )
 			}
 			else if ( strncmp( command, "STATUS", 6 ) )
 			{
-				response = valerie_parser_execute( parser, command );
+				mlt_events_fire( owner, "command-received", &response, command, NULL );
+				if ( response == NULL )
+					response = valerie_parser_execute( parser, command );
 				miracle_log( LOG_INFO, "%s \"%s\" %d", address, command, valerie_response_get_error_code( response ) );
 				error = connection_send( fd, response );
 				valerie_response_close( response );