tweak for square displays & vertical VU - release

components/squeezelite/display.c

@@ -183,6 +183,7 @@ static struct {
 #define VISU_ESP32	0x10
 static EXT_RAM_ATTR struct {
 	int bar_gap, bar_width, bar_border;
+	bool rotate;
 	struct {
 		int current, max;
 		int limit;
@@ -580,7 +581,7 @@ static void vfdc_handler( u8_t *_data, int bytes_read) {
 /****************************************************************************************
  * Display VU-Meter (lots of hard-coding)
  */
-void draw_VU(struct GDS_Device * display, const uint8_t *data, int level, int x, int y, int width) {
+void draw_VU(struct GDS_Device * display, const uint8_t *data, int level, int x, int y, int width, bool rotate) {
 	// VU data is by columns and vertical flip to allow block offset 
 	data += level * VU_WIDTH * VU_HEIGHT;
 	
@@ -596,11 +597,19 @@ void draw_VU(struct GDS_Device * display, const uint8_t *data, int level, int x,
 	int scale = 8 - GDS_GetDepth(display);
 	
 	// use "fast" version as we are not beyond screen boundaries
+	if (visu.rotate) {
+		for (int r = 0; r < width; r++) {
+			for (int c = VU_HEIGHT; --c >= 0;) {
+				GDS_DrawPixelFast(display, c + x, r + y, *data++ >> scale);
+			}	
+		}	
+	} else {
 		for (int r = 0; r < width; r++) {
 			for (int c = 0; c < VU_HEIGHT; c++) {
 				GDS_DrawPixelFast(display, r + x, c + y, *data++ >> scale);
 			}	
 		}			
+	}	
 	
 	// need to manually set dirty flag as DrawPixel does not do it
 	GDS_SetDirty(display);
@@ -921,35 +930,49 @@ static void visu_update(void) {
 	if (mode != VISU_VUMETER || !visu.style) {
 		// there is much more optimization to be done here, like not redrawing bars unless needed
 		for (int i = visu.n; --i >= 0;) {
-			int x1 = visu.col + visu.border + visu.bar_border + i*(visu.bar_width + visu.bar_gap);
+			// update maximum
-			int y1 = visu.row + visu.height - 1;
-			
 			if (visu.bars[i].current > visu.bars[i].max) visu.bars[i].max = visu.bars[i].current;
 			else if (visu.bars[i].max) visu.bars[i].max--;
 			else if (!clear) continue;
 			
+			if (visu.rotate) {
+				int x1 = visu.col;
+				int y1 = visu.row + visu.border + visu.bar_border + i*(visu.bar_width + visu.bar_gap);
+
+				for (int j = 0; j <= visu.bars[i].current; j += 2) 
+					GDS_DrawLine(display, x1 + j, y1, x1 + j, y1 + visu.bar_width - 1, GDS_COLOR_WHITE);
+			
+				if (visu.bars[i].max > 2) {
+					GDS_DrawLine(display, x1 + visu.bars[i].max, y1, x1 + visu.bars[i].max, y1 + visu.bar_width - 1, GDS_COLOR_WHITE);			
+					if (visu.bars[i].max < visu.max - 1) GDS_DrawLine(display, x1 + visu.bars[i].max + 1, y1, x1 + visu.bars[i].max + 1, y1 + visu.bar_width - 1, GDS_COLOR_WHITE);			
+				}
+			} else {
+				int x1 = visu.col + visu.border + visu.bar_border + i*(visu.bar_width + visu.bar_gap);
+				int y1 = visu.row + visu.height - 1;
 				for (int j = 0; j <= visu.bars[i].current; j += 2) 
 				GDS_DrawLine(display, x1, y1 - j, x1 + visu.bar_width - 1, y1 - j, GDS_COLOR_WHITE);
 			
 				if (visu.bars[i].max > 2) {
 					GDS_DrawLine(display, x1, y1 - visu.bars[i].max, x1 + visu.bar_width - 1, y1 - visu.bars[i].max, GDS_COLOR_WHITE);			
-				GDS_DrawLine(display, x1, y1 - visu.bars[i].max + 1, x1 + visu.bar_width - 1, y1 - visu.bars[i].max + 1, GDS_COLOR_WHITE);			
+					if (visu.bars[i].max < visu.max - 1) GDS_DrawLine(display, x1, y1 - visu.bars[i].max + 1, x1 + visu.bar_width - 1, y1 - visu.bars[i].max + 1, GDS_COLOR_WHITE);			
+				}
 			}
 		}
 	} else if (displayer.width / 2 >  3 * VU_WIDTH / 4) {
-		draw_VU(display, vu_bitmap, visu.bars[0].current, 0, visu.row, visu.width / 2);
+		int width = visu.rotate ? visu.height : visu.width;
-		draw_VU(display, vu_bitmap, visu.bars[1].current, visu.width / 2, visu.row, visu.width / 2);
+		draw_VU(display, vu_bitmap, visu.bars[0].current, 0, visu.row, width / 2, visu.rotate);
+		draw_VU(display, vu_bitmap, visu.bars[1].current, width / 2, visu.row, width / 2, visu.rotate);
 	} else {
 		int level = (visu.bars[0].current + visu.bars[1].current) / 2;
-		draw_VU(display, vu_bitmap, level, 0, visu.row, visu.width);		
+		draw_VU(display, vu_bitmap, level, 0, visu.row, visu.rotate ? visu.height : visu.width, visu.rotate);		
 	}	
 }
 
 
 /****************************************************************************************
- * Visu packet handler
+ * Calculate spectrum spread
  */
-void spectrum_limits(int min, int n, int pos) {
+static void spectrum_limits(int min, int n, int pos) {
 	if (n / 2) {
 		int step = ((DISPLAY_BW - min) * visu.spectrum_scale)  / (n/2);
 		visu.bars[pos].limit = min + step;
@@ -960,6 +983,29 @@ void spectrum_limits(int min, int n, int pos) {
 	}	
 }
 
+/****************************************************************************************
+ * Fit visu
+ */
+static void visu_fit(int bars, int width, int height) {
+	// try to adapt to what we have
+	if ((visu.mode & ~VISU_ESP32) == VISU_SPECTRUM) {
+		visu.n = bars ? bars : MAX_BARS;
+		visu.max = height - 1;
+		if (visu.spectrum_scale <= 0 || visu.spectrum_scale > 0.5) visu.spectrum_scale = 0.5;
+		spectrum_limits(0, visu.n, 0);
+	} else {
+		visu.n = 2;
+		visu.max = (visu.style ? VU_COUNT : height) - 1;
+	}	
+		
+	do {
+		visu.bar_width = (width - visu.border - visu.bar_gap * (visu.n - 1)) / visu.n;
+		if (visu.bar_width > 0) break;
+	} while (--visu.n);	
+	
+	visu.bar_border = (width - visu.border - (visu.bar_width + visu.bar_gap) * visu.n + visu.bar_gap) / 2;
+}	
+
 /****************************************************************************************
  * Visu packet handler
  */
@@ -984,6 +1030,7 @@ static void visu_handler( u8_t *data, int len) {
 	if (visu.mode) {
 		// these will be overidden if necessary
 		visu.col = visu.border = 0;
+		visu.rotate = false;
 		
 		// what type of visu
 		if (visu.mode & VISU_ESP32) {
@@ -1007,6 +1054,9 @@ static void visu_handler( u8_t *data, int len) {
 				visu.height = GDS_GetHeight(display) > displayer.height ? GDS_GetHeight(display) - displayer.height : GDS_GetHeight(display);
 				visu.row = GDS_GetHeight(display) - visu.height;			
 				
+				// try to estimate if we should rotate visu
+				if (visu.height > displayer.height && visu.height > 2*visu.width) visu.rotate = true;
+				
 				// is this spectrum or analogue/digital
 				if ((visu.mode & ~VISU_ESP32) == VISU_SPECTRUM) {
 					bars = htonl(pkt->full.bars);
@@ -1031,22 +1081,9 @@ static void visu_handler( u8_t *data, int len) {
 			if (bars > MAX_BARS) bars = MAX_BARS;
 		}	
 		
-		// try to adapt to what we have
+		// for rotate, swap width & height
-		if ((visu.mode & ~VISU_ESP32) == VISU_SPECTRUM) {
+		if (visu.rotate) visu_fit(bars, visu.height, visu.width);
-			visu.n = bars ? bars : MAX_BARS;
+		else visu_fit(bars, visu.width, visu.height);
-			visu.max = visu.height - 1;
-			if (visu.spectrum_scale <= 0 || visu.spectrum_scale > 0.5) visu.spectrum_scale = 0.5;
-			spectrum_limits(0, visu.n, 0);
-		} else {
-			visu.n = 2;
-			visu.max = visu.style ? (VU_COUNT - 1) : (visu.height - 1);
-		}	
-		
-		do {
-			visu.bar_width = (visu.width - visu.border - visu.bar_gap * (visu.n - 1)) / visu.n;
-			if (visu.bar_width > 0) break;
-		} while (--visu.n);	
-		visu.bar_border = (visu.width - visu.border - (visu.bar_width + visu.bar_gap) * visu.n + visu.bar_gap) / 2;
 
 		// give up if not enough space
 		if (visu.bar_width < 0)	{

plugin/SqueezeESP32/Graphics.pm

@@ -110,11 +110,12 @@ sub build_modes {
 	my $client = shift->client;
 	my $cprefs = $prefs->client($client);
 	
-	my $width = $cprefs->get('width') || 128;
 	my $artwork = $cprefs->get('artwork');
+	my $disp_width = $cprefs->get('width') || 128;
 
 	# if artwork is in main display, reduce width
-	$width = $artwork->{'x'} if $artwork->{'enable'} && $artwork->{y} < 32;
+	my $width = ($artwork->{'enable'} && $artwork->{'y'} < 32) ? $artwork->{'x'} : $disp_width;
+	my $width_low = ($artwork->{'enable'} && ($artwork->{'y'} >= 32 || $disp_width - $artwork->{'x'} > 32)) ? $artwork->{'x'} : $disp_width;
 			
 	my $small_VU = $cprefs->get('small_VU');
 	my $spectrum = $cprefs->get('spectrum');
@@ -168,58 +169,58 @@ sub build_modes {
 		# mode 9	 
 		{ desc => ['VISUALIZER_VUMETER'],
 		bar => 0, secs => 0,  width => $width,
-		params => [$VISUALIZER_VUMETER_ESP32, $width, 0] },
+		params => [$VISUALIZER_VUMETER_ESP32, $width_low, 0] },
 		# mode 10	
 		{ desc => ['VISUALIZER_ANALOG_VUMETER'],
 		bar => 0, secs => 0,  width => $width,
-		params => [$VISUALIZER_VUMETER_ESP32, $width, 1] },
+		params => [$VISUALIZER_VUMETER_ESP32, $width_low, 1] },
 		# mode 11
 		{ desc => ['VISUALIZER_SPECTRUM_ANALYZER'],
 		bar => 0, secs => 0,  width => $width,
 		# extra parameters (bars)
-		params => [$VISUALIZER_SPECTRUM_ANALYZER_ESP32, $width, int ($width/$spectrum->{full}->{band}), $spectrum->{scale}] },	  
+		params => [$VISUALIZER_SPECTRUM_ANALYZER_ESP32, $width_low, int ($width/$spectrum->{full}->{band}), $spectrum->{scale}] },	  
 	);
 
 my @extra = (
 		# mode E1
 		{ desc => ['VISUALIZER_VUMETER', 'AND', 'ELAPSED'],
 		bar => 0, secs => 1,  width => $width,
-		params => [$VISUALIZER_VUMETER_ESP32, $width, 0] },
+		params => [$VISUALIZER_VUMETER_ESP32, $width_low, 0] },
 		# mode E2	 
 		{ desc => ['VISUALIZER_ANALOG_VUMETER', 'AND', 'ELAPSED'],
 		bar => 0, secs => 1,  width => $width,
-		params => [$VISUALIZER_VUMETER_ESP32, $width, 1] },
+		params => [$VISUALIZER_VUMETER_ESP32, $width_low, 1] },
 		# mode E3
 		{ desc => ['VISUALIZER_SPECTRUM_ANALYZER', 'AND', 'ELAPSED'],
 		bar => 0, secs => 1,  width => $width,
 		# extra parameters (bars)
-		params => [$VISUALIZER_SPECTRUM_ANALYZER_ESP32, $width, int ($width/$spectrum->{full}->{band}), $spectrum->{scale}] },	  
+		params => [$VISUALIZER_SPECTRUM_ANALYZER_ESP32, $width_low, int ($width/$spectrum->{full}->{band}), $spectrum->{scale}] },	  
 		# mode E4	 
 		{ desc => ['VISUALIZER_VUMETER', 'AND', 'REMAINING'],
 		bar => 0, secs => -1,  width => $width,
-		params => [$VISUALIZER_VUMETER_ESP32, $width, 0] },
+		params => [$VISUALIZER_VUMETER_ESP32, $width_low, 0] },
 		# mode E5
 		{ desc => ['VISUALIZER_ANALOG_VUMETER', 'AND', 'REMAINING'],
 		bar => 0, secs => -1,  width => $width,
-		params => [$VISUALIZER_VUMETER_ESP32, $width, 1] },
+		params => [$VISUALIZER_VUMETER_ESP32, $width_low, 1] },
 		# mode E6
 		{ desc => ['VISUALIZER_SPECTRUM_ANALYZER', 'AND', 'REMAINING'],
 		bar => 0, secs => -1,  width => $width,
 		# extra parameters (bars)
-		params => [$VISUALIZER_SPECTRUM_ANALYZER_ESP32, $width, int ($width/$spectrum->{full}->{band}), $spectrum->{scale}] },	
+		params => [$VISUALIZER_SPECTRUM_ANALYZER_ESP32, $width_low, int ($width/$spectrum->{full}->{band}), $spectrum->{scale}] },	
 		# mode E7	 
 		{ desc => ['VISUALIZER_VUMETER', 'AND', 'PROGRESS_BAR', 'AND', 'REMAINING'],
 		bar => 1, secs => -1,  width => $width,
-		params => [$VISUALIZER_VUMETER_ESP32, $width, 0] },
+		params => [$VISUALIZER_VUMETER_ESP32, $width_low, 0] },
 		# mode E8
 		{ desc => ['VISUALIZER_ANALOG_VUMETER', 'AND', 'PROGRESS_BAR', 'AND', 'REMAINING'],
 		bar => 1, secs => -1,  width => $width,
-		params => [$VISUALIZER_VUMETER_ESP32, $width, 1] },
+		params => [$VISUALIZER_VUMETER_ESP32, $width_low, 1] },
 		# mode E9
 		{ desc => ['VISUALIZER_SPECTRUM_ANALYZER', 'AND', 'PROGRESS_BAR', 'AND', 'REMAINING'],
 		bar => 1, secs => -1,  width => $width,
 		# extra parameters (bars)
-		params => [$VISUALIZER_SPECTRUM_ANALYZER_ESP32, $width, int ($width/$spectrum->{full}->{band}), $spectrum->{scale}] },	
+		params => [$VISUALIZER_SPECTRUM_ANALYZER_ESP32, $width_low, int ($width/$spectrum->{full}->{band}), $spectrum->{scale}] },	
 	);		
 	
 	@modes = (@modes, @extra) if $cprefs->get('height') > 32;

plugin/SqueezeESP32/install.xml

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

plugin/repo.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' standalone='yes'?>
 <extensions>
   <plugins>
-    <plugin version="0.70" name="SqueezeESP32" minTarget="7.5" maxTarget="*">
+    <plugin version="0.71" name="SqueezeESP32" minTarget="7.5" maxTarget="*">
       <link>https://github.com/sle118/squeezelite-esp32</link>
       <creator>Philippe</creator>
       <sha>2a8cb954928e0cd8f521acd94b90ce9f34a7a1f0</sha>