diff --git a/plugin/SqueezeESP32.zip b/plugin/SqueezeESP32.zip index 1f954c50..3f095395 100644 Binary files a/plugin/SqueezeESP32.zip and b/plugin/SqueezeESP32.zip differ diff --git a/plugin/SqueezeESP32/HTML/EN/plugins/SqueezeESP32/settings/player.html b/plugin/SqueezeESP32/HTML/EN/plugins/SqueezeESP32/settings/player.html index 0bcc15f4..fd07f991 100644 --- a/plugin/SqueezeESP32/HTML/EN/plugins/SqueezeESP32/settings/player.html +++ b/plugin/SqueezeESP32/HTML/EN/plugins/SqueezeESP32/settings/player.html @@ -38,67 +38,69 @@
[% END %] - [% WRAPPER setting title="PLUGIN_SQUEEZEESP32_EQUALIZER" desc="" %] -
[% "PLUGIN_SQUEEZEESP32_EQUALIZER_SAVE" | string %]
- [% END %] + [% IF pref_equalizer %] + [% WRAPPER setting title="PLUGIN_SQUEEZEESP32_EQUALIZER" desc="" %] +
[% "PLUGIN_SQUEEZEESP32_EQUALIZER_SAVE" | string %]
+ [% END %] - - [% WRAPPER settingSection %] - [% WRAPPER settingGroup title='31Hz' desc="" %] + + [% WRAPPER settingSection %] + [% WRAPPER settingGroup title='31Hz' desc="" %] + [% END %] + [% WRAPPER settingGroup title='62Hz' desc="" %] + + [% END %] + [% WRAPPER settingGroup title='125Hz' desc="" %] + + [% END %] + [% WRAPPER settingGroup title='250Hz' desc="" %] + + [% END %] + [% WRAPPER settingGroup title='500Hz' desc="" %] + + [% END %] + [% WRAPPER settingGroup title='1kHz' desc="" %] + + [% END %] + [% WRAPPER settingGroup title='2kHz' desc="" %] + + [% END %] + [% WRAPPER settingGroup title='4kHz' desc="" %] + + [% END %] + [% WRAPPER settingGroup title='8kHz' desc="" %] + + [% END %] + [% WRAPPER settingGroup title='16kHz' desc="" %] + + [% END %] [% END %] - [% WRAPPER settingGroup title='62Hz' desc="" %] - - [% END %] - [% WRAPPER settingGroup title='125Hz' desc="" %] - - [% END %] - [% WRAPPER settingGroup title='250Hz' desc="" %] - - [% END %] - [% WRAPPER settingGroup title='500Hz' desc="" %] - - [% END %] - [% WRAPPER settingGroup title='1kHz' desc="" %] - - [% END %] - [% WRAPPER settingGroup title='2kHz' desc="" %] - - [% END %] - [% WRAPPER settingGroup title='4kHz' desc="" %] - - [% END %] - [% WRAPPER settingGroup title='8kHz' desc="" %] - - [% END %] - [% WRAPPER settingGroup title='16kHz' desc="" %] - - [% END %] - [% END %] + [% END %] [% PROCESS settings/footer.html %] diff --git a/plugin/SqueezeESP32/Player.pm b/plugin/SqueezeESP32/Player.pm index 1b220e68..158d1395 100644 --- a/plugin/SqueezeESP32/Player.pm +++ b/plugin/SqueezeESP32/Player.pm @@ -14,7 +14,7 @@ my $prefs = preferences('plugin.squeezeesp32'); my $log = logger('plugin.squeezeesp32'); { - __PACKAGE__->mk_accessor('rw', 'tone_update'); + __PACKAGE__->mk_accessor('rw', qw(tone_update depth)); } sub new { @@ -64,6 +64,10 @@ sub minBass { -13 } sub init { my $client = shift; + my ($id, $caps) = @_; + + my ($depth) = $caps =~ /Depth=(\d+)/; + $client->depth($depth || 16); if (!$handlersAdded) { diff --git a/plugin/SqueezeESP32/PlayerSettings.pm b/plugin/SqueezeESP32/PlayerSettings.pm index b2bbf166..e1619200 100644 --- a/plugin/SqueezeESP32/PlayerSettings.pm +++ b/plugin/SqueezeESP32/PlayerSettings.pm @@ -76,12 +76,14 @@ sub handler { } - my $equalizer = $cprefs->get('equalizer'); - for my $i (0 .. $#{$equalizer}) { - $equalizer->[$i] = $paramRef->{"pref_equalizer.$i"} || 0; - } - $cprefs->set('equalizer', $equalizer); - $client->update_tones($equalizer); + if ($client->depth == 16) { + my $equalizer = $cprefs->get('equalizer'); + for my $i (0 .. $#{$equalizer}) { + $equalizer->[$i] = $paramRef->{"pref_equalizer.$i"} || 0; + } + $cprefs->set('equalizer', $equalizer); + $client->update_tones($equalizer); + } } if ($client->displayWidth) { @@ -91,7 +93,7 @@ sub handler { $paramRef->{'pref_artwork'} = $cprefs->get('artwork'); } - $paramRef->{'pref_equalizer'} = $cprefs->get('equalizer'); + $paramRef->{'pref_equalizer'} = $cprefs->get('equalizer') if $client->depth == 16; return $class->SUPER::handler($client, $paramRef); } diff --git a/plugin/SqueezeESP32/install.xml b/plugin/SqueezeESP32/install.xml index c15beae4..2ea4276c 100644 --- a/plugin/SqueezeESP32/install.xml +++ b/plugin/SqueezeESP32/install.xml @@ -10,6 +10,6 @@ PLUGIN_SQUEEZEESP32 PLUGIN_SQUEEZEESP32_DESC Plugins::SqueezeESP32::Plugin - 0.220 + 0.230 Philippe diff --git a/plugin/repo.xml b/plugin/repo.xml index 283d5ef0..d3020c2f 100644 --- a/plugin/repo.xml +++ b/plugin/repo.xml @@ -1,7 +1,7 @@ - + https://github.com/sle118/squeezelite-esp32 Philippe e279e31acf8c91652d32bdf6165db21961ea780d