Changeset 5579:3887ff7af8e7 in roaraudio for plugins/universal/protocol-daytime.c

Timestamp:

07/21/12 19:40:17 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Converted roard plugins to universal where possible (Closes: #256)

File:

• plugins/universal/protocol-daytime.c (modified) (4 diffs)

plugins/universal/protocol-daytime.c

@@ -24 +24 @@
  */
 
-#include <roard/include/roard.h>
+#include <roaraudio.h>
 
-int new_client(int client, struct roar_vio_calls * vio, struct roard_listen * lsock) {
+static int _set_proto(int client, struct roar_vio_calls * vio, struct roar_buffer ** obuffer, void ** userdata, const struct roar_keyval * para, ssize_t paralen) {
  struct roar_buffer * buf;
  void * data;
@@ -33 +33 @@
  char * date = asctime(gmtime(&now));
 
- (void)vio, (void)lsock;
-
- ROAR_DBG("new_client(client=%i, vio=%p, lsock=%p) = ?", client, vio, lsock);
+ (void)client, (void)vio, (void)userdata, (void)para, (void)paralen;
 
  len = roar_mm_strlen(date) + 1;
@@ -44 +42 @@
  memcpy(data, date, len);
 
- clients_add_output(client, &buf);
-
- ROAR_DBG("new_client(client=%i, vio=%p, lsock=%p) = 0", client, vio, lsock);
- return 0;
-}
-
-static int flushed_client(int client, struct roar_vio_calls * vio) {
- (void)vio;
-
- clients_delete(client);
+ if ( *obuffer == NULL ) {
+  *obuffer = buf;
+ } else {
+  if ( roar_buffer_moveinto(*obuffer, &buf) == -1 )
+   return -1;
+ }
 
  return 0;
 }
 
-static struct roard_proto proto[1] = {
- {ROAR_PROTO_DAYTIME, ROAR_SUBSYS_NONE, "The Internet daytime protocol", NULL, new_client, NULL, NULL, NULL, flushed_client}
+static int _flushed(int client, struct roar_vio_calls * vio, struct roar_buffer ** obuffer, void ** userdata, const struct roar_keyval * para, ssize_t paralen) {
+ (void)client, (void)vio, (void)obuffer, (void)userdata, (void)para, (void)paralen;
+
+ roar_err_set(ROAR_ERROR_NODATA);
+ return -1;
+}
+
+static const struct roar_dl_proto proto = {
+ .proto = ROAR_PROTO_DAYTIME,
+ .description = "The Internet daytime protocol",
+ .flags = ROAR_DL_PROTO_FLAGS_NONE,
+ .set_proto = _set_proto,
+ .unset_proto = NULL,
+ .handle = NULL,
+ .flush = NULL,
+ .flushed = _flushed,
+ .status = NULL
 };
 
-ROARD_DL_REG_PROTO(proto)
+static int __reg_proto(struct roar_dl_librarypara * para, struct roar_dl_libraryinst * lib) {
+ (void)para, (void)lib;
+ ROAR_DL_PLUGIN_REG_FN(ROAR_DL_PROTO_SUBTYPE, proto, ROAR_DL_PROTO_VERSION);
+ return 0;
+}
 
 ROAR_DL_PLUGIN_START(protocol_daytime) {
- ROARD_DL_CHECK_VERSIONS();
-
  ROAR_DL_PLUGIN_META_PRODUCT_NIV("protocol-daytime", ROAR_VID_ROARAUDIO, ROAR_VNAME_ROARAUDIO);
  ROAR_DL_PLUGIN_META_VERSION(ROAR_VERSION_STRING);
@@ -73 +84 @@
  ROAR_DL_PLUGIN_META_DESC("Implementation of the Internet daytime protocol");
 
- ROARD_DL_REGFN_PROTO();
+ ROAR_DL_PLUGIN_REG(ROAR_DL_FN_PROTO, __reg_proto);
 } ROAR_DL_PLUGIN_END