Changeset 120:85463285ddbe in roaraudio

Timestamp:

07/13/08 15:03:19 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

now using roar_simple_new_stream_obj(), not an execed stream so we can do meta updates

File:

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

roarclients/roarvorbis.c

@@ -35 +35 @@
  int    i;
  FILE * in;
- int    out;
+ int    out = -1;
  struct roar_connection con;
  struct roar_stream     s;
@@ -41 +41 @@
  int eof=0;
  int current_section;
+ int last_section = -1;
  char pcmout[4096];
 
@@ -86 +87 @@
   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 ) {
+  if ( (out = roar_simple_new_stream_obj(&con, &s, vi->rate, vi->channels, bits, codec, ROAR_DIR_PLAY)) == -1 ) {
    roar_disconnect(&con);
    return -1;
@@ -105 +101 @@
   meta.value = value;
   meta.key[0] = 0;
+
+  roar_stream_meta_set(&con, &s, ROAR_META_MODE_CLEAR, &meta);
 
   meta.type = ROAR_META_TYPE_FILENAME;
@@ -131 +129 @@
  }
 
- if ( roar_stream_exec(&con, &s) == -1 ) {
-  roar_disconnect(&con);
-  return -1;
- }
-  
  while (!eof) {
   long ret = ov_read(&vf, pcmout, sizeof(pcmout), 0, 2, 1, &current_section);
+
+  last_section = current_section;
+
   if (ret == 0) {
    /* EOF */
@@ -147 +143 @@
      /* we don't bother dealing with sample rate changes, etc, but
         you'll have to */
-    write(con.fh, pcmout, ret);
+    write(out, pcmout, ret);
   }
  }
@@ -154 +150 @@
 
 // fclose(in);
- close(con.fh);
+ close(out);
+ roar_disconnect(&con);
 
  return 0;