Changeset 5739:2a1671d592b9 in roaraudio for roard/clients.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:

• roard/clients.c (modified) (3 diffs)

roard/clients.c

@@ -33 +33 @@
 struct roar_client_server * g_clients[ROAR_CLIENTS_MAX];
 
-static struct roar_dl_proto
-#if !defined(ROAR_WITHOUT_DCOMP_EMUL_ESD) && defined(ROAR_HAVE_H_ESD)
-__proto_common_esd = {
- .proto = ROAR_PROTO_ESOUND,
- .description = "EsounD emulation",
- .flags = ROAR_DL_PROTO_FLAGS_NONE,
- .handle = emul_esd_check_client
-},
-#endif
-#ifndef ROAR_WITHOUT_DCOMP_EMUL_RPLAY
-__proto_common_rplay = {
- .proto = ROAR_PROTO_RPLAY,
- .description = "RPlay emulation",
- .flags = ROAR_DL_PROTO_FLAGS_NONE,
- .handle = emul_rplay_check_client
-},
-#endif
-#ifndef ROAR_WITHOUT_DCOMP_EMUL_GOPHER
-__proto_common_gopher = {
- .proto = ROAR_PROTO_GOPHER,
- .description = "The Internet Gopher Protocol",
- .flags = ROAR_DL_PROTO_FLAGS_NONE,
- .handle = emul_gopher_check_client,
- .flushed = emul_gopher_flushed_client
-}
-#endif
-;
+extern struct roar_dl_proto __proto_common_rplay;
+extern struct roar_dl_proto __proto_common_gopher;
+extern struct roar_dl_proto __proto_common_esd;
 
 static struct roard_proto_handle __protos[MAX_PROTOS] = {
@@ -252 +228 @@
     // nothing needed to be done here
    break;
-#ifndef ROAR_WITHOUT_DCOMP_EMUL_ESD
-#ifdef ROAR_HAVE_H_ESD
-  case ROAR_PROTO_ESOUND:
-    ROAR_DBG("net_get_new_client(*): execing ESD CONNECT command");
-
-    if ( roar_vio_open_fh_socket(&vio, fh) == -1 )
-     return -1;
-
-    ROAR_DBG("net_get_new_client(*): creating VIO OK");
-
-    if ( emul_esd_exec_command(client, ESD_PROTO_CONNECT, &vio) == -1 )
-     return -1;
-
-    ROAR_DBG("net_get_new_client(*): CONNECT execed sucessfully");
-   break;
-#endif
-#endif
 #ifndef ROAR_WITHOUT_DCOMP_EMUL_SIMPLE
   case ROAR_PROTO_SIMPLE:
@@ -277 +236 @@
 #ifndef ROAR_WITHOUT_DCOMP_EMUL_RSOUND
   case ROAR_PROTO_RSOUND: // nothing to do here.
-   break;
-#endif
-#ifndef ROAR_WITHOUT_DCOMP_EMUL_RPLAY
-  case ROAR_PROTO_RPLAY:
-    if ( roar_vio_open_fh_socket(&vio, fh) == -1 )
-     return -1;
-
-    if ( emul_rplay_on_status(client, NULL, &vio, NULL, 0) == -1 )
-     return -1;
    break;
 #endif