From 3eb2c76d6b60152726799f8b8387d5620d9a778a Mon Sep 17 00:00:00 2001 From: philippe44 Date: Sun, 22 Mar 2020 20:23:51 -0700 Subject: [PATCH] set height before building modes --- plugin/SqueezeESP32.zip | Bin 8199 -> 8209 bytes plugin/SqueezeESP32/Graphics.pm | 2 +- plugin/SqueezeESP32/Player.pm | 9 ++++++--- plugin/SqueezeESP32/install.xml | 2 +- plugin/repo.xml | 4 ++-- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/plugin/SqueezeESP32.zip b/plugin/SqueezeESP32.zip index 68d6732d572a9406f50d87acfcfadc9348f87c05..8edf88e580f84dd3167c27edd352bf3bae6cc43c 100644 GIT binary patch delta 3094 zcmZWrX*3iJ7oNqwFC)9LFA*YZ4B6f=S%%R|*^^zej3s95jjc>0OJ!0>vZRnkJm=hVo^$Vgp8JM4Lw*}eFdYN{05AbI3Q;z%SD)EA zGXel;9KRffFI=jhCs@NpqC~XtU2UB@AJ^eVixxF8G%>)t## zVg7k!4CtEQ&q}`hg6DXz_@2uhLX1yXbY+bLIN~w1f_H}STyy4ukB#fyHChGR zRF`JtotEF?wqxv{NJmrM=`}+NJpQDK{o-`>;+)tG@rN`7~3qR-8e zh-i^BQ34LXq7@-38Pe(Wuw07m3g29e9=o!#Yh2JP+!r~O3$k(YK9haJ#`>9gao9BTW1$8Vpzq^ zu=(v;)Jy?wk*k@8d9k^IZLx(3u`9>(0;=sFRQrQu|=XY^btX8)5mcrx?Mzc=bHEwl$ zE^UzE0cDNI;JN={@S_MVTB>fCT| z=sf6G9S_Nm%l=J+_x`lB$h}H&FbjBaVJ$~vumHHYN74>X+*PL=ZTN>PqMgH&ZVwJ&)%iF3~}-lPem>UeskFmH2C zBpD1^hP-Rbf7u|T&D~>#x+2M3c=4ipoQ}i|AC?O&FWvSv-U*Pgx)+$C=S%5ja~iH` z+%!X3r9QS-0dfz08(RNcC_~_oVq<31VE?AK3Qe+aOuvb1OwCdIw^A;RYdrI~`gK0T!OPNecobam~KQd){y$XNsm+c4H|x z`w?oQB;GV`aN7`pybq5C^@)7>!4ZN~aU+a${k4gZ@cy>jF&G`$WC9G+6Dd957WQ=` zOyJ1&#)H18AVsA97=M@7Lk3m5#ph4(B5=)YI8$`UISUMjl5kH_To1B}`33*M!lVw| zSDeBC@x5gT^Ga{*b!LrjL$$^UGw+;3y0*t1RDgTuR@^wc+_v1tHq)~$uN<%P+?kMY zqIz)lCerl|QkP9LscNtxVD5$Q`?i=b74*x0Yc4rFJ+Zb~U~BOuRRu zmVIQp`{_37?eWUmGy_Sq-OqykE;QjJOrkk&Idwih;BInJ`I@hxY=`u=T5`zOM`Wa~F* z7=84`i*6)(MCZWjQ|!P#mN>zxefk!&@lIa0OiQQfIyt3Wv3w| zc|YN|1Su{ZUXGObYQ@JciM3B@4Cd`#aAKr!d&|lktrj#1u{sk%TN)lVRQqLTpnM8c zqXmcYjv_k4;k_jz#0<k+x0FuKENi~Bq^OVq8YSy5H%z~5tvs*5vSD00#1YSPR0qv+k;^sQi9weC}AchfPLZpzZW zAPKByW9RFI>2pf?{(gpKeKb3E9NRk4Y)+kF7`2<Bxkg+rG@UZWA8Z`A9M6%IYfd!F zxn4C@=GmA(nyJIKZb=pp2-3aT-Vfy|Ewkt8N@V(XC(y&{(O)Y&vTLHjtG!DCItWJM z=M4P8{wtxMPNh7Srkh9H9Jx!vLv2mAFMDj0+ec+1Ds;o``>FW29d?2i9{@AA?EE5z zccmP~5pE}bUyjKo(!Dv{<+g@U+XvF)lR4$WF|!-NFw? zQ|dI2)^8?S@PIiC1|>t9M^=WONk>UpI1H+lUC(S{FW}-!kxx;}a4T=HvJjcR(F*2cW;JsgoHS z3o4;B;&5a-M;A*-eaC>kKn(LtyZdmu(i}kfF8wljIJDVHPISJ}?7gcssU1RDQg4t_xnl z60yFWv*mHSxog_8Zt;Zpmx5#boR8hOVkD^;RQ+~r?MrZn$z&2(OE)M>Bo;tXjjXo5 z9@jhp?7bsx>JVXT_Bkxoe|E|_TfazfFSGVW^zBcm@8D@;E|YtxD5>>x(d&mW@+r8cgag6G{(s>aPbaKI@1Fiaxec!& ztPf1VhYC9Y%kX`|j=*8Ow1_+Clo1~!3dO$?u>xx214R|^Vxm^Sm_OYu=)a$W^q@w&r2fm$y7vCgi c1x&)TLY;ti_}kE%Ktp^d6vnVC^v{_8089zM9RL6T delta 3117 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 jXbEj_HP9sC1&#*J+^hRe>eRXhu*+! diff --git a/plugin/SqueezeESP32/Graphics.pm b/plugin/SqueezeESP32/Graphics.pm index eb79dcae..5506fdf7 100644 --- a/plugin/SqueezeESP32/Graphics.pm +++ b/plugin/SqueezeESP32/Graphics.pm @@ -210,7 +210,7 @@ my @extra = ( ); @modes = (@modes, @extra) if $cprefs->get('height') > 32; - + return \@modes; } diff --git a/plugin/SqueezeESP32/Player.pm b/plugin/SqueezeESP32/Player.pm index 6b6e618c..7e638201 100644 --- a/plugin/SqueezeESP32/Player.pm +++ b/plugin/SqueezeESP32/Player.pm @@ -32,13 +32,16 @@ sub playerSettingsFrame { $value = (unpack('Cn', $$data_ref))[1]; if ($value > 100 && $value < 400) { $prefs->client($client)->set('width', $value); + + my $height = (unpack('Cnn', $$data_ref))[2]; + $prefs->client($client)->set('height', $height || 0); + $client->display->modes($client->display->build_modes); $client->display->widthOverride(1, $value); $client->update; + + $log->info("Setting player $value" . "x" . "$height for ", $client->name); } - my $height = (unpack('Cnn', $$data_ref))[2]; - $prefs->client($client)->set('height', $height || 0); - $log->info("Setting player $value" . "x" . "$height for ", $client->name); } $client->SUPER::playerSettingsFrame($data_ref); diff --git a/plugin/SqueezeESP32/install.xml b/plugin/SqueezeESP32/install.xml index 40c232d4..fd652e0f 100644 --- a/plugin/SqueezeESP32/install.xml +++ b/plugin/SqueezeESP32/install.xml @@ -10,6 +10,6 @@ PLUGIN_SQUEEZEESP32 PLUGIN_SQUEEZEESP32_DESC Plugins::SqueezeESP32::Plugin - 0.60 + 0.61 Philippe diff --git a/plugin/repo.xml b/plugin/repo.xml index bad2f390..23c2d1b0 100644 --- a/plugin/repo.xml +++ b/plugin/repo.xml @@ -1,10 +1,10 @@ - + https://github.com/sle118/squeezelite-esp32 Philippe - fe158890790ead9a5f27a47a7c7a55b5719087fe + 5c45fed832e6f79f709bef5f2da511071d1c776e philippe_44@outlook.com SqueezeESP32 additional player id (100) http://github.com/sle118/squeezelite-esp32/raw/master/plugin/SqueezeESP32.zip