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

components/squeezelite/embedded.c

@@ -23,6 +23,7 @@
 #include "esp_pthread.h"
 #include "esp_system.h"
 #include "esp_timer.h"
+#include "esp_wifi.h"
 
 void get_mac(u8_t mac[]) {
     esp_read_mac(mac, ESP_MAC_WIFI_STA);
@@ -58,3 +59,11 @@ void embedded_init(void) {
 	sb_controls_init();
 	if (sb_display_init()) custom_player_id = 100;
 }
+
+u16_t get_RSSI(void) {
+    wifi_ap_record_t wifidata;
+    esp_wifi_sta_get_ap_info(&wifidata);
+	// we'll assume dBm, -30 to -100
+    if (wifidata.primary != 0) return 100 + wifidata.rssi + 30;
+    else return 0xffff;
+}	

components/squeezelite/embedded.h

@@ -62,6 +62,9 @@ void 		register_external(void);
 void 		deregister_external(void);
 void 		decode_restore(int external);
 
+// must provide or define as 0xffff
+u16_t		get_RSSI(void);
+
 // to be defined to nothing if you don't want to support these
 extern struct visu_export_s {
 	pthread_mutex_t mutex;

components/squeezelite/equalizer.c

@@ -45,11 +45,18 @@ void equalizer_open(u32_t sample_rate) {
 	equalizer.update = false;
     
 	if (equalizer.handle) {
-		LOG_INFO("equalizer initialized");
+		bool active = false;
+		
 		for (int i = 0; i < EQ_BANDS; i++) {
 			esp_equalizer_set_band_value(equalizer.handle, equalizer.gain[i], i, 0);
 			esp_equalizer_set_band_value(equalizer.handle, equalizer.gain[i], i, 1);
+			active |= equalizer.gain[i] != 0;
 		}
+		
+		// do not activate equalizer if all gain are 0
+		if (!active) equalizer_close();
+		
+		LOG_INFO("equalizer initialized %u", active);
 	} else {
 		LOG_WARN("can't init equalizer");
 	}	

components/squeezelite/slimproto.c

@@ -183,7 +183,11 @@ static void sendSTAT(const char *event, u32_t server_timestamp) {
 	packN(&pkt.stream_buffer_size, status.stream_size);
 	packN(&pkt.bytes_received_H, (u64_t)status.stream_bytes >> 32);
 	packN(&pkt.bytes_received_L, (u64_t)status.stream_bytes & 0xffffffff);
+#if EMBEDDED
+	packn(&pkt.signal_strength, get_RSSI());
+#else 
 	pkt.signal_strength = 0xffff;
+#endif	
 	packN(&pkt.jiffies, now);
 	packN(&pkt.output_buffer_size, status.output_size);
 	packN(&pkt.output_buffer_fullness, status.output_full);

plugin/SqueezeESP32/HTML/EN/plugins/SqueezeESP32/settings/player.html

@@ -1,5 +1,6 @@
 [% PROCESS settings/header.html %]
 
+	[% IF prefs.pref_width %]
 		[% WRAPPER setting title="PLUGIN_SQUEEZEESP32_WIDTH" desc="PLUGIN_SQUEEZEESP32_WIDTH_DESC" %]
 			<!--<input type="text" readonly class="stdedit" name="pref_width" id="width" value="[% prefs.pref_width %]" size="3">-->
 			[% prefs.pref_width %]
@@ -34,6 +35,8 @@
 		[% END %]
 
 		<hr>	
+	[% END %]	
+	
 	[% WRAPPER setting title="PLUGIN_SQUEEZEESP32_EQUALIZER" desc="" %]
 	[% END %]
 	

plugin/SqueezeESP32/Player.pm

@@ -15,12 +15,6 @@ sub hasIR { 0 }
 
 sub init {
 	my $client = shift;
-	
-	$prefs->client($client)->init( { 
-		eq => [0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-		}
-	);	
-	
 	$client->SUPER::init(@_);
 	Plugins::SqueezeESP32::Plugin::config_artwork($client);
 }
@@ -61,7 +55,6 @@ sub reconnect {
 	my $client = shift;
 	$client->pluginData('artwork_md5', '');
 	$client->SUPER::reconnect(@_);
-	Plugins::SqueezeESP32::Plugin::send_equalizer($client);
 }	
 
 1;

plugin/SqueezeESP32/PlayerSettings.pm

@@ -21,7 +21,7 @@ sub needsClient {
 
 sub validFor {
 	my ($class, $client) = @_;
-	return $client->model eq 'squeezeesp32' && $client->displayWidth;
+	return $client->model eq 'squeezeesp32';
 }
 
 sub page {
@@ -40,6 +40,7 @@ sub handler {
 	my ($cprefs, @prefs) = $class->prefs($client);
 	
 	if ($paramRef->{'saveSettings'}) {
+		if ($client->displayWidth) {
 			$cprefs->set('small_VU', $paramRef->{'pref_small_VU'});
 			my $spectrum =	{	scale => $paramRef->{'pref_spectrum_scale'},
 								small => { 	size => $paramRef->{'pref_spectrum_small_size'}, 
@@ -47,6 +48,7 @@ sub handler {
 								full  => { 	band => $paramRef->{'pref_spectrum_full_band'} },
 					};
 			$cprefs->set('spectrum', $spectrum);
+			
 			my $artwork =	{	enable => $paramRef->{'pref_artwork_enable'},
 								x => $paramRef->{'pref_artwork_x'}, 
 								y => $paramRef->{'pref_artwork_y'},
@@ -55,13 +57,6 @@ sub handler {
 			$client->display->modes($client->display->build_modes);
 			$client->display->update;
 		
-		my $eq = $cprefs->get('eq');
-		for my $i (0 .. $#{$eq}) {
-			$eq->[$i] = $paramRef->{"pref_eq.$i"};
-		}
-		$cprefs->set('eq', $eq);
-		Plugins::SqueezeESP32::Plugin::send_equalizer($client);
-		
 			# force update or disable artwork
 			if ($artwork->{'enable'}) {
 				Plugins::SqueezeESP32::Plugin::update_artwork($client, 1);
@@ -70,6 +65,15 @@ sub handler {
 			}	
 		}	
 		
+		my $eq = $cprefs->get('eq');
+		for my $i (0 .. $#{$eq}) {
+			$eq->[$i] = $paramRef->{"pref_eq.$i"};
+		}
+		$cprefs->set('eq', $eq);
+		Plugins::SqueezeESP32::Plugin::send_equalizer($client);		
+	}
+	
+	if ($client->displayWidth) {
 		# as there is nothing captured, we need to re-set these variables
 		$paramRef->{'pref_width'} = $cprefs->get('width'); 
 	
@@ -79,6 +83,8 @@ sub handler {
 		# logic of "Settings" is beyond me and I really hate it
 		$paramRef->{'pref_spectrum'} = $cprefs->get('spectrum');
 		$paramRef->{'pref_artwork'} = $cprefs->get('artwork');
+	}
+	
 	$paramRef->{'pref_eq'} = $cprefs->get('eq');
 	
 	return $class->SUPER::handler($client, $paramRef);

plugin/SqueezeESP32/Plugin.pm

@@ -36,6 +36,7 @@ sub initPlugin {
 	Slim::Control::Request::subscribe( sub { onNotification(@_) }, [ ['newmetadata'] ] );
 	Slim::Control::Request::subscribe( sub { onNotification(@_) }, [ ['playlist'], ['open', 'newsong'] ]);
 	Slim::Control::Request::subscribe( \&onStopClear, [ ['playlist'], ['stop', 'clear'] ]);
+	Slim::Control::Request::subscribe( \&onPlayer,[ ['client'], [ 'new', 'reconnect' ] ] );
 }
 
 sub onStopClear {
@@ -50,6 +51,17 @@ sub onStopClear {
 	}	
 }
 
+sub onPlayer {
+    my $request = shift;
+    my $client  = $request->client;
+
+    if ($client->model eq 'squeezeesp32') {
+		$prefs->client($client)->init( { 
+					eq => [0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+				} );
+		Plugins::SqueezeESP32::Plugin::send_equalizer($client);
+	}
+}
 
 sub onNotification {
     my $request = shift;

plugin/SqueezeESP32/install.xml

@@ -10,6 +10,6 @@
   <name>PLUGIN_SQUEEZEESP32</name>
   <description>PLUGIN_SQUEEZEESP32_DESC</description>
   <module>Plugins::SqueezeESP32::Plugin</module>
-    <version>0.81</version>
+    <version>0.82</version>
   <creator>Philippe</creator>
 </extensions>

plugin/repo.xml

@@ -1,10 +1,10 @@
 <?xml version='1.0' standalone='yes'?>
 <extensions>
   <plugins>
-    <plugin version="0.81" name="SqueezeESP32" minTarget="7.5" maxTarget="*">
+    <plugin version="0.82" name="SqueezeESP32" minTarget="7.5" maxTarget="*">
       <link>https://github.com/sle118/squeezelite-esp32</link>
       <creator>Philippe</creator>
-      <sha>dcd91eaeb065cf3e90e964ea40a883ed5480093e</sha>
+      <sha>55eb14f12790d71306d143689d9b3d47f9820731</sha>
       <email>philippe_44@outlook.com</email>
       <desc lang="EN">SqueezeESP32 additional player id (100)</desc>
       <url>http://github.com/sle118/squeezelite-esp32/raw/master/plugin/SqueezeESP32.zip</url>