Changeset 5739:2a1671d592b9 in roaraudio for roard/include

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)

Location:

roard/include

Files:

• emul_esd.h.OLD (modified) (1 diff)
• emul_gopher.h.OLD (modified) (1 diff)
• emul_rplay.h.OLD (modified) (1 diff)

roard/include/emul_esd.h.OLD

@@ -32 +32 @@
 #ifdef ROAR_HAVE_H_ESD
 
-// in case it is not allready included,
-// only needed in the case we have no libesd.* but a esd.h
-#include <esd.h>
-
-struct emul_esd_command {
- int    cmd;
- size_t datalen;
-#if !defined(ROAR_TARGET_MICROCONTROLLER) && !defined(ROAR_MINIMAL)
- char name[COMMAND_MAX_NAMELEN];
-#else
- char * name;
-#endif
- int (*handler)(int client, struct emul_esd_command * cmd, void * data, struct roar_vio_calls * vio);
-};
-
-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, 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);
-int emul_esd_int_read      (int client, int * data, struct roar_vio_calls * vio);
-int emul_esd_int_write     (int client, int   data, struct roar_vio_calls * vio);
-int emul_esd_test_auth     (int client, void * data, struct roar_vio_calls * vio);
-int emul_esd_test_byteorder(int client, void * data);
-
-int emul_esd_on_connect    (int client, struct emul_esd_command * cmd, void * data, struct roar_vio_calls * vio);
-int emul_esd_on_stream     (int client, struct emul_esd_command * cmd, void * data, struct roar_vio_calls * vio);
-int emul_esd_on_latency    (int client, struct emul_esd_command * cmd, void * data, struct roar_vio_calls * vio);
-int emul_esd_on_standby    (int client, struct emul_esd_command * cmd, void * data, struct roar_vio_calls * vio);
-int emul_esd_on_standbymode(int client, struct emul_esd_command * cmd, void * data, struct roar_vio_calls * vio);
-
-int emul_esd_on_stream_pan (int client, struct emul_esd_command * cmd, void * data, struct roar_vio_calls * vio);
-
-int emul_esd_on_server_info(int client, struct emul_esd_command * cmd, void * data, struct roar_vio_calls * vio);
-
-int emul_esd_on_all_info   (int client, struct emul_esd_command * cmd, void * data, struct roar_vio_calls * vio);
+extern struct roar_dl_proto __proto_common_esd;
 
 #endif

roard/include/emul_gopher.h.OLD

@@ -29 +29 @@
 #include <roaraudio.h>
 
-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);
+extern struct roar_dl_proto __proto_common_gopher;
 
 #endif

roard/include/emul_rplay.h.OLD

@@ -29 +29 @@
 #include <roaraudio.h>
 
-#ifndef ROAR_WITHOUT_DCOMP_EMUL_RPLAY
-
-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);
-};
-
-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);
-
-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);
-
-int emul_rplay_on_status(int client, struct emul_rplay_command * cmd, struct roar_vio_calls * vio, struct roar_keyval * kv, size_t kvlen);
-int emul_rplay_on_quit(int client, struct emul_rplay_command * cmd, struct roar_vio_calls * vio, struct roar_keyval * kv, size_t kvlen);
-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:
-int emul_rplay_on_play(int client, struct emul_rplay_command * cmd, struct roar_vio_calls * vio, struct roar_keyval * kv, size_t kvlen);
-int emul_rplay_on_put(int client, struct emul_rplay_command * cmd, struct roar_vio_calls * vio, struct roar_keyval * kv, size_t kvlen);
-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);
-int emul_rplay_on_continue(int client, struct emul_rplay_command * cmd, struct roar_vio_calls * vio, struct roar_keyval * kv, size_t kvlen);
-int emul_rplay_on_stop(int client, struct emul_rplay_command * cmd, struct roar_vio_calls * vio, struct roar_keyval * kv, size_t kvlen);
-#endif
+extern struct roar_dl_proto __proto_common_rplay;
 
 #endif