Merge remote-tracking branch 'origin/master-cmake' into master-cmake

components/platform_console/cmd_system.c

@@ -387,6 +387,7 @@ int set_squeezelite_player_name(FILE * f,const char * name){
 
 	FREE_AND_NULL(nvs_config);
 	FREE_AND_NULL(argv);
+	free(cleaned_name);
 	return nerrors;
 	
 }

components/squeezelite/CMakeLists.txt

@@ -30,10 +30,11 @@ set_source_files_properties(flac.c
 )
 
 add_definitions(-DLINKALL -DLOOPBACK -DNO_FAAD -DEMBEDDED -DTREMOR_ONLY -DCUSTOM_VERSION=${BUILD_NUMBER})
-if(DEFINED DEPTH AND ${DEPTH} EQUAL "32")
-add_definitions(-DBYTES_PER_FRAME=8)
-else()
-add_definitions(-DRESAMPLE16 -DBYTES_PER_FRAME=4)
-endif()
+
+if (${DEPTH} EQUAL "32")
+	add_definitions(-DBYTES_PER_FRAME=8)
+else()	
+	add_definitions(-DRESAMPLE16 -DBYTES_PER_FRAME=4)
+endif()	
 
 add_compile_options (-O3 ) 

components/squeezelite/embedded.c

@@ -15,6 +15,7 @@
 #include "esp_timer.h"
 #include "esp_wifi.h"
 #include "monitor.h"
+#include "platform_config.h"
 
 mutex_type slimp_mutex;
 
@@ -69,3 +70,27 @@ u16_t get_plugged(void) {
 u8_t get_battery(void) {
 	return (battery_level_svc() * 16) / 100;
 }	 
+
+void set_name(char *name) {
+	char *cmd = config_alloc_get(NVS_TYPE_STR, "autoexec1");
+	char *p, *q;
+	
+	if (!cmd) return;
+
+	if ((p = strstr(cmd, " -n")) != NULL) {
+		q = p + 3;
+		// in case some smart dude has a " -" in player's name
+		while ((q = strstr(q, " -")) != NULL) {
+			if (!strchr(q, '"') || !strchr(q+1, '"')) break;
+			q++;
+		}
+		if (q) memmove(p, q, strlen(q) + 1);
+		else *p = '\0';
+	}
+
+	asprintf(&q, "%s -n \"%s\"", cmd, name);
+    config_set_value(NVS_TYPE_STR, "autoexec1", q);
+	
+	free(q);
+	free(cmd);
+}

components/squeezelite/embedded.h

@@ -79,6 +79,9 @@ u16_t	get_RSSI(void);			// must provide or define as 0xffff
 u16_t	get_plugged(void);		// must provide or define as 0x0
 u8_t	get_battery(void);		// must provide 0..15 or define as 0x0
 
+// set name 
+void set_name(char *name);		// can be defined as an empty macro
+
 // to be defined to nothing if you don't want to support these
 extern struct visu_export_s {
 	pthread_mutex_t mutex;

components/squeezelite/output_embedded.c

@@ -114,7 +114,11 @@ void set_volume(unsigned left, unsigned right) {
 bool test_open(const char *device, unsigned rates[], bool userdef_rates) {
 	memset(rates, 0, MAX_SUPPORTED_SAMPLERATES * sizeof(unsigned));
 	if (!strcasecmp(device, "I2S")) {
-		unsigned _rates[] = { 192000, 176400, 96000, 88200, 48000, 
+		unsigned _rates[] = { 
+#if BYTES_PER_FRAME == 4		
+							  192000, 176400, 
+#endif		
+							  96000, 88200, 48000, 
 							  44100, 32000, 24000, 22050, 16000, 
 							  12000, 11025, 8000, 0 };	
 		memcpy(rates, _rates, sizeof(_rates));

components/squeezelite/slimproto.c

@@ -480,6 +480,9 @@ static void process_setd(u8_t *pkt, int len) {
 			LOG_INFO("set name: %s", setd->data);
 			// confirm change to server
 			sendSETDName(setd->data);
+#if EMBEDDED
+			set_name(player_name);
+#endif			
 			// write name to name_file if -N option set
 			if (name_file) {
 				FILE *fp = fopen(name_file, "w");

components/wifi-manager/webapp/src/sass/utils/_style.css

@@ -19,6 +19,7 @@ tr.hide {
     margin-bottom:50px;
     padding-left: 12px;
     padding-right: 12px;
+    padding-bottom: 45px;
 }
 a {
     color: #fff;