Changeset 4664:fd2cbe7b3893 in roaraudio

Timestamp:

12/15/10 02:26:07 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added support for automatic codec detection in case _MIMETYPE is supported

File:

• roarclients/roarcatvio.c (modified) (4 diffs)

roarclients/roarcatvio.c

@@ -47 +47 @@
  int    bits     = ROAR_BITS_DEFAULT;
  int    channels = ROAR_CHANNELS_DEFAULT;
- int    codec    = ROAR_CODEC_DEFAULT;
+ int    codec    = -1;
  char * server   = NULL;
  char * k;
@@ -55 +55 @@
  struct roar_vio_defaults def;
  int file_opened = 0;
+ const char * content_type;
 
  if ( roar_vio_open_fh(&file, ROAR_STDIN) == -1 )
@@ -90 +91 @@
     return 1;
    }
+
+   if ( codec == -1 ) {
+    if ( roar_vio_ctl(&file, ROAR_VIO_CTL_GET_MIMETYPE, &content_type) != -1 ) {
+     codec = roar_mime2codec(content_type);
+    }
+   }
   } else {
    fprintf(stderr, "Error: unknown argument: %s\n", k);
@@ -96 +103 @@
   }
  }
+
+ if ( codec == -1 )
+  codec = ROAR_CODEC_DEFAULT;
 
  if ( roar_vio_simple_stream(&stream, rate, channels, bits, codec, server, ROAR_DIR_PLAY, name) == -1 ) {