X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmiracle%2Fmiracle_server.c;h=a746c8bd033dcba0453ddad13c67c7106733521d;hb=bf3264b9e340ba5c11cbf59835a8af3db94e0cc2;hp=652e5331549ff6c9b41831200e004ab167b6b1f9;hpb=4580365ba2f57f530aa4bdeb57788822fab09e2f;p=melted

diff --git a/src/miracle/miracle_server.c b/src/miracle/miracle_server.c
index 652e533..a746c8b 100644
--- a/src/miracle/miracle_server.c
+++ b/src/miracle/miracle_server.c
@@ -1,5 +1,5 @@
 /*
- * miracle_server.c -- DV Server
+ * miracle_server.c
  * Copyright (C) 2002-2003 Ushodaya Enterprises Limited
  * Author: Charles Yates <charles.yates@pandora.be>
  *
@@ -41,6 +41,7 @@
 #include "miracle_connection.h"
 #include "miracle_local.h"
 #include "miracle_log.h"
+#include "miracle_commands.h"
 #include <valerie/valerie_remote.h>
 #include <valerie/valerie_tokeniser.h>
 
@@ -77,6 +78,7 @@ miracle_server miracle_server_init( char *id )
 		server->id = id;
 		server->port = DEFAULT_TCP_PORT;
 		server->socket = -1;
+		server->shutdown = 1;
 		mlt_events_init( &server->parent );
 		mlt_events_register( &server->parent, "command-received", ( mlt_transmitter )miracle_command_received );
 		mlt_events_register( &server->parent, "doc-received", ( mlt_transmitter )miracle_doc_received );
@@ -85,6 +87,11 @@ miracle_server miracle_server_init( char *id )
 	return server;
 }
 
+const char *miracle_server_id( miracle_server server )
+{
+	return server != NULL && server->id != NULL ? server->id : "miracle";
+}
+
 void miracle_server_set_config( miracle_server server, char *config )
 {
 	if ( server != NULL )
@@ -151,9 +158,6 @@ static void *miracle_server_run( void *arg )
 	   their resources get freed automatically. (CY: ... hmmph...) */
 	pthread_attr_init( &thread_attributes );
 	pthread_attr_setdetachstate( &thread_attributes, PTHREAD_CREATE_DETACHED );
-	pthread_attr_init( &thread_attributes );
-	pthread_attr_setinheritsched( &thread_attributes, PTHREAD_INHERIT_SCHED );
-	/* pthread_attr_setschedpolicy( &thread_attributes, SCHED_RR ); */
 
 	while ( !server->shutdown )
 	{
@@ -190,6 +194,8 @@ int miracle_server_execute( miracle_server server )
 	struct sockaddr_in ServerAddr;
 	int flag = 1;
 
+	server->shutdown = 0;
+
 	ServerAddr.sin_family = AF_INET;
 	ServerAddr.sin_port = htons( server->port );
 	ServerAddr.sin_addr.s_addr = INADDR_ANY;
@@ -258,25 +264,13 @@ int miracle_server_execute( miracle_server server )
 
 		if ( response != NULL )
 		{
-			pthread_attr_t attr;
 			int result;
-			pthread_attr_init( &attr );
-			pthread_attr_setdetachstate( &attr, PTHREAD_CREATE_JOINABLE );
-			pthread_attr_setinheritsched( &attr, PTHREAD_EXPLICIT_SCHED );
-			pthread_attr_setschedpolicy( &attr, SCHED_FIFO );
-			pthread_attr_setscope( &attr, PTHREAD_SCOPE_SYSTEM );
 			valerie_response_close( response );
-			result = pthread_create( &server->thread, &attr, miracle_server_run, server );
+			result = pthread_create( &server->thread, NULL, miracle_server_run, server );
 			if ( result )
 			{
-				miracle_log( LOG_WARNING, "Failed to schedule realtime (%s)", strerror(errno) );
-				pthread_attr_setschedpolicy( &attr, SCHED_OTHER );
-				result = pthread_create( &server->thread, &attr, miracle_server_run, server );
-				if ( result )
-				{
-					miracle_log( LOG_CRIT, "Failed to launch TCP listener thread" );
-					error = -1;
-				}
+				miracle_log( LOG_CRIT, "Failed to launch TCP listener thread" );
+				error = -1;
 			}
 		}
 	}
@@ -290,6 +284,15 @@ int miracle_server_execute( miracle_server server )
 	return error;
 }
 
+/** Fetch a units properties
+*/
+
+mlt_properties miracle_server_fetch_unit( miracle_server server, int index )
+{
+	miracle_unit unit = miracle_get_unit( index );
+	return unit != NULL ? unit->properties : NULL;
+}
+
 /** Shutdown the server.
 */