Browse Source

add mpg.c and codecs stubs

philippe44 5 years ago
parent
commit
faa6cf1aa8
3 changed files with 43 additions and 6 deletions
  1. 6 6
      main/decode.c
  2. 29 0
      main/esp32.c
  3. 8 0
      main/mpg.c

+ 6 - 6
main/decode.c

@@ -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);
 

+ 29 - 0
main/esp32.c

@@ -3,6 +3,8 @@
 #include "esp_system.h" 
 #include "squeezelite.h"
 
+extern log_level loglevel;
+
 void get_mac(u8_t mac[]) {
     esp_read_mac(mac, ESP_MAC_WIFI_STA);
 }
@@ -14,3 +16,30 @@ _sig_func_ptr signal(int sig, _sig_func_ptr func) {
 void *audio_calloc(size_t nmemb, size_t size) {
 		return calloc(nmemb, size);
 }
+
+struct codec *register_mpg(void) {
+	LOG_INFO("mpg unavailable");
+	return NULL;
+}
+
+#ifndef CONFIG_AUDIO_FAAD
+struct codec *register_faad(void) {
+	LOG_INFO("aac unavailable");
+	return NULL;
+}
+#endif
+
+#ifndef CONFIG_AUDIO_MAD
+struct codec *register_mad(void) {
+	LOG_INFO("mad unavailable");
+	return NULL;
+}
+#endif
+
+#ifndef CONFIG_AUDIO_FLAC
+struct codec *register_flac(void) {
+	LOG_INFO("flac unavailable");
+	return NULL;
+}
+#endif
+

+ 8 - 0
main/mpg.c

@@ -0,0 +1,8 @@
+#include "squeezelite.h"
+
+extern log_level loglevel;
+
+struct codec *register_mpg(void) {
+	LOG_INFO("mpg unavailable");
+	return NULL;
+}