Changeset 5740:b3aff85876f1 in roaraudio for plugins/roard/protocol-gopher.c

Timestamp:

11/09/12 02:51:16 (11 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

commit 1: Moved protocol support into new plugins protocol-esound, protocol-rplay and protocol-gopher (Closes: #311)

File:

• plugins/roard/protocol-gopher.c (modified) (21 diffs)

plugins/roard/protocol-gopher.c

@@ -24 +24 @@
  */
 
-#include "roard.h"
+#include <roard/include/roard.h>
+
+#ifndef DISTRIBUTION_VERSION_STRING
+#define DISTRIBUTION_VERSION_STRING ""
+#endif
+#ifndef PACKAGE_VERSION
+#define PACKAGE_VERSION ""
+#endif
+#ifndef DEVICE_VENDOR_STRING
+#define DEVICE_VENDOR_STRING ""
+#endif
 
 #ifndef ROAR_WITHOUT_DCOMP_EMUL_GOPHER
@@ -93 +103 @@
 
 static int send_menu (int client, struct roar_gopher_menu * menu, struct roar_vio_calls * vio);
-static int send_text (int client, const char * text, struct roar_vio_calls * vio);
+static int send_text (const char * text, struct roar_buffer ** obuffer);
 
 
@@ -100 +110 @@
  const size_t len = 1024;
  const char * server_version = NULL;
+
+ (void)client, (void)vio, (void)selector, (void)text, (void)sitem;
 
  if ( DISTRIBUTION_VERSION_STRING[0] == 0 ) {
@@ -138 +150 @@
  size_t len;
 
+ (void)client, (void)vio;
+
  toks = roar_mm_strseltok(sitem->selector, selector, &tok, 1);
 
@@ -169 +183 @@
  size_t i;
  int ret;
+
+ (void)selector, (void)text, (void)sitem;
 
  memset(items, 0, sizeof(items));
@@ -224 +240 @@
  int ret;
 
+ (void)selector, (void)text, (void)sitem;
+
  memset(items, 0, sizeof(items));
 
@@ -281 +299 @@
  char tmp[80];
 
+ (void)text;
+
  memset(items, 0, sizeof(items));
 
@@ -356 +376 @@
  int id;
 
+ (void)text;
+
  memset(items, 0, sizeof(items));
 
@@ -391 +413 @@
                             s->info.rate, s->info.bits, s->info.channels, roar_codec2str(s->info.codec));
 
- if ( ss->codec_orgi != -1 && ss->codec_orgi != s->info.codec ) {
+ if ( ss->codec_orgi != ROAR_AUDIO_INFO_INVALID && ss->codec_orgi != s->info.codec ) {
   item = &(items[menu.items_len++]);
   item->type = _INFO;
@@ -431 +453 @@
  size_t i;
 
+ (void)selector, (void)text, (void)sitem;
+
  memset(items, 0, sizeof(items));
 
@@ -472 +496 @@
  int stream = -1;
 
+ (void)vio, (void)text;
+
  toks = roar_mm_strseltok(sitem->selector, selector, tok, 5);
 
@@ -496 +522 @@
  info.codec    = roar_str2codec(tok[4]);
 
- if ( info.codec == -1 )
+ if ( info.codec == ROAR_AUDIO_INFO_INVALID )
   return -1;
 
@@ -593 +619 @@
     break;
    default:
-     host = item->host == NULL ? sockaddr.addr : item->host;
-     port = item->port ==    0 ? sockaddr.port : item->port;
+     host = item->host == NULL ?               sockaddr.addr : item->host;
+     port = item->port ==    0 ? (unsigned int)sockaddr.port : item->port;
      snprintf(data, len-1, "%c%s\t%s\t%s\t%u\r\n", item->type, item->name, item->selector, host, port);
     break;
@@ -615 +641 @@
 }
 
-static int send_text (int client, const char * text, struct roar_vio_calls * vio) {
+static int send_text (const char * text, struct roar_buffer ** obuffer) {
  struct roar_buffer * buf;
  void * data;
@@ -626 +652 @@
  //memcpy(data+len, "\r\n.\r\n\0", 6);
  memcpy(data+len, "\0", 1);
- clients_add_output(client, &buf);
+ if ( roar_buffer_moveintoqueue(obuffer, &buf) == -1 )
+  return -1;
 
  return 0;
@@ -642 +669 @@
  char * text;
 
+ (void)obuffer, (void)userdata, (void)protopara, (void)protoparalen, (void)pluginpara;
+
  ROAR_DBG("emul_gopher_check_client(client=%i, vio=%p) = ?", client, vio);
 
@@ -718 +747 @@
 
   if ( funcret == 0 && text != NULL )
-   funcret = send_text(client, text, vio);
+   funcret = send_text(text, obuffer);
 
   if ( text != NULL )
@@ -728 +757 @@
     break;
    case _FILE:
-     funcret = send_text(client, c->text, vio);
+     funcret = send_text(c->text, obuffer);
     break;
    default:
@@ -749 +778 @@
 
 static 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) {
+
+ (void)client, (void)vio, (void)obuffer, (void)userdata, (void)protopara, (void)protoparalen, (void)pluginpara;
+
  ROAR_DBG("emul_gopher_flushed_client(client=%i, vio=%p) = ?", client, vio);
 
@@ -754 +786 @@
 }
 
-struct roar_dl_proto __proto_common_gopher = {
+static struct roar_dl_proto __proto_common_gopher = {
  .proto = ROAR_PROTO_GOPHER,
  .description = "The Internet Gopher Protocol",
@@ -762 +794 @@
 };
 
+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_common_gopher, ROAR_DL_PROTO_VERSION);
+ return 0;
+}
+
+ROAR_DL_PLUGIN_START(protocol_gopher) {
+ ROARD_DL_CHECK_VERSIONS();
+
+ ROAR_DL_PLUGIN_META_PRODUCT_NIV("protocol-gopher", ROAR_VID_ROARAUDIO, ROAR_VNAME_ROARAUDIO);
+ ROAR_DL_PLUGIN_META_VERSION(ROAR_VERSION_STRING);
+ ROAR_DL_PLUGIN_META_LICENSE_TAG(GPLv3_0);
+ ROAR_DL_PLUGIN_META_CONTACT_FLNE("Philipp", "Schafft", "ph3-der-loewe", "lion@lion.leolix.org");
+ ROAR_DL_PLUGIN_META_DESC("Implementation of the Internet Gopher protocol");
+
+ ROAR_DL_PLUGIN_REG(ROAR_DL_FN_PROTO, __reg_proto);
+} ROAR_DL_PLUGIN_END
+
 #endif