Changeset 3696:0f43f9c2e18f in roaraudio

Timestamp:

04/22/10 21:21:16 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

better support for stream roles

Files:

• include/libroar/stream.h (modified) (2 diffs)
• include/roaraudio/proto.h (modified) (1 diff)
• libroar/stream.c (modified) (2 diffs)
• plugins/xmms/roar.c (modified) (1 diff)
• roard/req.c (modified) (1 diff)

include/libroar/stream.h

@@ -88 +88 @@
 #define ROAR_ROLE_PHONE             6
 #define ROAR_ROLE_BACKGROUND_MUSIC  7
+#define ROAR_ROLE_VOICE             8
+#define ROAR_ROLE_INSTRUMENT        9
 
 struct roar_stream_info {
@@ -140 +142 @@
 int roar_stream_set_flags (struct roar_connection * con, struct roar_stream * s, int flags, int reset);
 
+int roar_stream_set_role  (struct roar_connection * con, struct roar_stream * s, int role);
+
 int roar_stream_s2m     (struct roar_stream * s, struct roar_message * m);
 int roar_stream_m2s     (struct roar_stream * s, struct roar_message * m);

include/roaraudio/proto.h

@@ -122 +122 @@
 #define ROAR_STREAM_PARA_NAME       3
 #define ROAR_STREAM_PARA_CHANMAP    4
+#define ROAR_STREAM_PARA_ROLE       5
 
 struct roar_timeofday {

libroar/stream.c

@@ -599 +599 @@
 
  data[0] = 0; // Version and reserved
- data[1] = 2; // flags
+ data[1] = ROAR_STREAM_PARA_FLAGS; // flags
  data[2] = reset == ROAR_RESET_FLAG ? ROAR_RESET_FLAG : ROAR_SET_FLAG;
  data[3] = flags;
+
+ for (i = 0; i < m.datalen/2; i++) {
+  data[i] = ROAR_HOST2NET16(data[i]);
+ }
+
+ if ( roar_req(con, &m, NULL) == -1 )
+  return -1;
+
+ if ( m.cmd != ROAR_CMD_OK )
+  return -1;
+
+ return 0;
+}
+
+int roar_stream_set_role  (struct roar_connection * con, struct roar_stream * s, int role) {
+ struct roar_message m;
+ uint16_t * data = (uint16_t *) m.data;
+ int i;
+
+ m.cmd     = ROAR_CMD_SET_STREAM_PARA;
+ m.stream  = s->id;
+ m.datalen = 6;
+ m.pos     = 0;
+
+ data[0] = 0; // Version and reserved
+ data[1] = ROAR_STREAM_PARA_ROLE; // flags
+ data[2] = role;
 
  for (i = 0; i < m.datalen/2; i++) {
@@ -879 +906 @@
  {ROAR_ROLE_BACKGROUND_MUSIC, "background music"},
  {ROAR_ROLE_BACKGROUND_MUSIC, "background_music"}, // alias
+ {ROAR_ROLE_VOICE,            "voice"           },
+ {ROAR_ROLE_INSTRUMENT,       "instrument"      },
  {-1, NULL}
 };

plugins/xmms/roar.c

@@ -170 +170 @@
  g_inst.pause   = 0;
 
+ roar_stream_set_role(&(g_inst.con), &(g_inst.stream), ROAR_ROLE_MUSIC);
  roar_update_metadata();
  roar_set_volume(g_inst.mixer.l, g_inst.mixer.r);

roard/req.c

@@ -718 +718 @@
      return -1;
    break;
+  case ROAR_STREAM_PARA_ROLE:
+    if ( mes->datalen != 2*3 )
+     return -1;
+
+    d[2] = ROAR_NET2HOST16(d[2]);
+
+    if ( streams_set_role(mes->stream, d[2]) == -1 )
+     return -1;
+   break;
   default:
     ROAR_WARN("req_on_set_stream_para(*): unsupported command version: %i, %i", d[0], d[1]);