Changeset 5740:b3aff85876f1 in roaraudio for plugins/roard/protocol-esound.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-esound.c (modified) (14 diffs)

plugins/roard/protocol-esound.c

@@ -24 +24 @@
  */
 
-#include "roard.h"
+#include <roard/include/roard.h>
 
 #ifndef ROAR_WITHOUT_DCOMP_EMUL_ESD
@@ -46 +46 @@
 
 static int emul_esd_int_read_buf  (int client, int * data, void * buf);
-static int emul_esd_int_read      (int client, int * data, struct roar_vio_calls * vio);
 static int emul_esd_int_write     (int client, int   data, struct roar_vio_calls * vio);
 static int emul_esd_test_auth     (int client, void * data, struct roar_vio_calls * vio);
@@ -166 +165 @@
 
 static int emul_esd_set_proto(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)obuffer, (void)userdata, (void)protopara, (void)protoparalen, (void)pluginpara;
+
  if ( emul_esd_exec_command(client, ESD_PROTO_CONNECT, vio) == -1 )
   return -1;
@@ -174 +176 @@
 static 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) {
  _cmd_t cmd;
+
+ (void)obuffer, (void)userdata, (void)protopara, (void)protoparalen, (void)pluginpara;
 
  if ( client == -1 )
@@ -190 +194 @@
  _cmd_t d;
 
+ (void)client;
+
  if ( data == NULL || buf == NULL )
   return -1;
 
  d = *(_cmd_t*)buf;
-
- *data = d;
-
- return 0;
-}
-static int emul_esd_int_read      (int client, int * data, struct roar_vio_calls * vio) {
- _cmd_t d;
-
- if ( data == NULL )
-  return -1;
-
- if ( roar_vio_read(vio, &d, _INTSIZE) != _INTSIZE )
-  return -1;
 
  *data = d;
@@ -216 +209 @@
  _cmd_t d = data;
 
+ (void)client;
+
  return roar_vio_write(vio, &d, _INTSIZE) == _INTSIZE ? 0 : -1;
 }
@@ -221 +216 @@
 static int emul_esd_test_auth     (int client, void * data, struct roar_vio_calls * vio) {
  // accept all clients for the moment.
+
+ (void)data;
+
  return emul_esd_int_write(client, 1, vio);
 }
@@ -247 +245 @@
 // handler:
 static int emul_esd_on_connect    (int client, struct emul_esd_command * cmd, void * data, struct roar_vio_calls * vio) {
+
+ (void)cmd;
 
  ROAR_DBG("emul_esd_on_connect(client=%i, cmd=%p, data=%p, vio=%p) = ?", client, cmd, data, vio);
@@ -356 +356 @@
  int lag = ROAR_OUTPUT_CFREQ;
 
+ (void)cmd, (void)data;
+
  lag *= 2.0 * 44100.0 / (float)g_sa->rate;
  
@@ -382 +384 @@
 static int emul_esd_on_standbymode(int client, struct emul_esd_command * cmd, void * data, struct roar_vio_calls * vio) {
  int mode = ESM_ERROR;
+
+ (void)cmd, (void)data;
 
  if ( g_standby ) {
@@ -402 +406 @@
  int ok = 0;
 
+ (void)cmd;
+
  emul_esd_int_read_buf(client, &stream, data + 0*_INTSIZE);
  emul_esd_int_read_buf(client, &left,   data + 1*_INTSIZE);
@@ -423 +429 @@
  int rate    = g_sa->rate;
  int format  = 0;
+
+ (void)cmd, (void)data;
 
  switch (g_sa->bits) {
@@ -556 +564 @@
 }
 
-struct roar_dl_proto __proto_common_esd = {
+static struct roar_dl_proto __proto_common_esd = {
  .proto = ROAR_PROTO_ESOUND,
  .description = "EsounD emulation",
@@ -564 +572 @@
 };
 
+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_esd, ROAR_DL_PROTO_VERSION);
+ return 0;
+}
+
+ROAR_DL_PLUGIN_START(protocol_esd) {
+ ROARD_DL_CHECK_VERSIONS();
+
+ ROAR_DL_PLUGIN_META_PRODUCT_NIV("protocol-esd", 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 Enlightened Sound Daemon's protocol");
+
+ ROAR_DL_PLUGIN_REG(ROAR_DL_FN_PROTO, __reg_proto);
+} ROAR_DL_PLUGIN_END
+
 #endif
 #endif