Changeset 3043:ddabf4ccc93e in roaraudio

Timestamp:

11/29/09 10:54:00 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

support for writing VCLT

File:

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

roarclients/roarvorbis.c

@@ -47 +47 @@
  printf("  --server SERVER    - Set server hostname\n"
         "  --help             - Show this help\n"
+        "  --vclt-out FILE    - Writes VCLT file\n"
        );
 
@@ -65 +66 @@
 }
 
-int update_stream (struct roar_connection * con, struct roar_stream * s, int * out, OggVorbis_File * vf, char * file, struct roar_audio_info * info) {
+int update_stream (struct roar_connection * con, struct roar_stream * s, int * out, OggVorbis_File * vf, char * file, struct roar_audio_info * info, struct roar_vio_calls * vclt) {
  vorbis_info *vi = ov_info(vf, -1);
  int    bits     = 16;
@@ -146 +147 @@
     fprintf(stderr, "Meta %-16s: %s\n", key, value);
 
+    if ( vclt != NULL ) {
+     roar_vio_printf(vclt, "%s=%s\n", key, value);
+    }
+
     meta.type = roar_meta_inttype(key);
     if ( meta.type != -1 )
@@ -159 +164 @@
  roar_stream_meta_set(con, s, ROAR_META_MODE_FINALIZE, &meta);
 
+ if ( vclt != NULL ) {
+  roar_vio_printf(vclt, "==\n");
+ }
+
  return 0;
 }
@@ -165 +174 @@
 
 int main (int argc, char * argv[]) {
+ struct roar_vio_calls vclt;
+ struct roar_vio_defaults def;
 #ifndef ROAR_HAVE_LIBVORBISFILE
  fprintf(stderr, "Error: no Vorbis support!\n");
@@ -171 +182 @@
  char * server   = NULL;
  char * file     = NULL;
+ char * vcltfile = NULL;
  char * k;
  int    i;
@@ -190 +202 @@
   if ( strcmp(k, "--server") == 0 ) {
    server = argv[++i];
+  } else if ( strcmp(k, "--vclt-out") == 0 ) {
+   vcltfile = argv[++i];
   } else if ( strcmp(k, "--help") == 0 ) {
    usage();
@@ -235 +249 @@
  }
 
+ if ( vcltfile != NULL ) {
+  if ( roar_vio_dstr_init_defaults(&def, ROAR_VIO_DEF_TYPE_NONE, O_WRONLY|O_CREAT|O_APPEND, 0644) == -1 )
+   return 1;
+  if ( roar_vio_open_dstr(&vclt, vcltfile, &def, 1) == -1 ) {
+   fprintf(stderr, "Error: can not open file: %s: %s\n", k, strerror(errno));
+   return 1;
+  }
+ }
+
 // if ( update_stream(&con, &s, &out, &vf, file) == -1 )
 //  return 1;
@@ -242 +265 @@
 
   if ( last_section != current_section )
-   if ( update_stream(&con, &s, &out, &vf, file, &info) == -1 )
+   if ( update_stream(&con, &s, &out, &vf, file, &info, vcltfile == NULL ? NULL : &vclt) == -1 )
     return 1;
 
@@ -267 +290 @@
  roar_disconnect(&con);
 
+ if ( vcltfile != NULL ) {
+  roar_vio_close(&vclt);
+ }
+
  return 0;
 #endif