Changeset 3213:da8251c98c0a in roaraudio for roard

Timestamp:

01/24/10 05:41:59 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

support to transpher mixer stream id

Location:

roard

Files:

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

roard/include/streams.h

@@ -83 +83 @@
  struct roar_vio_calls jumbo;
  struct roar_vio_calls * viop;
+ int mixer_stream;
 } * g_streams[ROAR_STREAMS_MAX];
 
@@ -99 +100 @@
 int streams_set_dir    (int id, int dir, int defaults);
 int streams_get_dir    (int id);
+
+int streams_set_mixer_stream(int id, int mixer);
+int streams_get_mixer_stream(int id, int mixer);
 
 int streams_get_subsys (int id);

roard/req.c

@@ -595 +595 @@
     audio_info = &(s->info);
 
-    mes->datalen = 2*10;
-
-    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 & 0xFFFF) | (ss->primary ? ROAR_FLAG_PRIMARY : 0) | (ss->driver_id != -1 ? ROAR_FLAG_OUTPUT : 0);
-    d[7] = ss->delay/1000;
-    d[8] = ss->state;
-    d[9] = (ss->flags & 0xFFFF0000) >> 16;
+    mes->datalen = 2*11;
+
+    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 & 0xFFFF) | (ss->primary ? ROAR_FLAG_PRIMARY : 0) | (ss->driver_id != -1 ? ROAR_FLAG_OUTPUT : 0);
+    d[ 7] = ss->delay/1000;
+    d[ 8] = ss->state;
+    d[ 9] = (ss->flags & 0xFFFF0000) >> 16;
+    d[10] = ss->mixer_stream;
 
     ROAR_DBG("req_on_get_stream_para(*): ss->driver_id=%i", ss->driver_id);

roard/streams.c

@@ -105 +105 @@
    s->outputbuffer    = NULL;
    s->prethru         = NULL;
+   s->mixer_stream    = -1;
 
    s->mixer.scale     = 65535;
@@ -325 +326 @@
 }
 
+int streams_set_mixer_stream(int id, int mixer) {
+ struct roar_stream_server * ss;
+
+ _CHECK_SID(id);
+
+ if ( (ss = g_streams[id]) == NULL )
+  return -1;
+
+ ss->mixer_stream = mixer;
+
+ return 0;
+}
+
+int streams_get_mixer_stream(int id, int mixer) {
+ struct roar_stream_server * ss;
+
+ _CHECK_SID(id);
+
+ if ( (ss = g_streams[id]) == NULL )
+  return -1;
+
+ return ss->mixer_stream;
+}
+
 int streams_get_subsys (int id) {
  struct roar_stream_server * ss;