Changeset 5739:2a1671d592b9 in roaraudio for plugins/roard/protocol-rplay.c

Timestamp:

11/09/12 01:09:22 (11 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

commit 0: make protocol emulations for esd, gopher and rplay more independed so they can be moved into plugins easily (See: #311)

File:

• plugins/roard/protocol-rplay.c (modified) (9 diffs)

plugins/roard/protocol-rplay.c

@@ -28 +28 @@
 #ifndef ROAR_WITHOUT_DCOMP_EMUL_RPLAY
 
-struct emul_rplay_command emul_rplay_commands[] = {
+struct emul_rplay_command {
+ const char * name;
+ const char * usage;
+ ssize_t      min_args;
+ ssize_t      max_args;
+ int (*handler)(int client, struct emul_rplay_command * cmd, struct roar_vio_calls * vio, struct roar_keyval * kv, size_t kvlen);
+};
+
+static int emul_rplay_exec_command  (int client, struct roar_vio_calls * vio, char * command);
+
+static int emul_rplay_send_error    (int client, struct emul_rplay_command * cmd, struct roar_vio_calls * vio, struct roar_keyval * kv, size_t kvlen, const char * msg);
+
+static int emul_rplay_on_status(int client, struct emul_rplay_command * cmd, struct roar_vio_calls * vio, struct roar_keyval * kv, size_t kvlen);
+static int emul_rplay_on_quit(int client, struct emul_rplay_command * cmd, struct roar_vio_calls * vio, struct roar_keyval * kv, size_t kvlen);
+static int emul_rplay_on_help(int client, struct emul_rplay_command * cmd, struct roar_vio_calls * vio, struct roar_keyval * kv, size_t kvlen);
+
+// things we need to implent soon:
+static int emul_rplay_on_play(int client, struct emul_rplay_command * cmd, struct roar_vio_calls * vio, struct roar_keyval * kv, size_t kvlen);
+static int emul_rplay_on_put(int client, struct emul_rplay_command * cmd, struct roar_vio_calls * vio, struct roar_keyval * kv, size_t kvlen);
+//static int emul_rplay_on_set(int client, struct emul_rplay_command * cmd, struct roar_vio_calls * vio, struct roar_keyval * kv, size_t kvlen);
+//static int emul_rplay_on_modify(int client, struct emul_rplay_command * cmd, struct roar_vio_calls * vio, struct roar_keyval * kv, size_t kvlen);
+static int emul_rplay_on_pause(int client, struct emul_rplay_command * cmd, struct roar_vio_calls * vio, struct roar_keyval * kv, size_t kvlen);
+static int emul_rplay_on_continue(int client, struct emul_rplay_command * cmd, struct roar_vio_calls * vio, struct roar_keyval * kv, size_t kvlen);
+//static int emul_rplay_on_stop(int client, struct emul_rplay_command * cmd, struct roar_vio_calls * vio, struct roar_keyval * kv, size_t kvlen);
+
+static struct emul_rplay_command emul_rplay_commands[] = {
  {"access",      NULL, -1, -1, NULL},
  {"application", NULL,  1, -1, NULL},
@@ -111 +136 @@
 }
 
-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) {
- struct roar_vio_calls calls;
+static int emul_rplay_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) {
+ if ( emul_rplay_on_status(client, NULL, vio, NULL, 0) == -1 )
+  return -1;
+
+ return 0;
+}
+
+static 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) {
  char buf[1024];
  ssize_t len;
@@ -119 +150 @@
   return -1;
 
- if ( vio == NULL ) {
-  vio = &calls;
-  if ( roar_vio_open_fh_socket(vio, clients_get_fh(client)) == -1 )
-   return -1;
- }
-
  if ( (len = roar_vio_read(vio, buf, sizeof(buf)-1)) <= 0 ) {
   // really bad protocol error
-  clients_delete(client);
   return -1;
  }
@@ -256 +280 @@
 
 
-int emul_rplay_on_quit(int client, struct emul_rplay_command * cmd, struct roar_vio_calls * vio, struct roar_keyval * kv, size_t kvlen) {
- clients_delete(client);
+static int emul_rplay_on_quit(int client, struct emul_rplay_command * cmd, struct roar_vio_calls * vio, struct roar_keyval * kv, size_t kvlen) {
  return -1;
 }
 
-int emul_rplay_on_help(int client, struct emul_rplay_command * cmd, struct roar_vio_calls * vio, struct roar_keyval * kv, size_t kvlen) {
+static int emul_rplay_on_help(int client, struct emul_rplay_command * cmd, struct roar_vio_calls * vio, struct roar_keyval * kv, size_t kvlen) {
  struct emul_rplay_command * c;
 
@@ -276 +299 @@
 
 
-int emul_rplay_on_play(int client, struct emul_rplay_command * cmd, struct roar_vio_calls * vio, struct roar_keyval * kv, size_t kvlen) {
+static int emul_rplay_on_play(int client, struct emul_rplay_command * cmd, struct roar_vio_calls * vio, struct roar_keyval * kv, size_t kvlen) {
  struct roar_keyval        * kvr, * rate, * bits, * channels, * format, * byteorder;
  struct roar_audio_info      info;
@@ -370 +393 @@
 }
 
-int emul_rplay_on_put(int client, struct emul_rplay_command * cmd, struct roar_vio_calls * vio, struct roar_keyval * kv, size_t kvlen) {
+static int emul_rplay_on_put(int client, struct emul_rplay_command * cmd, struct roar_vio_calls * vio, struct roar_keyval * kv, size_t kvlen) {
  struct roar_keyval * kvr;
  int stream;
@@ -418 +441 @@
 }
 
-int emul_rplay_on_set(int client, struct emul_rplay_command * cmd, struct roar_vio_calls * vio, struct roar_keyval * kv, size_t kvlen);
-int emul_rplay_on_modify(int client, struct emul_rplay_command * cmd, struct roar_vio_calls * vio, struct roar_keyval * kv, size_t kvlen);
-
-int emul_rplay_on_pause(int client, struct emul_rplay_command * cmd, struct roar_vio_calls * vio, struct roar_keyval * kv, size_t kvlen) {
+//static int emul_rplay_on_set(int client, struct emul_rplay_command * cmd, struct roar_vio_calls * vio, struct roar_keyval * kv, size_t kvlen);
+//static int emul_rplay_on_modify(int client, struct emul_rplay_command * cmd, struct roar_vio_calls * vio, struct roar_keyval * kv, size_t kvlen);
+
+static int emul_rplay_on_pause(int client, struct emul_rplay_command * cmd, struct roar_vio_calls * vio, struct roar_keyval * kv, size_t kvlen) {
  struct roar_keyval * kvr;
  int stream;
@@ -450 +473 @@
 }
 
-int emul_rplay_on_continue(int client, struct emul_rplay_command * cmd, struct roar_vio_calls * vio, struct roar_keyval * kv, size_t kvlen) {
+static int emul_rplay_on_continue(int client, struct emul_rplay_command * cmd, struct roar_vio_calls * vio, struct roar_keyval * kv, size_t kvlen) {
  struct roar_keyval * kvr;
  int stream;
@@ -479 +502 @@
 }
 
-int emul_rplay_on_stop(int client, struct emul_rplay_command * cmd, struct roar_vio_calls * vio, struct roar_keyval * kv, size_t kvlen);
+//static int emul_rplay_on_stop(int client, struct emul_rplay_command * cmd, struct roar_vio_calls * vio, struct roar_keyval * kv, size_t kvlen);
+
+struct roar_dl_proto __proto_common_rplay = {
+ .proto = ROAR_PROTO_RPLAY,
+ .description = "RPlay emulation",
+ .flags = ROAR_DL_PROTO_FLAGS_NONE,
+ .set_proto = emul_rplay_set_proto,
+ .handle = emul_rplay_check_client
+};
 
 #endif