update plugin!

sle118 · Aug 16, 2020 · 3922851 · 3922851
1 parent f08bde8
commit 3922851
Show file tree

Hide file tree

Showing 4 changed files with 145 additions and 8 deletions.
diff --git a/plugin/SqueezeESP32.zip b/plugin/SqueezeESP32.zip
diff --git a/plugin/SqueezeESP32/Player.pm b/plugin/SqueezeESP32/Player.pm
@@ -9,17 +9,83 @@ use List::Util qw(min);
 use Slim::Utils::Log;
 use Slim::Utils::Prefs;
 
+my $sprefs = preferences('server');
 my $prefs = preferences('plugin.squeezeesp32');
 my $log   = logger('plugin.squeezeesp32');
 
+our $defaultPrefs = {
+	'analogOutMode'        => 0,
+	'bass'                 => 0,
+	'treble'               => 0,
+	'lineInAlwaysOn'       => 0, 
+	'lineInLevel'          => 50, 
+	'menuItem'             => [qw(
+		NOW_PLAYING
+		BROWSE_MUSIC
+		RADIO
+		PLUGIN_MY_APPS_MODULE_NAME
+		PLUGIN_APP_GALLERY_MODULE_NAME
+		FAVORITES
+		GLOBAL_SEARCH
+		PLUGIN_LINE_IN
+		PLUGINS
+		SETTINGS
+		SQUEEZENETWORK_CONNECT
+	)],
+};
+
+my $handlersAdded;
+
 sub model { 'squeezeesp32' }
 sub modelName { 'SqueezeESP32' }
-sub hasIR { 0 }
+
+sub hasScrolling { 1 }
+sub hasIR { 1 }
+# TODO: add in settings when ready
+sub hasLineIn { 0 }
+sub hasHeadSubOut { 1 }
+# TODO: LMS sliders are hard-coded in html file from -23 to +23 
+sub maxTreble {	20 }
+sub minTreble {	-13 }
+sub maxBass { 20 }
+sub minBass { -13 }
 
 sub init {
 	my $client = shift;
+
+	if (!$handlersAdded) {
+
+		# Add a handler for line-in/out status changes
+		Slim::Networking::Slimproto::addHandler( LIOS => \&lineInOutStatus );
+
+		# Create a new event for sending LIOS updates
+		Slim::Control::Request::addDispatch(
+			['lios', '_state'],
+			[1, 0, 0, undef],
+		   );
+
+		Slim::Control::Request::addDispatch(
+			['lios', 'linein', '_state'],
+			[1, 0, 0, undef],
+		   );
+
+		Slim::Control::Request::addDispatch(
+			['lios', 'lineout', '_state'],
+			[1, 0, 0, undef],
+		   );
+
+		$handlersAdded = 1;
+
+	}
+
 	$client->SUPER::init(@_);
-	$client->config_artwork();
+	$client->config_artwork;
+}
+
+sub initPrefs {
+	my $client = shift;
+	$sprefs->client($client)->init($defaultPrefs);
+	$client->SUPER::initPrefs;
 }
 
 # Allow the player to define it's display width (and probably more)
@@ -50,12 +116,26 @@ sub playerSettingsFrame {
 	$client->SUPER::playerSettingsFrame($data_ref);
 }
 
-sub hasScrolling {
-	return 1;
+sub bass {
+	return tone(2, @_);
+}	
+
+sub treble {
+	return tone(8, @_);
 }
 
-sub hasIR { 
-	return 1; 
+sub tone {
+	my ($center, $client, $value) = @_;
+	my $equalizer = $prefs->get('equalizer');
+
+	if (defined($value)) {
+		$equalizer->[$center-1] = int($value * 0.2 + 0.5);
+		$equalizer->[$center] = int($value * 0.7 + 0.5);
+		$equalizer->[$center+1] = int($value * 0.1 + 0.5);
+		$prefs->client($client)->set('equalizer', $equalizer);
+	}
+
+	return int($equalizer->[$center-1] * 0.2 + $equalizer->[$center] * 0.7 + $equalizer->[$center+1] * 0.1);
 }
 
 sub update_artwork {
@@ -131,4 +211,61 @@ sub reconnect {
 	$client->SUPER::reconnect(@_);
 }
 
+# Change the analog output mode between headphone and sub-woofer
+# If no mode is specified, the value of the client's analogOutMode preference is used.
+# Otherwise the mode is temporarily changed to the given value without altering the preference.
+sub setAnalogOutMode {
+	my $client = shift;
+	# 0 = headphone (internal speakers off), 1 = sub out,
+	# 2 = always on (internal speakers on), 3 = always off
+	my $mode = shift;
+
+	if (! defined $mode) {
+		$mode = $sprefs->client($client)->get('analogOutMode');
+	}
+
+	my $data = pack('C', $mode);
+	$client->sendFrame('audo', \$data);
+}
+
+# LINE_IN 	0x01
+# LINE_OUT	0x02
+# HEADPHONE	0x04
+
+sub lineInConnected {
+	my $state = Slim::Networking::Slimproto::voltage(shift) || return 0;
+	return $state & 0x01 || 0;
+}
+
+sub lineOutConnected {
+	my $state = Slim::Networking::Slimproto::voltage(shift) || return 0;
+	return $state & 0x02 || 0;
+}
+
+sub lineInOutStatus {
+	my ( $client, $data_ref ) = @_;
+
+	my $state = unpack 'n', $$data_ref;
+
+	my $oldState = {
+		in  => $client->lineInConnected(),
+		out => $client->lineOutConnected(),
+	};
+
+	Slim::Networking::Slimproto::voltage( $client, $state );
+
+	Slim::Control::Request::notifyFromArray( $client, [ 'lios', $state ] );
+
+	if ($oldState->{in} != $client->lineInConnected()) {
+		Slim::Control::Request::notifyFromArray( $client, [ 'lios', 'linein', $client->lineInConnected() ] );
+		if ( Slim::Utils::PluginManager->isEnabled('Slim::Plugin::LineIn::Plugin')) {
+			Slim::Plugin::LineIn::Plugin::lineInItem($client, 1);
+		}
+	}
+
+	if ($oldState->{out} != $client->lineOutConnected()) {
+		Slim::Control::Request::notifyFromArray( $client, [ 'lios', 'lineout', $client->lineOutConnected() ] );
+	}
+}
+
 1;
diff --git a/plugin/SqueezeESP32/install.xml b/plugin/SqueezeESP32/install.xml
@@ -10,6 +10,6 @@
   <name>PLUGIN_SQUEEZEESP32</name>
   <description>PLUGIN_SQUEEZEESP32_DESC</description>
   <module>Plugins::SqueezeESP32::Plugin</module>
-    <version>0.94</version>
+    <version>0.100</version>
   <creator>Philippe</creator>
 </extensions>
diff --git a/plugin/repo.xml b/plugin/repo.xml
@@ -4,7 +4,7 @@
     <plugin version="0.94" name="SqueezeESP32" minTarget="7.9" maxTarget="*">
       <link>https://github.com/sle118/squeezelite-esp32</link>
       <creator>Philippe</creator>
-      <sha>a9bf10b47d13508ba051e4067cdabc2c283f4824</sha>
+      <sha>4a62651707d963f867451788765e740b7e1a79ac</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>