Changeset 117:b3b15c6ff97d in roaraudio

Timestamp:

07/13/08 14:42:11 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

get channels and rate form the file, a bit better output of meta data

File:

• roarclients/roarvorbis.c (modified) (6 diffs)

roarclients/roarvorbis.c

@@ -28 +28 @@
 
 int main (int argc, char * argv[]) {
- int    rate     = 44100;
  int    bits     = 16;
- int    channels = 2;
  int    codec    = ROAR_CODEC_DEFAULT;
  char * server   = NULL;
@@ -67 +65 @@
  }
 
- if ( roar_stream_new(&s, rate, channels, bits, codec) == -1 ) {
-  roar_disconnect(&con);
-  return -1;
- }
-
- if ( roar_stream_connect(&con, &s, ROAR_DIR_PLAY) == -1 ) {
-  roar_disconnect(&con);
-  return -1;
- }
-
  if ( (in = fopen(file, "rb")) == NULL ) {
   roar_disconnect(&con);
@@ -99 +87 @@
   struct roar_meta   meta;
 
+  fprintf(stderr, "Audio: %i channel, %liHz\n\n", vi->channels, vi->rate);
+
+  if ( roar_stream_new(&s, vi->rate, vi->channels, bits, codec) == -1 ) {
+   roar_disconnect(&con);
+   return -1;
+  }
+
+  if ( roar_stream_connect(&con, &s, ROAR_DIR_PLAY) == -1 ) {
+   roar_disconnect(&con);
+   return -1;
+  }
+
   meta.value = value;
   meta.key[0] = 0;
@@ -106 +106 @@
   roar_stream_meta_set(&con, &s, ROAR_META_MODE_SET, &meta);
 
+
+
   while(*ptr){
-    fprintf(stderr,"%s\n",*ptr);
-
     for (j = 0; (*ptr)[j] != 0 && (*ptr)[j] != '='; j++)
      key[j] = (*ptr)[j];
@@ -121 +121 @@
      roar_stream_meta_set(&con, &s, ROAR_META_MODE_SET, &meta);
 
+    fprintf(stderr, "Meta %-16s: %s\n", key, value);
     ++ptr;
   }
-  fprintf(stderr,"\nBitstream is %d channel, %ldHz\n",vi->channels,vi->rate);
-  fprintf(stderr,"Encoded by: %s\n\n",ov_comment(&vf,-1)->vendor);
+
  }
 
@@ -132 +132 @@
  }
   
- while(!eof){
-  long ret=ov_read(&vf,pcmout,sizeof(pcmout),0,2,1,&current_section);
+ while (!eof) {
+  long ret = ov_read(&vf, pcmout, sizeof(pcmout), 0, 2, 1, &current_section);
   if (ret == 0) {
    /* EOF */