Changeset 631:105d41577f20 in roaraudio

Timestamp:

08/20/08 17:37:18 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

don't test for ESD_BITS8 as it is zero :), test for ESD_BITS16

Location:

libroaresd

Files:

• esdctl.c (modified) (2 diffs)
• esdstream.c (modified) (3 diffs)

libroaresd/esdctl.c

@@ -35 +35 @@
  char buf[80] = "";
 
- if ( server_info->format & ESD_BITS8 )
+ if ( server_info->format & ESD_BITS16 )
+  strcat(buf, "16 bit ");
+ else
   strcat(buf, "8 bit ");
- else
-  strcat(buf, "16 bit ");
 
  if ( server_info->format & ESD_STEREO )
@@ -54 +54 @@
  char buf[80] = "";
 
- if ( player_info->format & ESD_BITS8 )
+ if ( player_info->format & ESD_BITS16 )
+  strcat(buf, "16 bit ");
+ else
   strcat(buf, "8 bit ");
- else
-  strcat(buf, "16 bit ");
 
  if ( player_info->format & ESD_MONO )

libroaresd/esdstream.c

@@ -19 +19 @@
  int codec = ROAR_CODEC_DEFAULT;
 
- if ( (format & ESD_BITS8) ) {
+ if ( (format & ESD_BITS16) ) {
+  bits  = 16;
+ } else {
   bits  = 8;
   codec = CODEC_DEF_8BIT;
- } else {
-  bits = 16;
  }
 
@@ -54 +54 @@
  int codec = ROAR_CODEC_DEFAULT;
 
- if ( (format & ESD_BITS8) ) {
+ ROAR_DBG("esd_monitor_stream(format=%x, rate=%i, host='%s', name='%s') = ?", format, rate, host, name);
+
+ if ( (format & ESD_BITS16) ) {
+  bits  = 16;
+ } else {
   bits  = 8;
   codec = CODEC_DEF_8BIT;
- } else {
-  bits = 16;
  }
 
@@ -80 +82 @@
  int codec = ROAR_CODEC_DEFAULT;
 
- if ( (format & ESD_BITS8) ) {
+ if ( (format & ESD_BITS16) ) {
+  bits  = 16;
+ } else {
   bits  = 8;
   codec = CODEC_DEF_8BIT;
- } else {
-  bits = 16;
  }