Changeset 4678:8480af30c884 in roaraudio

Timestamp:

12/22/10 01:34:40 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

convert select(){} into array looked up with for(){} for protocol in client check rutine

Location:

roard

Files:

• clients.c (modified) (4 diffs)
• include/client.h (modified) (1 diff)
• include/roard.h (modified) (1 diff)

roard/clients.c

@@ -26 +26 @@
 #include "roard.h"
 
+struct roard_proto g_proto[] = {
+#ifndef ROAR_WITHOUT_DCOMP_EMUL_ESD
+#ifdef ROAR_HAVE_H_ESD
+ {ROAR_PROTO_ESOUND, emul_esd_check_client},
+#endif
+#endif
+#ifndef ROAR_WITHOUT_DCOMP_EMUL_RPLAY
+ {ROAR_PROTO_RPLAY, emul_rplay_check_client},
+#endif
+ {-1, NULL}
+};
+
 #define _CHECK_CID_RET(id,ret) if ( (id) < 0 || (id) > ROAR_CLIENTS_MAX || g_clients[(id)] == NULL ) return (ret)
 #define _CHECK_CID(id)         _CHECK_CID_RET((id), -1)
@@ -490 +502 @@
  uint32_t flags[2] = {COMMAND_FLAG_NONE, COMMAND_FLAG_NONE};
  uint32_t event;
+ size_t i;
 
  _CHECK_CID(id);
@@ -541 +554 @@
 
    break;
-#ifndef ROAR_WITHOUT_DCOMP_EMUL_ESD
-#ifdef ROAR_HAVE_H_ESD
-  case ROAR_PROTO_ESOUND:
-    rv = emul_esd_check_client(id, NULL);
-   break;
-#endif
-#endif
-#ifndef ROAR_WITHOUT_DCOMP_EMUL_RPLAY
-  case ROAR_PROTO_RPLAY:
-    rv = emul_rplay_check_client(id, NULL);
-   break;
-#endif
 #ifndef ROAR_WITHOUT_DCOMP_EMUL_RSOUND
   case ROAR_PROTO_RSOUND:
@@ -581 +582 @@
   default:
     rv = -1;
+    for (i = 0; i < (sizeof(g_proto)/sizeof(*g_proto)); i++) {
+     if ( g_proto[i].proto == c->proto ) {
+      rv = g_proto[i].check_client(id, NULL);
+     }
+    }
  }
 

roard/include/client.h

@@ -69 +69 @@
 } * g_clients[ROAR_CLIENTS_MAX];
 
+struct roard_proto {
+ int proto;
+ int (*check_client)(int client, struct roar_vio_calls * vio);
+};
 
 // basic functions

roard/include/roard.h

@@ -155 +155 @@
 #ifdef ROAR_SUPPORT_LISTEN
 int get_listen(struct roard_listen ** sock, char *** sockname);
+int add_listen (char * addr, int port, int sock_type, char * user, char * group, int proto, int dir, struct roar_audio_info * info);
 #endif