Changeset 3921:4c4449728a41 in roaraudio

Timestamp:

06/09/10 09:37:40 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added RSD EXEC feature to protocol emulation

Location:

roard

Files:

• clients.c (modified) (1 diff)
• emul_rsound.c (modified) (1 diff)
• include/streams.h (modified) (1 diff)
• streams.c (modified) (1 diff)

roard/clients.c

@@ -568 +568 @@
   if ( g_clients[client]->streams[i] == stream ) {
    g_clients[client]->execed = stream;
-   if ( (fh = streams_get_fh(stream)) == -1 ) {
+   if ( streams_is_ready(stream) == 0 ) {
     streams_set_fh(stream, g_clients[client]->fh);
     streams_set_socktype(stream, ROAR_SOCKET_TYPE_GENSTR);
    } else {
+    fh = streams_get_fh(stream);
+    ROAR_DBG("client_stream_exec(client=%i, stream=%i): fh=%i", client, stream, fh);
     close(g_clients[client]->fh);
     g_clients[client]->fh = fh;

roard/emul_rsound.c

@@ -275 +275 @@
   strncpy(c->name, msg.datasp, max_len);
   c->name[max_len] = 0;
+ } else if ( !strncmp(msg.datasp, "CLOSECTL", 9) ) {
+  if ( clients_get(client, &c) == -1 )
+   return clients_delete(client);
+
+  strncpy(msg.data, " CLOSECTL OK", EMUL_RSOUND_MSG_DATA_LEN);
+  msg.datalen = 12; //strlen(" CLOSECTL OK");
+
+  if ( emul_rsound_vsend_msg(&msg, vio) == -1 ) {
+   return clients_delete(client);
+  }
+
+  streamid = c->streams[0];
+  if ( client_stream_exec(client, streamid) == -1 ) {
+   return clients_delete(client);
+  }
+
+  return 0;
  } else {
   // Unknown command, kill the client.

roard/include/streams.h

@@ -127 +127 @@
 int streams_get_socktype (int id);
 
+int streams_is_ready     (int id);
+
 int streams_set_primary  (int id, int prim);
 int streams_mark_primary (int id);

roard/streams.c

@@ -680 +680 @@
 }
 
+int streams_is_ready     (int id) {
+ _CHECK_SID(id);
+
+ return g_streams[id]->ready;
+}
+
 int streams_set_primary (int id, int prim) {
  _CHECK_SID(id);