Changeset 5640:00dd1147ce70 in roaraudio for roard/include

Timestamp:

09/10/12 16:18:22 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Removed support for roard's proto support (replaced by CPI) (Closes: #278)

Location:

roard/include

Files:

• client.h (modified) (3 diffs)
• emul_esd.h.OLD (modified) (1 diff)
• emul_gopher.h.OLD (modified) (1 diff)
• emul_rplay.h.OLD (modified) (1 diff)
• plugins.h (modified) (1 diff)

roard/include/client.h

@@ -89 +89 @@
 enum roard_proto_type {
  ROARD_PROTO_TYPE_BUILDIN = 0,
- ROARD_PROTO_TYPE_ROARDPROTO = 1,
+// ROARD_PROTO_TYPE_ROARDPROTO = 1, // old. Removed in 1.0beta6.
  ROARD_PROTO_TYPE_COMMON = 2
 };
@@ -101 +101 @@
  union {
   int buildin; // dummy
-  struct roard_proto roardproto;
-  // add common here when ready.
   const struct roar_dl_proto * common;
  } impl;
@@ -143 +141 @@
 const struct roard_proto_handle * clients_get_protohandle(const int proto);
 int clients_register_proto_common(const struct roar_dl_proto * proto, struct roar_dl_lhandle * lhandle);
-int clients_register_proto  (struct roard_proto * proto, struct roar_dl_lhandle * lhandle);
 int clients_unregister_proto(int proto);
 void print_protolist        (enum output_format format);

roard/include/emul_esd.h.OLD

@@ -48 +48 @@
 
 int emul_esd_exec_command  (int client, int cmd, struct roar_vio_calls * vio);
-int emul_esd_check_client  (int client, struct roar_vio_calls * vio);
+int emul_esd_check_client  (int client, struct roar_vio_calls * vio, struct roar_buffer ** obuffer, void ** userdata, const struct roar_keyval * protopara, ssize_t protoparalen, struct roar_dl_librarypara * pluginpara);
 
 int emul_esd_int_read_buf  (int client, int * data, void * buf);

roard/include/emul_gopher.h.OLD

@@ -29 +29 @@
 #include <roaraudio.h>
 
-int emul_gopher_check_client(int client, struct roar_vio_calls * vio);
-int emul_gopher_flushed_client(int client, struct roar_vio_calls * vio);
+int emul_gopher_check_client(int client, struct roar_vio_calls * vio, struct roar_buffer ** obuffer, void ** userdata, const struct roar_keyval * protopara, ssize_t protoparalen, struct roar_dl_librarypara * pluginpara);
+int emul_gopher_flushed_client(int client, struct roar_vio_calls * vio, struct roar_buffer ** obuffer, void ** userdata, const struct roar_keyval * protopara, ssize_t protoparalen, struct roar_dl_librarypara * pluginpara);
 
 #endif

roard/include/emul_rplay.h.OLD

@@ -39 +39 @@
 };
 
-int emul_rplay_check_client  (int client, struct roar_vio_calls * vio);
+int emul_rplay_check_client  (int client, struct roar_vio_calls * vio, struct roar_buffer ** obuffer, void ** userdata, const struct roar_keyval * protopara, ssize_t protoparalen, struct roar_dl_librarypara * pluginpara);
 
 int emul_rplay_exec_command  (int client, struct roar_vio_calls * vio, char * command);

roard/include/plugins.h

@@ -41 +41 @@
 void print_pluginlist(enum output_format format);
 
-int plugins_reg_proto(struct roard_proto         * proto);
-
-#define ROARD_DL_REG__UNI_PRE(name) \
- static int __reg_ ## name(struct roar_dl_librarypara * para, struct roar_dl_libraryinst * lib) { \
-  size_t i; \
- \
-  (void)para, (void)lib;
-
-#define ROARD_DL_REG__UNI_POST \
- \
-  return 0; \
- }
-
-#define ROARD_DL_REG_PROTO(proto) \
- ROARD_DL_REG__UNI_PRE(proto) \
-  for (i = 0; i < (sizeof((proto))/sizeof(*(proto))); i++) \
-   plugins_reg_proto(&((proto)[i])); \
- ROARD_DL_REG__UNI_POST
-
-// Register Protocol callbacks:
-#define ROARD_DL_REGFN_PROTO() ROAR_DL_PLUGIN_REG(ROAR_DL_FN_PROTO, __reg_proto)
-
 // Check version:
 #define ROARD_DL_CHECK_VERSIONS() ROAR_DL_PLUGIN_CHECK_VERSIONS(ROARD_DL_APPNAME, ROARD_DL_ABIVERSION)