Changeset 5386:a3dc37deacbb in roaraudio

Timestamp:

01/14/12 19:17:33 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

only try to display mixer data as well as channel map if number of channels is in range for those functions

File:

• roarclients/roarctl.c (modified) (3 diffs)

roarclients/roarctl.c

@@ -401 +401 @@
                                      s.info.codec == ROAR_CODEC_DEFAULT ? " native" : "");
 // printf("Server Output rate: %i", s.info.rate);
-  if ( g_verbose > 1 && s.pos != (uint32_t)-1 )
-   printf("Server Position       : %lu S (%.3fs)\n", (unsigned long int) s.pos, (float)s.pos/(s.info.rate*s.info.channels));
+  if ( g_verbose > 1 && s.pos != (uint32_t)-1 ) {
+   if ( s.info.rate && s.info.channels ) {
+    printf("Server Position       : %lu S (%.3fs)\n", (unsigned long int) s.pos, (float)s.pos/(s.info.rate*s.info.channels));
+   } else {
+    printf("Server Position       : %lu S\n", (unsigned long int) s.pos);
+   }
+  }
 }
 
@@ -734 +739 @@
  }
 
- if ( g_verbose ) {
+ if ( g_verbose && (s.info.channels != 0 && s.info.channels <= ROAR_MAX_CHANNELS) ) {
   len = ROAR_MAX_CHANNELS;
   if ( roar_stream_get_chanmap(con, &s, chanmap, &len) == -1 ) {
@@ -748 +753 @@
 
  if ( s.dir != ROAR_DIR_THRU ) {
-  display_mixer(con, id);
+  if ( s.info.channels != 0 && s.info.channels <= ROAR_MAX_CHANNELS ) {
+   display_mixer(con, id);
+  }
   show_meta_all(con, id);
  }