Merge branch 'sched'

[paraslash.git] / audiod.h

diff --git a/audiod.h b/audiod.h
index e6bd9b3314a9e6c2c9b9291a0d1a46057a1274bc..4cd35954f403c37d2f6d4ef7b62f4234bb4281d3 100644 (file)
--- a/audiod.h
+++ b/audiod.h
@@ -3,10 +3,11 @@ int num_filters(int audio_format_num);
 int get_audio_format_num(char *name);
 enum {
        AUDIO_FORMAT_MP3,
-       AUDIO_FORMAT_OGG
+       AUDIO_FORMAT_OGG,
+       AUDIO_FORMAT_AAC,
+       NUM_AUDIO_FORMATS
 };
-#define NUM_AUDIO_FORMATS (AUDIO_FORMAT_OGG + 1)
 extern const char *audio_formats[];
-#define DEFINE_AUDIO_FORMAT_ARRAY const char *audio_formats[] = {"mp3", "ogg", NULL}
+#define DEFINE_AUDIO_FORMAT_ARRAY const char *audio_formats[] = {"mp3", "ogg", "aac", NULL}
 #define MAX_STREAM_SLOTS 5