Merge ../mlt++

[mlt] / src / miracle / miracle_server.h

diff --git a/src/miracle/miracle_server.h b/src/miracle/miracle_server.h
index 5ed27986bbc7803cd63252ff9f20e830c002dbaa..592ff3a1164c2b036bc70eaaa543dbc712e91202 100644 (file)
--- a/src/miracle/miracle_server.h
+++ b/src/miracle/miracle_server.h
@@ -1,5 +1,5 @@
 /*
- * miracle_server.h -- DV Server
+ * miracle_server.h
  * Copyright (C) 2002-2003 Ushodaya Enterprises Limited
  * Author: Charles Yates <charles.yates@pandora.be>
  *
@@ -42,6 +42,7 @@ extern "C"
 
 typedef struct
 {
+       struct mlt_properties_s parent;
        char *id;
        int port;
        int socket;
@@ -59,10 +60,12 @@ typedef struct
 */
 
 extern miracle_server miracle_server_init( char * );
-extern void miracle_server_set_config( miracle_server, char * );
+extern const char *miracle_server_id( miracle_server );
+extern void miracle_server_set_config( miracle_server, const char * );
 extern void miracle_server_set_port( miracle_server, int );
 extern void miracle_server_set_proxy( miracle_server, char * );
 extern int miracle_server_execute( miracle_server );
+extern mlt_properties miracle_server_fetch_unit( miracle_server, int );
 extern void miracle_server_shutdown( miracle_server );
 extern void miracle_server_close( miracle_server );