Changeset 3630:89a9079f8e3f in roaraudio for roard

Timestamp:

03/08/10 02:23:23 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

implemented roles, still need some support to set them

Location:

roard

Files:

• beep.c (modified) (1 diff)
• include/streams.h (modified) (2 diffs)
• req.c (modified) (2 diffs)
• streams.c (modified) (2 diffs)

roard/beep.c

@@ -165 +165 @@
  }
 
+ if ( streams_set_role(stream, ROAR_ROLE_BEEP) == -1 ) {
+  streams_delete(stream);
+  return -1;
+ }
+
  if ( (buf = beep_fill_buffer(beep, &(s->info))) == NULL ) {
   streams_delete(stream);

roard/include/streams.h

@@ -91 +91 @@
  int mixer_stream;
  struct roardsp_chanmap chanmap;
+ int role;
 } * g_streams[ROAR_STREAMS_MAX];
 
@@ -110 +111 @@
 int streams_set_mixer_stream(int id, int mixer);
 int streams_get_mixer_stream(int id, int mixer);
+
+int streams_set_role   (int id, int role);
 
 int streams_get_subsys (int id);

roard/req.c

@@ -596 +596 @@
     audio_info = &(s->info);
 
-    mes->datalen = 2*11;
+    mes->datalen = 2*12;
 
     d[ 2] = ROAR_OUTPUT_CALC_OUTBUFSIZE(audio_info);
@@ -607 +607 @@
     d[ 9] = (ss->flags & 0xFFFF0000) >> 16;
     d[10] = ss->mixer_stream;
+    d[11] = ss->role;
 
     ROAR_DBG("req_on_get_stream_para(*): ss->driver_id=%i", ss->driver_id);

roard/streams.c

@@ -107 +107 @@
    s->prethru         = NULL;
    s->mixer_stream    = -1;
+   s->role            = ROAR_ROLE_UNKNOWN;
 
    s->mixer.scale     = 65535;
@@ -376 +377 @@
 }
 
+int streams_set_role   (int id, int role) {
+ struct roar_stream_server * ss;
+
+ _CHECK_SID(id);
+
+ if ( (ss = g_streams[id]) == NULL )
+  return -1;
+
+ ss->role = role;
+
+ return 0;
+}
+
 int streams_get_subsys (int id) {
  struct roar_stream_server * ss;