Changeset 5289:ddb3677af4d0 in roaraudio for libroar/vs.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/vs.c (modified) (2 diffs)

libroar/vs.c

@@ -338 +338 @@
  ret = roar_vio_simple_new_stream_obj(&(vss->vio), vss->con, &(vss->stream),
                                       info->rate, info->channels, info->bits, info->codec,
-                                      dir
+                                      dir, vss->mixerid
                                      );
 
@@ -351 +351 @@
  }
 
- if ( roar_stream_get_info(vss->con, &(vss->stream), &sinfo) != -1 ) {
-  // TODO: fix this:
-  // as we currently do not support to select mixer we just check if we hit the
-  // right one.
-  if ( vss->mixerid != -1 && vss->mixerid != sinfo.mixer ) {
-   _seterr(ROAR_ERROR_INVAL); // TODO: should we maybe use a diffrent value?
-   roar_vio_close(vss->vio_ptr);
-   return -1;
-  }
-
-  vss->mixerid = sinfo.mixer;
+ if ( vss->mixerid != -1 ) {
+  if ( roar_stream_get_info(vss->con, &(vss->stream), &sinfo) != -1 ) {
+   vss->mixerid = sinfo.mixer;
+  }
+ }
+
+ if ( vss->mixerid != -1 )
   _roar_vs_find_first_prim(vss);
- }
 
  vss->flags |= FLAG_STREAM;