Changeset 5289:ddb3677af4d0 in roaraudio for libroar/simple.c

Timestamp:

11/22/11 14:47:44 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

use support to set mixer ID up at least one API layer

File:

• libroar/simple.c (modified) (10 diffs)

libroar/simple.c

@@ -36 +36 @@
 #include "libroar.h"
 
+static int roar_simple_stream_obj  (struct roar_stream * s, uint32_t rate, uint32_t channels, uint32_t bits, uint32_t codec, const char * server, int dir, const char * name, int mixer) _LIBROAR_ATTR_DEPRECATED;
+
 int roar_simple_connect (struct roar_connection * con, const char * server, const char * name) {
  return roar_simple_connect2(con, server, name, 0, 0);
@@ -62 +64 @@
 }
 
-int roar_simple_stream_obj  (struct roar_stream * s, int rate, int channels, int bits, int codec, const char * server, int dir, const char * name) {
+static int roar_simple_stream_obj  (struct roar_stream * s, uint32_t rate, uint32_t channels, uint32_t bits, uint32_t codec, const char * server, int dir, const char * name, int mixer) {
  struct roar_connection con;
  int ret;
@@ -82 +84 @@
  }
 
- if ( roar_stream_connect(&con, s, dir, -1) == -1 ) {
+ if ( roar_stream_connect(&con, s, dir, mixer) == -1 ) {
   safe_error = roar_error;
   roar_disconnect(&con);
@@ -115 +117 @@
 }
 
-int roar_simple_new_stream_attachexeced_obj (struct roar_connection * con, struct roar_stream * s, int rate, int channels, int bits, int codec, int dir) {
+int roar_simple_new_stream_attachexeced_obj (struct roar_connection * con, struct roar_stream * s, uint32_t rate, uint32_t channels, uint32_t bits, uint32_t codec, int dir, int mixer) {
  int fh;
 
  if ( (fh = roar_simple_stream_obj(s, rate, channels, bits, codec, NULL /* server, we hope this is ok here... */,
-                                   dir, "libroar temp stream")) == -1 )
+                                   dir, "libroar temp stream", mixer)) == -1 )
   return -1;
 
@@ -134 +136 @@
 }
 
-int roar_simple_new_stream_obj (struct roar_connection * con, struct roar_stream * s, int rate, int channels, int bits, int codec, int dir) {
+int roar_simple_new_stream_obj (struct roar_connection * con, struct roar_stream * s, uint32_t rate, uint32_t channels, uint32_t bits, uint32_t codec, int dir, int mixer) {
  struct roar_libroar_config * config = roar_libroar_get_config();
  char file[80] = {0};
@@ -171 +173 @@
  if ( config != NULL ) {
   if ( config->workaround.workarounds & ROAR_LIBROAR_CONFIG_WAS_USE_EXECED ) {
-   return roar_simple_new_stream_attachexeced_obj(con, s, rate, channels, bits, codec, dir);
+   return roar_simple_new_stream_attachexeced_obj(con, s, rate, channels, bits, codec, dir, mixer);
   }
  }
@@ -254 +256 @@
  }
 
- if ( roar_stream_connect(con, s, dir, -1) == -1 ) {
+ if ( roar_stream_connect(con, s, dir, mixer) == -1 ) {
   return -1;
  }
@@ -281 +283 @@
      return -1;
 
-    return roar_simple_new_stream_attachexeced_obj(con, s, rate, channels, bits, codec, dir);
+    return roar_simple_new_stream_attachexeced_obj(con, s, rate, channels, bits, codec, dir, mixer);
    }
 
@@ -310 +312 @@
       return -1;
 
-     return roar_simple_new_stream_attachexeced_obj(con, s, rate, channels, bits, codec, dir);
+     return roar_simple_new_stream_attachexeced_obj(con, s, rate, channels, bits, codec, dir, mixer);
     } else { // seems like we have a positive reply. So we retry the listen socket:
      FD_ZERO(&fds);
@@ -323 +325 @@
         return -1;
 
-       return roar_simple_new_stream_attachexeced_obj(con, s, rate, channels, bits, codec, dir);
+       return roar_simple_new_stream_attachexeced_obj(con, s, rate, channels, bits, codec, dir, mixer);
       }
      }