Changeset 540:c1fd46366418 in roaraudio

Timestamp:

08/18/08 14:43:14 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

get display of orgiginal codec working

Files:

• libroar/stream.c (modified) (2 diffs)
• roarclients/roarctl.c (modified) (1 diff)
• roard/req.c (modified) (1 diff)

libroar/stream.c

@@ -184 +184 @@
  }
 
- if ( m.datalen < 3*2 )
+ if ( m.datalen < 6*2 )
   return -1;
 
@@ -193 +193 @@
  info->pre_underruns  = data[3];
  info->post_underruns = data[4];
+ info->codec          = data[5];
 
  return 0;

roarclients/roarctl.c

@@ -152 +152 @@
   printf("Input bits            : %i\n", s.info.bits);
   printf("Input channels        : %i\n", s.info.channels);
-  printf("Input codec           : %i (%s%s)\n", s.info.codec, roar_codec2str(s.info.codec),
-                                      s.info.codec == ROAR_CODEC_DEFAULT ? " native" : "");
+  printf("Input codec           : %2i (%s%s)\n", s.info.codec, roar_codec2str(s.info.codec),
+                                       s.info.codec == ROAR_CODEC_DEFAULT ? " native" : "");
   if ( roar_stream_get_info(con, &s, &info) != -1 ) {
+   printf("Input codec (streamed): %2i (%s%s)\n", info.codec, roar_codec2str(info.codec),
+                                      info.codec == ROAR_CODEC_DEFAULT ? " native" : "");
    printf("Input block size      : %i Byte\n", info.block_size);
    printf("Underruns pre/post    : %i/%i\n",   info.pre_underruns, info.post_underruns);

roard/req.c

@@ -425 +425 @@
  d[3] = ROAR_STREAM_SERVER(s)->pre_underruns;
  d[4] = ROAR_STREAM_SERVER(s)->post_underruns;
- d[5] = ROAR_STREAM_SERVER(s)->codec;
+ d[5] = ROAR_STREAM_SERVER(s)->codec_orgi;
 
  for (i = 0; i < mes->datalen/2; i++) {