Changeset 776:1d9ce44598b2 in roaraudio

Timestamp:

09/07/08 16:43:20 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

better support passfh on seekable streams

File:

• libroar/file.c (modified) (3 diffs)

libroar/file.c

@@ -164 +164 @@
  int in, out = -1;
  ssize_t r = 0;
+ int seek;
  int len;
  char buf[BUFSIZE];
@@ -192 +193 @@
  codec = roar_file_codecdetect(buf, len);
 
+ seek = lseek(in, 0, SEEK_SET) == (off_t) -1 ? 0 : 1;
+
  if ( codec == -1 ) {
   close(in);
   return -1;
+ }
+
+ if ( passfh && !seek ) {
+  ROAR_WARN("roar_file_play_full(*): passfh on non seekable file: this may produce incorrect playback");
  }
 
@@ -217 +224 @@
   out = con->fh;
  } else {
-  if ( (out = roar_simple_new_stream_obj(con, s, rate, channels, bits, codec, ROAR_DIR_PLAY)) == -1 ) {
-   close(in);
-   return -1;
-  }
- }
-
- write(out, buf, len);
+  if ( !(passfh && seek) ) {
+   if ( (out = roar_simple_new_stream_obj(con, s, rate, channels, bits, codec, ROAR_DIR_PLAY)) == -1 ) {
+    close(in);
+    return -1;
+   }
+  } else {
+   if ( roar_stream_new(s, rate, channels, bits, codec) == -1 ) {
+    close(in);
+    return -1;
+   }
+
+   if ( roar_stream_connect(con, s, ROAR_DIR_PLAY) == -1 ) {
+    close(in);
+    return -1;
+   }
+  }
+ }
+
+ if ( !seek )
+  write(out, buf, len);
 
  if ( !passfh ) {