Minor mods to playout via avformat and miracle unit generation on an xfer

[melted] / src / miracle / miracle_server.c

diff --git a/src/miracle/miracle_server.c b/src/miracle/miracle_server.c
index 94a15e5..151ce31 100644 (file)
--- a/src/miracle/miracle_server.c
+++ b/src/miracle/miracle_server.c
@@ -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>
 
@@ -86,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 )
@@ -156,8 +162,6 @@ static void *miracle_server_run( void *arg )
        pthread_attr_setinheritsched( &thread_attributes, PTHREAD_INHERIT_SCHED );
        /* pthread_attr_setschedpolicy( &thread_attributes, SCHED_RR ); */
 
-       server->shutdown = 0;
-
        while ( !server->shutdown )
        {
                /* Wait for a new connection. */
@@ -193,6 +197,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;
@@ -293,6 +299,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.
 */