Changeset 4159:195c87e5b538 in roaraudio

Timestamp:

08/13/10 03:39:04 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

updated handling of CELT magics

Files:

• include/roaraudio/audio.h (modified) (1 diff)
• libroar/file.c (modified) (1 diff)

include/roaraudio/audio.h

@@ -323 +323 @@
 #define ROAR_SPEEX_MODE_UWB        3
 
+#define ROAR_CELT_MAGIC_0          "RoarCELT0"
+#define ROAR_CELT_MAGIC_1          "RoarCELT1"
+#define ROAR_CELT_MAGIC_LEN        9
+
 #ifdef ROAR_HAVE_CELT_VERSION_0_7_1
-#define ROAR_CELT_MAGIC            "RoarCELT1"
+#define ROAR_CELT_MAGIC            ROAR_CELT_MAGIC_1
 #else
-#define ROAR_CELT_MAGIC            "RoarCELT0"
-#endif
-
-#define ROAR_CELT_MAGIC_LEN        9
+#define ROAR_CELT_MAGIC            ROAR_CELT_MAGIC_0
+#endif
 
 struct roar_audio_info {

libroar/file.c

@@ -74 +74 @@
    if ( len > ROAR_CELT_MAGIC_LEN ) {
 #endif
-    if ( strncmp(buf, ROAR_CELT_MAGIC, ROAR_CELT_MAGIC_LEN) == 0 )
+    if ( strncmp(buf, ROAR_CELT_MAGIC_0, ROAR_CELT_MAGIC_LEN) == 0 ||
+         strncmp(buf, ROAR_CELT_MAGIC_1, ROAR_CELT_MAGIC_LEN) == 0  )
      codec = ROAR_CODEC_ROAR_CELT;
    }
   } else if ( strncmp(buf, "fLaC", 4) == 0 ) {
    codec = ROAR_CODEC_FLAC;
+  } else if ( strncmp(buf, ".snd", 4) == 0 ) {
+   codec = ROAR_CODEC_AU;
   } else if ( len > 7 && strncmp(buf, "RAUM-CF0", 8) == 0 ) {
    codec = ROAR_CODEC_RAUM;