|
@@ -155,7 +155,7 @@ void decode_init(log_level level, const char *include_codecs, const char *exclud
|
|
|
// register codecs
|
|
|
// dsf,dff,alc,wma,wmap,wmal,aac,spt,ogg,ogf,flc,aif,pcm,mp3
|
|
|
i = 0;
|
|
|
-/*
|
|
|
+
|
|
|
#if DSD
|
|
|
if (!strstr(exclude_codecs, "dsd") && (!include_codecs || (order_codecs = strstr(include_codecs, "dsd"))))
|
|
|
sort_codecs((include_codecs ? order_codecs - include_codecs : i), register_dsd());
|
|
@@ -165,15 +165,16 @@ void decode_init(log_level level, const char *include_codecs, const char *exclud
|
|
|
sort_codecs((include_codecs ? order_codecs - include_codecs : i), register_ff("alc"));
|
|
|
if (!strstr(exclude_codecs, "wma") && (!include_codecs || (order_codecs = strstr(include_codecs, "wma"))))
|
|
|
sort_codecs((include_codecs ? order_codecs - include_codecs : i), register_ff("wma"));
|
|
|
-#endif
|
|
|
-*/
|
|
|
+#else
|
|
|
if (!strstr(exclude_codecs, "alac") && (!include_codecs || (order_codecs = strstr(include_codecs, "alac"))))
|
|
|
sort_codecs((include_codecs ? order_codecs - include_codecs : i), register_alac());
|
|
|
-
|
|
|
+#endif
|
|
|
+
|
|
|
#ifndef NO_FAAD
|
|
|
if (!strstr(exclude_codecs, "aac") && (!include_codecs || (order_codecs = strstr(include_codecs, "aac"))))
|
|
|
sort_codecs((include_codecs ? order_codecs - include_codecs : i), register_faad());
|
|
|
#endif
|
|
|
+
|
|
|
if (!strstr(exclude_codecs, "ogg") && (!include_codecs || (order_codecs = strstr(include_codecs, "ogg"))))
|
|
|
sort_codecs((include_codecs ? order_codecs - include_codecs : i), register_vorbis());
|
|
|
|
|
@@ -187,11 +188,10 @@ void decode_init(log_level level, const char *include_codecs, const char *exclud
|
|
|
if (!(strstr(exclude_codecs, "mp3") || strstr(exclude_codecs, "mad")) &&
|
|
|
(!include_codecs || (order_codecs = strstr(include_codecs, "mp3")) || (order_codecs = strstr(include_codecs, "mad"))))
|
|
|
sort_codecs((include_codecs ? order_codecs - include_codecs : i), register_mad());
|
|
|
-/*
|
|
|
+
|
|
|
else if (!(strstr(exclude_codecs, "mp3") || strstr(exclude_codecs, "mpg")) &&
|
|
|
(!include_codecs || (order_codecs = strstr(include_codecs, "mp3")) || (order_codecs = strstr(include_codecs, "mpg"))))
|
|
|
sort_codecs((include_codecs ? order_codecs - include_codecs : i), register_mpg());
|
|
|
-*/
|
|
|
|
|
|
LOG_DEBUG("include codecs: %s exclude codecs: %s", include_codecs ? include_codecs : "", exclude_codecs);
|
|
|
|