Changeset 1842:8c8a003773ca in roaraudio

Timestamp:

05/23/09 04:17:05 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

support for names on server streams, added roar_stream_get_name()

Files:

• include/libroar/stream.h (modified) (1 diff)
• include/roaraudio/proto.h (modified) (1 diff)
• libroar/stream.c (modified) (2 diffs)
• roarclients/roarctl.c (modified) (2 diffs)
• roard/include/streams.h (modified) (2 diffs)
• roard/req.c (modified) (3 diffs)
• roard/streams.c (modified) (3 diffs)

include/libroar/stream.h

@@ -109 +109 @@
 
 int roar_stream_get_info (struct roar_connection * con, struct roar_stream * s, struct roar_stream_info * info);
+int roar_stream_get_name (struct roar_connection * con, struct roar_stream * s, char * name, size_t len);
 
 int roar_stream_set_flags (struct roar_connection * con, struct roar_stream * s, int flags, int reset);

include/roaraudio/proto.h

@@ -112 +112 @@
 #define ROAR_ATTACH_OUTPUT 3 /* attach a new output stream to the server */
 
+// modes for ROAR_CMD_?ET_STREAM_PARA...
+#define ROAR_STREAM_PARA_INFO       1
+#define ROAR_STREAM_PARA_FLAGS      2
+#define ROAR_STREAM_PARA_NAME       3
 
 struct roar_timeofday {

libroar/stream.c

@@ -338 +338 @@
 
  data[0] = 0; // Version and reserved
- data[1] = 1; // stream
+ data[1] = ROAR_STREAM_PARA_INFO; // stream
 
  for (i = 0; i < m.datalen/2; i++) {
@@ -368 +368 @@
  info->flags          = data[6];
  info->delay          = data[7]*1000;
+
+ return 0;
+}
+
+int roar_stream_get_name (struct roar_connection * con, struct roar_stream * s, char * name, size_t len) {
+ struct roar_message m;
+ uint16_t * data = (uint16_t *) m.data;
+
+ if ( con == NULL || s == NULL || name == NULL || len == 0 )
+  return -1;
+
+ name[0] = 0; // just in case...
+
+ m.cmd     = ROAR_CMD_GET_STREAM_PARA;
+ m.stream  = s->id;
+ m.datalen = 4;
+ m.pos     = 0;
+
+ data[0] = 0; // Version and reserved
+ data[1] = ROAR_STREAM_PARA_NAME; // stream
+
+ data[0] = ROAR_HOST2NET16(data[0]);
+ data[1] = ROAR_HOST2NET16(data[1]);
+
+ ROAR_DBG("roar_stream_get_name(*) = ?");
+
+ if ( roar_req(con, &m, NULL) == -1 )
+  return -1;
+
+ ROAR_DBG("roar_stream_get_name(*) = ?");
+
+ if ( m.cmd != ROAR_CMD_OK )
+  return -1;
+
+ ROAR_DBG("roar_stream_get_name(*) = ?");
+
+ if ( m.datalen < 4 )
+  return -1;
+
+ data[0] = ROAR_NET2HOST16(data[0]);
+ data[1] = ROAR_NET2HOST16(data[1]);
+
+ ROAR_DBG("roar_stream_get_name(*) = ?");
+
+ if ( data[0] != 0 || data[1] != ROAR_STREAM_PARA_NAME )
+  return -1;
+
+ m.datalen -= 4;
+
+ len--;
+
+ if ( len > m.datalen )
+  len = m.datalen;
+
+ strncpy(name, ((char*)m.data)+4, len);
+ name[len] = 0;
+
+ ROAR_DBG("roar_stream_get_name(*) = 0");
 
  return 0;

roarclients/roarctl.c

@@ -236 +236 @@
  struct roar_stream_info info;
  char flags[1024];
+ char name[1024];
 
 
@@ -250 +251 @@
   }
   printf("Stream direction      : %s\n", roar_dir2str(s.dir));
+
+  if ( roar_stream_get_name(con, &s, name, 1024) == 0 )
+   printf("Stream name           : %s\n", name);
+
   if ( s.pos_rel_id == -1 ) {
    printf("Relativ position id   : none (stream not synchronized)\n");

roard/include/streams.h

@@ -72 +72 @@
  int flags;
  uint_least32_t delay;
+ char * name;
 } * g_streams[ROAR_STREAMS_MAX];
 
@@ -99 +100 @@
 int streams_get_flag     (int id, int flag);
 
+int streams_set_name     (int id, char * name);
+char * streams_get_name  (int id);
+
 int streams_calc_delay   (int id);
 int streams_set_mixer    (int id);

roard/req.c

@@ -508 +508 @@
  uint16_t * d = (uint16_t *) mes->data;
  int i;
+ char * str;
 
  if ( mes->datalen != 4 )
@@ -516 +517 @@
  }
 
