Changeset 5373:8da157c10483 in roaraudio for include/libroar

Timestamp:

12/21/11 19:02:52 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

• Updated config structure
• Added a flag to ask libroar to only connect to local servers
• Added a way to override fork()
• added support for +internal

Location:

include/libroar

Files:

• config.h (modified) (4 diffs)
• enumdev.h (modified) (1 diff)
• libroar.h (modified) (1 diff)

include/libroar/config.h

@@ -39 +39 @@
 #include "libroar.h"
 
+struct roar_connection;
+
 // WorkAroundS:
 #define ROAR_LIBROAR_CONFIG_WAS_NONE        0x00
@@ -67 +69 @@
  ROAR_LIBROAR_CONFIG_OPMODE_MS     = 2,
 #define ROAR_LIBROAR_CONFIG_OPMODE_MS       ROAR_LIBROAR_CONFIG_OPMODE_MS
+};
+
+struct roar_libroar_forkapi {
+ int   (*prefork)(void ** context, void * userdata);
+ pid_t (*fork   )(void ** context, void * userdata);
+ int   (*failed )(void ** context, void * userdata);
+ int   (*parent )(void ** context, void * userdata, pid_t child);
+ int   (*child  )(void ** context, void * userdata);
+ void * userdata;
 };
 
@@ -115 +126 @@
 #endif
  enum roar_libroar_config_opmode opmode;
+ struct roar_libroar_forkapi * forkapi;
+ struct roar_vio_calls * (*connect_internal)(struct roar_connection * con, const char * server, int type, int flags, uint_least32_t timeout);
+ char * daemonimage;
+ int serverflags;
 };
 
@@ -129 +144 @@
 const char * roar_libroar_get_server(void) _LIBROAR_ATTR_USE_RESULT;
 
+int    roar_libroar_set_forkapi(struct roar_libroar_forkapi * api);
+
+int    roar_libroar_set_connect_internal(struct roar_vio_calls * (*func)(struct roar_connection * con, const char * server, int type, int flags, uint_least32_t timeout));
+
 void   roar_libroar_nowarn(void);
 void   roar_libroar_warn(void);

include/libroar/enumdev.h

@@ -40 +40 @@
 
 #define ROAR_ENUM_FLAG_NONE         0x0000 /* no flags set                     */
-#define ROAR_ENUM_FLAG_DESC         0x0001 /* ask for server description       */
+#define ROAR_ENUM_FLAG_DESC         0x0001 /* ask for server description     1 */
 #define ROAR_ENUM_FLAG_LOCATION     0x0002 /* ask for server location        1 */
-#define ROAR_ENUM_FLAG_NONBLOCK     0x0004 /* do not block                   1 */
+#define ROAR_ENUM_FLAG_NONBLOCK     0x0004 /* do not block                     */
 #define ROAR_ENUM_FLAG_HARDNONBLOCK 0x0008 /* do even less block than NONBLOCK */
+#define ROAR_ENUM_FLAG_LOCALONLY    0x0010 /* only list local servers          */
 /*
  * 1 = This is a request. The result may include or not include the data anyway.
- *     This is only so the lib does not need to spend extra work if data is not needed.
+ *     This is only so the lib does not need to spend extra work when data is not needed.
  */
 

include/libroar/libroar.h

@@ -202 +202 @@
 int roar_usleep(uint_least32_t t);
 int roar_sleep(int t);
+pid_t roar_fork(const struct roar_libroar_forkapi * api);
 
 // call this function after we fork/exec()ed or similar.