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

diff --git a/src/miracle/miracle_server.c b/src/miracle/miracle_server.c
index 652e533..1ea982f 100644
--- a/src/miracle/miracle_server.c
+++ b/src/miracle/miracle_server.c
@@ -77,6 +77,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 +86,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 )
@@ -190,6 +196,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;