Changeset 1000:43afe5f9b605 in roaraudio

Timestamp:

12/19/08 00:17:51 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added Ogg FLAC and Ogg Speex magic

File:

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

libroar/file.c

@@ -44 +44 @@
   if ( strncmp(buf, "OggS", 4) == 0 ) {
    codec = ROAR_CODEC_OGG_GENERAL;
-   if ( len > 34 ) { // this is 7 bytes after the end of the header
-    if ( strncmp(buf+28, "\001vorbis", 7) == 0 )
-     codec = ROAR_CODEC_OGG_VORBIS;
+   if ( len > 32 ) { // this is 5 bytes after the end of the header
+    if ( strncmp(buf+28, "\177FLAC", 5) == 0 ) {
+     codec = ROAR_CODEC_OGG_FLAC;
+    } else if ( strncmp(buf+28, "Speex", 5) == 0 ) {
+     codec = ROAR_CODEC_OGG_SPEEX;
+    } else if ( len > 34 ) { // this is 7 bytes after the end of the header
+     if ( strncmp(buf+28, "\001vorbis", 7) == 0 )
+      codec = ROAR_CODEC_OGG_VORBIS;
+    }
    }
   } else if ( strncmp(buf, "MThd", 4) == 0 ) {
@@ -195 +201 @@
  codec = roar_file_codecdetect(buf, len);
 
+ ROAR_DBG("roar_file_play_full(*): codec=%i(%s)", codec, roar_codec2str(codec));
+
  seek = lseek(in, 0, SEEK_SET) == (off_t) -1 ? 0 : 1;