Changeset 4584:959c2d722ca8 in roaraudio

Timestamp:

11/05/10 00:53:04 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

enable VS file API to handle mime-types

File:

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

libroar/vs.c

@@ -236 +236 @@
  ssize_t ret;
  int dir = O_RDONLY;
- int codec;
+ int codec = -1;
+ const char * content_type;
 
  _ckvss(-1);
@@ -266 +267 @@
 
  if ( !(vss->flags & FLAG_STREAM) ) {
-  ret = roar_vio_read(file, buf, sizeof(buf));
-
-  codec = roar_file_codecdetect(buf, ret);
-
-  if ( vss->info.codec == -1 ) {
-   roar_vio_close(file);
-   return -1;
+  if ( roar_vio_ctl(file, ROAR_VIO_CTL_GET_MIMETYPE, &content_type) != -1 ) {
+   codec = roar_mime2codec(content_type);
+  }
+
+  if ( codec == -1 ) {
+   ret = roar_vio_read(file, buf, sizeof(buf));
+
+   codec = roar_file_codecdetect(buf, ret);
+
+   if ( codec == -1 ) {
+    roar_vio_close(file);
+    return -1;
+   }
+
+   if ( roar_vio_lseek(file, 0, SEEK_SET) != 0 ) {
+    roar_vio_close(file);
+    return -1;
+   }
   }
 
@@ -281 +293 @@
   vss->info.codec    = codec;
   vss->info.bits     = ROAR_BITS_DEFAULT;
-
-  if ( roar_vio_lseek(file, 0, SEEK_SET) != 0 ) {
-   roar_vio_close(file);
-   return -1;
-  }
 
   ret = roar_vs_stream(vss, &(vss->info), ROAR_DIR_PLAY, error);