remove large fonts - release

components/display/core/gds_text.c

@@ -35,12 +35,20 @@ static const struct GDS_FontDef *GuessFont( struct GDS_Device *Device, int FontT
 	case GDS_FONT_MEDIUM:			
 	default:		
 		return &Font_droid_sans_fallback_15x17;	
+#ifdef USE_LARGE_FONTS
 	case GDS_FONT_LARGE:	
 		return &Font_droid_sans_fallback_24x28;
 		break;		
 	case GDS_FONT_SEGMENT:			
 		if (Device->Height == 32) return &Font_Tarable7Seg_16x32;
 		else return &Font_Tarable7Seg_32x64;
+#else
+	case GDS_FONT_LARGE:	
+	case GDS_FONT_SEGMENT:			
+		ESP_LOGW(TAG, "large fonts disabled");
+		return &Font_droid_sans_fallback_15x17;
+		break;		
+#endif	
 	}
 }
 

plugin/SqueezeESP32/Player.pm

@@ -13,6 +13,19 @@ my $sprefs = preferences('server');
 my $prefs = preferences('plugin.squeezeesp32');
 my $log   = logger('plugin.squeezeesp32');
 
+{
+	__PACKAGE__->mk_accessor('rw', 'tone_update');
+}
+
+sub new {
+	my $class = shift;
+	my $client = $class->SUPER::new(@_);
+	$client->init_accessor(
+		tone_update				=> 0,
+	);
+	return $client;
+}
+
 our $defaultPrefs = {
 	'analogOutMode'        => 0,
 	'bass'                 => 0,
@@ -54,6 +67,9 @@ sub init {
 	my $client = shift;
 	
 	if (!$handlersAdded) {
+	
+		$sprefs->setChange( \&change_tone, 'bass');
+		$sprefs->setChange( \&change_tone, 'treble');
 
 		# Add a handler for line-in/out status changes
 		Slim::Networking::Slimproto::addHandler( LIOS => \&lineInOutStatus );
@@ -116,26 +132,48 @@ sub playerSettingsFrame {
 	$client->SUPER::playerSettingsFrame($data_ref);
 }
 
-sub bass {
-	return tone(2, @_);
-}	
+sub change_tone {
+	my ($type, $new, $client, $old) = @_;
+	return $client->$type($new) unless $client->isa('Plugins::SqueezeESP32::Player') && !$client->tone_update;
 
-sub treble {
-	return tone(8, @_);
+	my ($c, $minValue, $maxValue);
+	my $equalizer = $prefs->client($client)->get('equalizer');	
+	
+	if ($type eq 'bass') {
+		$c = 2;
+		$minValue = minBass;
+		$maxValue = maxBass;
+	} else {
+		$c = 8;
+		$minValue = minTreble;
+		$maxValue = maxTreble;
+	}		
+
+	$new = $minValue if $new < $minValue;
+	$new = $minValue if $new < $minValue;
+	
+	if ($old - $minValue) {
+		my $ratio = ($new - $minValue) / ($old - $minValue) - 1;
+		$equalizer->[$c-1] = min(int(($equalizer->[$c-1] - $minValue) * (1 + 0.2 * $ratio) + 0.5 + $minValue), $maxValue);
+		$equalizer->[$c] = min(int(($equalizer->[$c] - $minValue) * (1 + 0.7 * $ratio) + 0.5 + $minValue), $maxValue);
+		$equalizer->[$c+1] = min(int(($equalizer->[$c+1] - $minValue) * (1 + 0.1 * $ratio) + 0.5 + $minValue), $maxValue);
+	} else {
+		$equalizer->[$c-1] = int($new * 0.2 + 0.5);
+		$equalizer->[$c] = int($new * 0.7 + 0.5);
+		$equalizer->[$c+1] = int($new * 0.1 + 0.5);
+	}		
+
+	$prefs->client($client)->set('equalizer', $equalizer);
+	$sprefs->client($client)->set($type, $new);
 }
 
-sub tone {
-	my ($center, $client, $value) = @_;
-	my $equalizer = $prefs->client($client)->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);
-	}
+sub update_tones {
+	my ($client, $equalizer) = @_;
 
-	return int($equalizer->[$center-1] * 0.2 + $equalizer->[$center] * 0.7 + $equalizer->[$center+1] * 0.1);
+	$client->tone_update(1);
+	$sprefs->client($client)->set('bass', int($equalizer->[1]*0.2 + $equalizer->[2]*0.7 + $equalizer->[3]*0.1 + 0.5));
+	$sprefs->client($client)->set('treble', int($equalizer->[7]*0.2 + $equalizer->[8]*0.7 + $equalizer->[9]*0.1 + 0.5));
+	$client->tone_update(0);	
 }
 
 sub update_artwork {

plugin/SqueezeESP32/PlayerSettings.pm

@@ -73,6 +73,7 @@ sub handler {
 			$equalizer->[$i] = $paramRef->{"pref_equalizer.$i"} || 0;
 		}
 		$cprefs->set('equalizer', $equalizer);
+		$client->update_tones($equalizer);
 	}
 
 	if ($client->displayWidth) {

plugin/SqueezeESP32/install.xml

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

plugin/repo.xml

@@ -1,10 +1,10 @@
 <?xml version='1.0' standalone='yes'?>
 <extensions>
   <plugins>
-    <plugin version="0.101" name="SqueezeESP32" minTarget="7.9" maxTarget="*">
+    <plugin version="0.102" name="SqueezeESP32" minTarget="7.9" maxTarget="*">
       <link>https://github.com/sle118/squeezelite-esp32</link>
       <creator>Philippe</creator>
-      <sha>49cb70db3a3d4359360332f1f49a845e2e4970b8</sha>
+      <sha>f9c8fbc60812bed4e3989e6dfa3e99fb1a2869c3</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>