- if ( streams_get(mes->stream, &ss) == -1 ) {
-  ROAR_WARN("req_on_get_stream_para(*): request on non existing (or other error?) stream %i", mes->stream);
-  return -1;
- }
-
- if ( streams_calc_delay(mes->stream) == -1 ) {
-  ROAR_WARN("req_on_get_stream_para(*): can not calc delay for stream %i", mes->stream);
- }
-
- s = ROAR_STREAM(ss);
-
- audio_info = &(s->info);
-
- if ( d[0] != 0 || d[1] != 1 ) {
+ if ( d[0] != 0 ) {
   ROAR_WARN("req_on_get_stream_para(*): unsupported command version: %i, %i", d[0], d[1]);
   return -1;
  }
 
- mes->datalen = 2*8;
-
- d[2] = ROAR_OUTPUT_CALC_OUTBUFSIZE(audio_info);
- d[3] = ss->pre_underruns;
- d[4] = ss->post_underruns;
- d[5] = ss->codec_orgi;
- d[6] = ss->flags | (ss->primary ? ROAR_FLAG_PRIMARY : 0) | (ss->driver_id != -1 ? ROAR_FLAG_OUTPUT : 0);
- d[7] = ss->delay/1000;
-
- ROAR_DBG("req_on_get_stream_para(*): ss->driver_id=%i", ss->driver_id);
-
- ROAR_DBG("req_on_get_stream_para(*): delay=%i, send delay=%i", ss->delay, d[7]);
-
- for (i = 0; i < mes->datalen/2; i++) {
-  d[i] = ROAR_HOST2NET16(d[i]);
- }
-
- mes->pos = s->pos;
+ switch (d[1]) {
+  case ROAR_STREAM_PARA_INFO:
+    if ( streams_get(mes->stream, &ss) == -1 ) {
+     ROAR_WARN("req_on_get_stream_para(*): request on non existing (or other error?) stream %i", mes->stream);
+     return -1;
+    }
+
+    if ( streams_calc_delay(mes->stream) == -1 ) {
+     ROAR_WARN("req_on_get_stream_para(*): can not calc delay for stream %i", mes->stream);
+    }
+
+    s = ROAR_STREAM(ss);
+
+    audio_info = &(s->info);
+
+    mes->datalen = 2*8;
+
+    d[2] = ROAR_OUTPUT_CALC_OUTBUFSIZE(audio_info);
+    d[3] = ss->pre_underruns;
+    d[4] = ss->post_underruns;
+    d[5] = ss->codec_orgi;
+    d[6] = ss->flags | (ss->primary ? ROAR_FLAG_PRIMARY : 0) | (ss->driver_id != -1 ? ROAR_FLAG_OUTPUT : 0);
+    d[7] = ss->delay/1000;
+
+    ROAR_DBG("req_on_get_stream_para(*): ss->driver_id=%i", ss->driver_id);
+
+    ROAR_DBG("req_on_get_stream_para(*): delay=%i, send delay=%i", ss->delay, d[7]);
+
+    for (i = 0; i < mes->datalen/2; i++) {
+     d[i] = ROAR_HOST2NET16(d[i]);
+    }
+
+    mes->pos = s->pos;
+   break;
+
+  case ROAR_STREAM_PARA_NAME:
+   str = streams_get_name(mes->stream);
+
+   if ( str == NULL )
+    return -1;
+
+    mes->datalen = 4 + strlen(str);
+
+    if ( mes->datalen > LIBROAR_BUFFER_MSGDATA )
+     return -1;
+
+    strncpy(((char*)&(mes->data))+4, str, mes->datalen);
+
+    d[0] = ROAR_HOST2NET16(d[0]);
+    d[1] = ROAR_HOST2NET16(d[1]);
+   break;
+
+  default:
+    ROAR_WARN("req_on_get_stream_para(*): unsupported command: %i", d[1]);
+    return -1;
+ }
 
  mes->cmd = ROAR_CMD_OK;
@@ -568 +594 @@
  }
 
- if ( d[0] != 0 || d[1] != 2 ) {
+ if ( d[0] != 0 || d[1] != ROAR_STREAM_PARA_FLAGS ) {
   ROAR_WARN("req_on_set_stream_para(*): unsupported command version: %i, %i", d[0], d[1]);
   return -1;

roard/streams.c

@@ -80 +80 @@
    n->pos        = 0;
 
+   s->name            = NULL;
+
    s->client          = -1;
    s->socktype        = ROAR_SOCKET_TYPE_UNKNOWN;
@@ -190 +192 @@
  prim = s->primary;
 
+ if ( s->name != NULL )
+  free(s->name);
+
  free(s);
 
@@ -419 +424 @@
  return g_streams[id]->flags & flag ? 1 : 0;
 }
+
+int streams_set_name     (int id, char * name) {
+ char * str;
+
+ if ( g_streams[id] == NULL )
+  return -1;
+
+ if ( (str = strdup(name)) == NULL )
+  return -1;
+
+ if ( g_streams[id]->name != NULL )
+  free(g_streams[id]->name);
+
+ g_streams[id]->name = str;
+}
+
+char * streams_get_name  (int id) {
+ if ( g_streams[id] == NULL )
+  return NULL;
+
+ return g_streams[id]->name;
+}
+
 
 int streams_calc_delay    (int id) {