From 4a68c16fef996146605106dad0d8d4e04e88ee69 Mon Sep 17 00:00:00 2001 From: e2002 Date: Fri, 16 Dec 2022 17:10:11 +0300 Subject: [PATCH] sd_i2s+sd_vs_v4 --- yoRadio/data/www/index.html | 15 +++++++++++++-- yoRadio/data/www/script.js.gz | Bin 5251 -> 5415 bytes yoRadio/data/www/style.css.gz | Bin 6383 -> 7157 bytes yoRadio/src/audioVS1053/audioVS1053Ex.cpp | 2 +- yoRadio/src/core/netserver.cpp | 15 +++++++++++++++ yoRadio/src/core/netserver.h | 2 +- yoRadio/src/core/network.cpp | 3 ++- yoRadio/src/core/options.h | 2 +- yoRadio/src/core/player.cpp | 4 ++-- yoRadio/src/core/player.h | 2 +- 10 files changed, 36 insertions(+), 9 deletions(-) diff --git a/yoRadio/data/www/index.html b/yoRadio/data/www/index.html index 877969e..94bb9f1 100644 --- a/yoRadio/data/www/index.html +++ b/yoRadio/data/www/index.html @@ -10,11 +10,12 @@ ёRadio - Player - +
@@ -55,7 +56,17 @@
- +
+ +
+
volume: 0
bitrate: 0kBit
diff --git a/yoRadio/data/www/script.js.gz b/yoRadio/data/www/script.js.gz index aa35f08668ac1d9c64896bbe98ff6f5ed6be0def..275eb6d46f061634a8586e8f61f8ec368a6f8463 100644 GIT binary patch delta 5187 zcmV-J6uj$$DW@ubABzYGWNw^e00VPla%pgME^2cC8)?;7QsSdI{;dixv9wj+b{pa|* z3b1B*?k|}DcqxCM-n%VDA<4Q7MW+N|&i1^MT>&tEIGau$9Zx2clPUf=u}5P0+)vq4 zpZjhAfAn#v2o_=O;p1rS^ZCjhe;y4UoxIDb3xD_N?O04LT)69RJTKlvkw8<3Q;^{L z?ezVrXhNXr2o#T9zh1Zwb@~Kw$k9}xD5OswKxHhA{5f;SZ|VE-a!8za@7_@xU7){ekW!zoa0kMA&ZAAha+iYo zaoFWK?H7o(YM$SKu~|z+Zv&fWjKzDwQ2BpPVzw7>3k$wt*U&9|m z_rr?wv|@u$cH?ch2uJh$>cfCOq60Kruqw>$kCt**y8ZTHeOUV|YZkXG0yEW3_F`9m z(LVX(j~&mWpBy#|S%@31&7BT$!6;JS# zDI%@&UPNKqapDLnx2j?j8ye;l##b!kL71biC~#I_PpBX5o_V%u zGW=bpjObm);=ivNMroWEpd=gcGoveiQC2N~01MwgB?s;)Np)EAwNK>_vdp^=uCthniw`8PAtrL zRCp|W=wf`pw>Jm_&lJln*`yFS*NmD!xjB#gJbwjIhD!w?RRb=PjJOzoc8B8741b+@ zlGF%hyyPo#M5fR@7{~~{z`-GZlQ_R2j^l${`TICtqG|?%Gf%&f~l;+0QLnnLODWa8S_7u4YzhERxjnIm2x07@f~1?jK@R- zjs$ZDEYK$kb9pd^0~Oc|St9beai2H}$1%1DlT8IEem0Ft{0g95xIINu4&^UZ7>avkOc`W)BJ(=6mT@{rk6bW>YU^ukn`Iod;1?eTPVi*y zbk>vFe>^~&=x}ww=kg?WDo&URv!h}bq`P!9GUC zPLoe}Aj2~@E6L!~tfaGdEoOe?$Md@7IMj5YOrlaGf^4JhxHYp)D?f&*Rg=@DEP9t`Tx{cU&;E57G!aipx zxP3d-6#ESl)_D!g#PoG8?|PM~^!9(heDR#~^k?>I!@!OTD$qMhVsO{NP0qm}%~z-c zLMUrR)YUqID}>Mj_5xuEDAV_)3TXhOv&pgZcrr1AkBS0FVtDe)8QPpOV?#tjsu59S ze=F%76h$!~%$d`_Kf9!pJqH^CF&2|r2P1#dU&?_66fHGYVxiIr6-4P%+Q)JMxT6g_ zEz~~+(h_#6U_GoAm2JxgCG4M6@FYz++ksbMU_jq-I!JT)JElgIC&95iB?G!&SriSC zF()Uve={VXHvatMs9;xw1yX%~grDwPN#OmEP!Le66Loa>8O_}ZG+uMe5Qgz7sB(V> zJIdSe#nFF&D!{7omq`E^EI6qP8*clhm{ds2^xi?myM&l2U$9JX=>ldX7t{{|Vbu&W z__#?iUKR3bbk7t4k0fMqEUCwe?e(xfk+MkH~J16ul!qO>rMk zlwHI?Ftr20N=m$aHl$~6x;L*cVAp@u1G}E)y@xu!R0D5-Cf)V+d&5{ILMx)W$7yxLu0Wf$3>g7oY*WEYjX2fzgmmRq?IjC-QlgMA2oUV)fGMrBVIiwTyqyFnV_S zrDH~gOrv@u(|_wXcrljO3PtjApG$6DhGJT;nD zu#q^={`9zUFf|MO z%2F)&37N=;8C!vpBpHO>`5J!|bmbu7ipR3gS!jO58X6N54&?OfuIr)lSF)3t1H;LP zjbMad&5NWc)E*9~th>;@y&gNtZb=g7j=>D>FBTQ0XeodW66+!%B>3edgmYq12N8sU z$D)cm$5QlBDDDaLT8(-alU^EgY09}G@EjsU@RIagTH+)0%;07yIG%qfl!j}3eYD+f zkI?cTZ8FU3!J$rgzFy%LM0GfqYvVzD9M~%-gF>AZ_|iuTgxMUhYc`STZglAP6;CA( z%F7I)$tFak5Y{M8OGT7`l@kWuPzmQBouOlH1HKC3oZEt?m1qc>JKY0@nxfAylgjy} z2?rFS>B!TBl3XPP&hdW^PMt|9PZw2+4fdo=W8$LbsUNq99lJ{j;**u_18$7@$bjs8 z6-I$uA&BRqSFknQiU9i!=r~f*2Rdo?MPbD<;@zD$FP;SkY zGO`wpEC7W^^IBJXDHaVi0JafOK9y%?g{w?f1;4uFI{@NrQLHynq~+Z}<5o-)*%Gmq zZd@Td)geknq5^-}jzusG8BkB8@KO6MA=R-OK&?S;l2ubf8O^?#-4 zP7Tl$;h|p_w`2EvYzbO%cQO(j5}Yx1w*m_%?Z_@?pzXg%1HF>hhZVOf(NycbO{`zC zXfG1FZxiP=)~xm+2?uUZ#dMg?nQ*vb@*Z7g{%q#YB1V5nkon6c{`4pYqx7LOaOq@1 z2k7zp{ZS494s(wl^asw_7->9wSD1Q2EUG9_%s8Ohh%HASp2-FbU_B~LWpYhRg!zn; z@xwa860wFdij*pfn5?2iCgG?vC@+hO)d7|%S^L*2;-k~=CpcQSVPFv&M!_}wGn8?q zH0gM=p0R%nXoV1=AN}onLDi%91FQW&*&G-Z0Y@G`bo4?qD?*VAUz4v`CEI78HhvWT z&V)7SwUj3m*lg*T85W)_mk}tNOtMt&!REqPKaL`O1QZr~cHLkltQ4?=S|H9-wWndE zQfCT!J?s$`^};j2X-z!@t#s zy`Fza5tgkouQ-H`A~o3Sbx91S(a$n)(>tTFj@7U?S~Xm58Zq`AycDtldp;qkX>DEw>GRi{>672keP9mjhMu89nP75oFMc!~v4 z>^>u4RQehee%sv-iP5V&D}~poRd}s%XEi=38_Uvchgz%o-o+QJw|1+xw$@tzT&0t7 z4kr%RHBZ)SAELVX8gmza`IDv&I~!jJl3k|L+B14VbMNQ{pY@|B;xe=C8l(`;v6K7` zA%EWJ7a2};CLE}LWH-$lfA^IFqdoww@={812Cg2iBA>S<1b1JPC{o5Xv_wVgfcGX^ zXyKgc0RG&mQy90f4dE@en-pZt=t=k61QO%JsYy~&!%HOWI!!?P3VLE6|EYKD>c>$= z`^37iRRaquyh+3CkO_ua-Q=tr9|usYqkmP{Xyo6{XVgF!@1vbqUZ91?L-^A;b$q57 zy8>GBA;x2ret_^JH6PaWq+$rvUTv6<0@ud07AjmTRjTPbOwFvfL>pKN0>P8WB-BC# zED{jgwXsmkG8V2|tzhnFII47?7f;XOu^uwsEEW+fLFID=Hed^X6LCXcmVXJZ zptc4PYQS12FDs!HCvQ(d8~8ks3*44q*D%V`tEbj+g^{j-EXpSZ?4Gy0VDQ+#vSz7{ zX;z5TLI701N&%x$3*9KJ9Kgs9nZvlKn}?+i8NSS7IOM7;5&hsy+P$-_1$d(kB65Rj z6U$9hrPXlolqr%QKgB%xN65CW_J74)5+6yduCJeq!gB5W1Oqq+QFRheHRZeNO?VcG z;;jDWgvf#9k$=Tx#}Z+6 zISG@hJR#ye3_0?EIM{yt1OD6C4r71YcXkSg7f}cYf?OoQ z#AOZn+$EbYL7VgWid21qOLdC-fw4>^RxUX7db_V$$on>!tva=7?0z&y-kK1f&9T&d zNEY~>r=U_LUlJUWiAqID9e>6{eT$i<`Ykc4&M^|BuP}GnquUh&hdC^#%!==RfFg~+ zn{xku$QiJqw|2P+ALp+`l9dcRqAtf+-)tx$$x#V$uO=c!(+Cst9D9q4jW@#Z26%od z{ia*A;}PafmZZMCohv(ThvYNn^1!d0NC{W04l3KZ%6zlDbb?H&R)3dQL5s|J)0N7C znw4oJ+LXw?27Qs&yUZ&IrK(h%1J31%aIbfqi1f{0a~j5p(w+u6h*24|&TjsXuq(Xs z*W|Md3rsd`Y&$K$LoN!0k~cyJCTL^eFi=I3oZd+eD$@9xk}!jr>XPAh5Qzu=dz;Zz zAXGbl_1xFEEu*V@Re$BcR(ylsNi)CGRJA=iu~#@h-B4_5-C%rN4aXSYzfXR7^YroM zGjjj_SbWD#p0s}r`RZAgC78AoES;Ja>0d-n04wH1TZ>s3s~mF6>#+g^;#OT%R&r7u z`=WQ5iNHKwr%Y$ds~D0}nkCCjd^4p8$tHUuZyOQVkOO*3M1Nh7|2fCkCZm5AZ@VfI znBSD6?qyYETlc6i!fVn{S1zrG*83DB3H@2hH+p7 zy=GnC6KYhe-XRx6o34o3Lyn%le)X*K>4WMm&~H5Y`oGMaU#q$x@AA$mwcp*Zl07x( zRia?j15>e{Cfwl^P6KL`MB@RF%>OB_x{4J75G#nS^XAX%Cb2V-@H^`zLQ^{AY&pQ zdBT0Lf%l0z2;D`4Uiy4B5@#k?4cCX04*mAKc$TN9@_$c>&H}UT5Ay*Q6*EU$Kjfp) zi0+zto8c!Dma_Z^=R@Hb#HahH4pPONVBjR@ zz?k@~rIFH5FY&!mb7{{(beecE()b54`QmxtO}|&}s%U%o!$covx+I3}+>r5>-_Asa z;#&Jom|R}jy;el9a4Y7-3nh!4AMwJ*>c=J5ZOOu|@6dI{;B&Qq9wj+b{b%^O z3b1B*?k|}Dcp*QZ-nl77A<4Q7MW+N|&i1U6T>&tExIdjdJf2J@CsX`6u}5P0+)vpP zpZjhAKl(US1dFit@Nu;E`F!P$KaBxujuNJODojw5^ax_&a3hAQEV)uTbJ1}h<2*p5e}D7pw?ov=c z4!b<3{Q|L8>z8HfyQqZD8|^v3M^SD*x|E%=Q9qVZm1{+Y1LBehKBis@g>W65ay^W3LM%RpySP2>y(1UmIh!Pl_#6|N`dmc zNvOeWX#)lgfO1xeo>!2kNqqPU%(8H~;xQO>y$ZAJa4Nzm`5*{IV_vY*x{iW>XP#}E z41bp?BYKyy`0uNRQ5xq3D9Hx=%;*y5?`blp`>@twTt!;%LCRyE9@|KwsRP<{7j4=> z9$N@PJ4$_(Y?XIXf(P9G9?ld(K&l2@BpGorRt&{S4}RVEB&iY1c*$4fh)kh*FpyzofrCT-CUJg4 z9L=FZI|8KNOe8TILHKR>el$mRo(t~}7Q+wY+|>l${`TGs2nne{%Gf$bxrC{#!XN-g zV#FVW%rfR*lnpm_{7^6Drj>HQpZX54L&jqwq8)+amaIL4q+f@;k8Y4xH_{9=Sd9G z166tihy4&5z{m)*qZ}>L-MexC-XySI=WW71A|1U+@UxQMAtcsdAERQY$){V8;TfBi zWbkQL(%HKfGe7dqxg2PD2UFTga)ft?j;XlEBN(|)&PtkFfJ{r3KPC%eX)3mtW8X!9C zRM?((TzJCfU?L9#ItX=mh3Ic5?_rg~wOa_M5j#cQMr=#x9hC49_Blhr?c1rQ*l&=q zK8$1fpsy29SF23rWdG;I^Jj2M|CxQS`Uq z6+&nM`vzeNDAV_)3TXhOv&pgZcrr1AkBS0FVt8E18QPpO%|JvJr4do2EGsz)6h$!~ zO!U&fJw2yGB1EA(gey?khS;QU5RxmT7J~oE>#V6A$HCbPf*&6Gkqm$kHQDfV!#zrs zYVO8%f_PJttOpDx++WIp1r#kcR$`&j2^B=?Q`*NIH@Kq>J1x{d1=13Bs$e}VaFmnY z2N!=GQzOcg;8;_U0o|`GiiXITlat)P9+Hn6e||A4*cD-cRNo)rqx)78ct0c*1eEIR z5*>a*b9VxbR~*w?VSEazoWYLrHhgjP-=GSxYWzhK00s+A>cWPbekmpu5;MJbQ1Q+o zX37^V(_6ZL8Oa6pgFsj{gA6`yQjAxHd>Vh6x4E^{Y3q>*|t$a)1v*m73@o zJ5qC|_^fcF^qDx0=x(;bDwU1mfktY?*B-sUI)3m*0f3%evS37hX0s&0meFW*e++*B zwA%m}JOcIdB!ug39D~|u#QtTtRA<*#3PxS1w8Wow62+^GExbB$e}KSfNT#Y{RPht} zJWHbJJW;WFY4y^m{_tAHXBa&@{n9a`LZ(r@k#eH21Wlur1WgtTnA|glDYmkco1N!L zs(W~nzD{yk0o7x!^kc1Y1)dsBE7*U@!PN7N+G^>aijjZ-+Fgqkv7g1jR&P0rvVH}# z(DHR9ZJ>Oj$REK>;s0uUJOFaz7R< zQ$KDIJ9d{6#3w7;2izF*kpbD+DvScRLJ-eIFJWuA6#@1e&~c=q4|IRh?2E#RWyA|7 zub)2+LY}CYw%u0lWa9qR=S<5o9D3HYkiYbKvrE43Amb^ ze4_I4%>au<0|bVmz>DWiA0n9(4QlX@cKrJMe`VNMNwi{p5R7%l@?qr~n5M99r(l#4 zYYB)VVH*jnu-Hgqx{rUv)F4s6yk%r98d(4ekLI;Fp8of@Di!b86}~}XPTG-O z&OqCLkp_Ax@4PB*RidfZdz)ClWYJzEbl)bt_(o`l_v_zQCC>cMfBPp(WVwt$*<_NXa(Ocs#`;kd z=_8=9*t4q!D`BO89n=DGo~k_!Bb7Q+(CcB3sHhj70Zwb`0jOC52$I*)FCr%fXB=Dz zb*Z@OwX7niH!XA0ZK=VX#9$f~iNT$G;NEQDZE}INnZU(v`p-JIKLY=Qsvv9(?Egbt zgF@hw*V&$Npr)jbCCmd0_%9^S$hwppjcZQkvu zHQTv+6J_V{L)Fer3j5Y#-LT6@683r`MOe1Vyy6f#iqv4Q*CjESMnB8IP4A4xI#$Ep zXw`7JZBSBg-)ne#HRP&I%3VsQXqQkYFixra=R(oMc9MnHDK zh~hsOSM=-D$wVUg5zAngpRE#nwIom041&~n305zYS)E={S4S!}=A9U12ivU!2bHFDtX(Jr45s%QTXSmt4^)D zDqcg`R~^TD3$BR_e-->at9Xh9QS81?z^L>!D15fN9}uHgcUB6oQ>*Y=;m&HjS2mWV z*$%Z<^JRfASa0oCZEdZ!eqNKQ4k!+cG*8xRAELVX8gmza`jg)dI|JWhk&_({7Xh%7 zH4hCu zjP{9jVXFofRCtqy*&!1Qv%1MyH$D!aR!6IUu+hlBozJL&E?%NKvAjSFkB9K5aq9R? zGj<8I4wVCX4CQV{>v-nKZ{A%YX7{ED*f`E9csjO5lDYHn_ z&Gb9$;&_@z{w0&iw3-Qt-cY^V4`v^*?RVe-O=p}`0j61Mf|zm7-%}VjEt1~B(F5vJ zjvn3B9Y^qC9mf4Jwygat{d{*i5hnqEybHpwBQ~1(^9y`WC&pZ&gUNP3J6dKCpkg+Q zCq%r}I3$0WE&LzuF*5nK{EV;A%aI4f!S>@H@NZ)~jQwrj*{RsPi9(3Pa*=%yRdV^< zC5Ys-*x$_3JrQ1&|V>uP}GnquUh&OEoN~%!+Rb07V*s8RP!H z;FLKj;+t}dJ<4B->=qe#MBPfT-taCV$x#V$rzRA^*NR|5o?~xdv8_hvSAgdy(hRyq zJI0Q$vn2K9wMf}xYF9lRoC*>sn!pk}3b zh&B|muR&kry&AI?T&haN^y6F}3#WL?iAaz7HK$>O^7b^yL5#|1VRrq0gk9ltzb2oh z(>K|)vF-C154ot!NZtq?n4pbe!9ZoFb9yT|s5s(lO2Q0Ps!N93L7e!1`0s5-Q-M(J z+SPMk+v3Gb)Ai(+$O@)(ys2G2s~FyLZViub(_Re@gD& z9gA;$l1H3hL%w>NWeMg>1WTu8DexC@7{gK}(bi%X#wvN&@?N38UB^(qskWAzg&odh2I!#H4u|E*81UvNVhXBj`2j z`hrHITJ;XOnb&kT&mMC0DLF`_ngFZN)*;a!pNWftnQgg|$S$@>TRP*#Vdgc?VSS`v5$D zhDT+vZ1{Tzuk$NABI~p7l^qo=LihfPnicp|Bw79DtdwPQCcYt0eNUEr?VpT^eB=rD z!3N$X>L7F*4SL~!^VLY4nOrqoA5J>-+wbC8o}S8|5}gHR+aKlwEGnh~wtmP*qY>T1 zOM~&N;Y1o}qMykF52vcP)@`OsUze;7$u`4x)t9pF1Ls5G7{nKSQ5~d;S8%{d&Ve!U zC3r@{LcKlpTFs?B!_aBs#Yp2H#N>!4DH~eVpl%k-K9ZYmC>cb|x|u z_lbAH^vdqFB7%imF*oMx2De%$S!E(;YS3XRZ>?fA3t)dWpkXphWx=%vxF3qDa!de(P5_(`U}~wDlIa z>sx0o0NLCS6}Ou??4Sq;$Tp|{`4Jmg9X? zenC<6D|k}eYMKUbHOCI#HSu6t$wy^j9#sEx<*(UyWuiuvnR5{BzkaUxs%KvN`(~p_y@%)L#bHjU2=lJ0o`l4{hlxLMFtaqyIW9bmYPo$ zzvsBVHV@VQogc)z9fOB!u8+s}CMW|C|R1agWj2suuLB~SCClhdyu$lvC!K! zklZe6nQ+~E|2xlB@PRDLkE2Z6JwX?Iy8-T7;TH9l8~?>TxQ-WykZa#^pYTM*Jo%8b z&q3sidNgef5%I_+ml$sgp(nEPrqJ zKKmQ;O|LxwYvqb>w9s6Y#WHZ%Ga3MrM5bm!Y(7X*>>}Uxd#<9^dFo$ePlZ9s6s?N| zO0>|bza-jH)&iCN9G%daFFG>nC3~Omif0A!8})0HxeE{19c1QiqBkMyKaP;?R}m8V z?LmvcbUYt+R}U_rISZdG2&K6Ubd|c_hz;?wsfCd1CW- zKuzLD)_{QI=Bos@-)??3mpC_z&>^im82B@p3kE6Z;1>aJF`dB1;0q^R)}yly7Cv5* z0{GQmghFE(E&H2zx!_MiI1NyH7?7Hp)NCnPYLh_N%|o)Gr&b8R)s(VFK7T4P-hQ-- zmZN1v;aJ|m2kICD z`w?2Cw;$-b{?C8@9mbhUw9R00hnhc%@^P+lJ=V= z3b&|t;HMa8sG{;bAGvv+L%Kv2-Ltbjb;{Ri)~#=rW6#ZUU%+~@T28q-PqNM2k8Xv^ zXa@`K?6#-R{$5v=nhZK7a)5g#f!O_kL^I%aQilA(tgEO#6G=e-Dh) zLHa{VxODx7D$afG&fcX6QNlp^*pjEc;8O(3au_+!URLXUe7y~=mGklJTOqcRd&^ae zAm^=s%*p(YTm76!g2|BSKrDeoPk5Wn3Wg7iSZ0yL9whKN7JrQ9jREJ`D!iddi{zI) zTdPkt!DfhWb==`FlQIH~#dws#M#CySQ#r38xmlbdEo!l!pZEhoKo$iFk?x6-BuduV z-3!t?IANxc;vV)Y-@hN6^!=eRH~hIhJ8h}(Nb=mVAKW)%iFZj2BK3Uof6VMlb6zO% z=P<@oVk>+~>3_gashZNvu~vdt;nXidQa;ibwU+{Jbp?JZwJY38JH7Jej~1jJ75FSY zEBvRCmpE?Hu%hv%3R4a~`Hs5Z-O*jJvH@3!*0)ubAGyw1YI%W649@M~oB}BI)sde^ zn1Wp_^TQ5|ciAv4!wZ2~&y(_ppRp^K2$fvxLaLWu}0Gv}g0o>UB4+SPM)A?PouU=%A zcjkLMk6X?g9F zN(fDVyMUZ6hQ;aR0r{8gCO5*#jWmi?@ZZ-;ezlZ@zBI8P}*^+&^)#@0?X`JvFb*6&ZRUy6*;9 z!Gfz4`#M*H>#f%3%Jm=gd`f_*DWUZ|`!jt9ln$1z6$v&OfIK)36hN0k=3G!!fS5cL$(+>7z^%bnxerQ9hdl(da&i*0Nz zHZe7o5^62Rwe=>prm!9S)|8}{YN^%H(ptwvEd)Fp8R)7H%boUKx1(~YlZ}jCmGk&{ zJ8ZTC!kf2)UhO!4A$vSL0Z)oj=Oj&iE&_t#6B4Tmq~6tPQ#v~CJ$^H!t!57mJc+m1 zEl!KmcBCwO&J=3~^7Lr&G`8)T`yEOz_=ry!3TKCEpQqbXUgDTU?bk?DBMxa_jhHUc zY!70Gp>d>0uFv}9Icc+n5aeftHbD5IR^5hXx(ZV#Bie zetvO1^@U^qe0VLd@LEUKXc6v_ZA^^-ycVlSKmep9Ik7zOyE6~>;XD+=O;j5Jn1MEn z83lVyO(~Cm_R#4hKw(>d8IcWm0hq35A?ZQrjf1@e=N$Oxn(@g6Y~$!nkjcR0a70Y+ zfK0%jQ>fge!vSNF)5f7X z9qp1f?g=2I1(ML@`aCWQSy|4X3p0G#-;Fw3YSecyy-&^qg7umKA|uCIZNjH)j4oEG zYSL4F=PE>tr4B?BS=#F(v#H|5)}c6}HTDUAnmeR8zK@97cudnA+4RVI!m_~H#C#F& zV&XVRTgX_~BP&#>&T2N(#ky!UR&)OpwY$U4QQDJg;___0lypY`S!dn3^waE=nLTj8G!>V06aYe&ldnr9(*4M z<`|B~hd70M7!@9_*|nOQx*F=(#9%_Ps-(qr2k0J|q+>C4*0Pj(_2Y4lk&k`%&!cqa*~TFS`E@X+3}_4Zmq5X2vH0}!FqmSoMx zTT!0rsh?o&D%XjOc*!3ryLaf$LDnX_Q*%FL1t)Sy$C1{|vXQ1;vF;3zQ#hC^2Ti62 z79%e(ftow@%_xrOAuV@Uk0JIJ(_2&}m{t%@NmZHQl+{;_!`38rucOcgFEt_7Nn;I<4WPFU5^j z!=#VAxjhj&r*&zfYBp+)Iwt0X1Ge26#2dku5>07R)@l>am?71q_|By5YpzQ-d4HiC z=2KQmm_^`7jzh1eOfbXe!}|VzG{@*oXRi8fa~MX*G)jyCMzhx9RDE9AhVVc9S@2h> za?Ax#-2+%#&=nX6SJo$|{E74!5P(1%crGA-opyk+cJOsD2QJ_e4G`EuI2JM%7|*~t zIM8S4qYJ=f4ZwB?=?VS5*GDK%fOEqj2m@lsWn%<{KkaQ0$kt%Y6b3(k=xXqSP+zn2 zT_*3Kkwg7tw|ahy9bmhlHm>PoJZyD>>d|smm`n%MY_1zMSz}`9wB0vbLk@GgX-hk1 zZzA^D%ZFytZScvaLkL(*qU%AE77W4}oD64cGgYLA5SUI8{0bSUtRE8YcB_UR23LnG zK8Y8j4#F<`gXJcP^xEEkNaM|MsmziTOAZH*X%L3V4_Dd_CpVZO%uUbgs;bNS$8jj~ z#I)8q9`LmpyMyIOb4Me=Y$mq8Zu|B2^dO4Id9YWyd?)Uo?BU5LH^W{MCJEkURTGJ) zfj#VRb#I$A7$zlJsYG@;)LaUFxHM8qZqW|0Cp?qki2ZSF$#z43rWy-uL(@Cs5N=-P zMIg_EFPQ!;=qbw!^dPfAHiZ{tMEJi8l$3(d>Zs|`TSiL;=1Ro{SrW1<=;NIkw8nt@ zb(R|eID-2=%%Q;86y#UC`3bep^IAK|ssO&)`V7Amjs*-W!Q2X@_V9iLShoRT$3#1( znZeFJ!>$^3(6$_Zqcel0yVX?pTSQ-4k;iV3F5=Ot9*76yz@GZbK@o+1x5>`dyDmdQ zCGZ8aHntSgcZ3K8Vr5SbnY3E%$w+s%F-e~vjkZ3?j731eE~VE;lsePuGh(@2uEpAX zvhm#=eL9ITM)kN^mlbr2H>G-$X*f7Bwuaa+V!I>N1_zOUDkf=1e?-_JR?|8}U3PZ; zIm7kaGC8Sp5iel9h(Wdrq1SpS+iEdnJOH^Hhs-*YPK26F5Nui|;f`&ZUydk#(pfoL zA3^plx%mo0zVbf+4@`FdA6`RB8G8F0@NB$sUADB2%GA2@oR;b3nx8q-R;OL_22?^u zyTxH`I19mluMd+A;DvcV9KtNAzqo{Dr9bF9V*sAzj7vysGjA=1+q&IDs#<-tIN~6< zG}dIpI!3$Mf)0+`C_dt79|Ld{xBMU&(Cn~d>J3_$u4Jz}81%-osH^+R{wM^B&~dH$ zxJ^j-_+Ww5`!wD!$0o0kDNYeIyHPqUMn+vpPqe9j-uI(^$j^zv9NSLZCS8q>&dH2} zF6k{6o{7;%0%f}@E#WfL!%{xwvDI=yuNWLh{;!*B?NL?9qTlCNm^+!|oXhPaD5#v1 zNe1u*DEL4do!k#7h$xDRsF>XO?L+YpC`-G0PT$F7(lM>no7%N&?_Fz^R5h&QsJ>F< zYjvrAUU7n-zs}`JTlPe*(`4G$OOKtEd)s2YC#yEI-IZj1U@ix>BBu5@pXJ@5V;^Tq z3-cPHzc_PcntrgIx?69tuf?aiP#u4*kye;A9&$#Qa% zL*^r|rF(uv8gP37sUXyr4aDNvsviUZ(<;D$M^r;vD2gM#BkKIeU%qV|-8dVw!fmt2 zMapj{79g8D*A99CGE5NJA#AXr$B1SPeNyoW+YuWreRkYhw7~;04PAjaOzatd0$XJT z%;CUZnFY2+)w~kbMPQT6{N@VeTjDLSeep_tUkR60JziE=aZ#m6ODB%(3k;qRW!wGdnhW3y&SH4jr@4utwFm3|I!oJIqL|;GD{oJc4KU zmU1Zf8Pn3;n#JRNlWQ^ldE<6}xw(0eN{pbKNp-O6v(we7WixcI&PbHXP<;`fut7Ot zR8dM}ZQo!Xi)b9r{;xUk&Hr^v0QKRElT%R%MJM)Xu>RsiSbd4Xq!!(MExT-QSE2(G zf_+D>twbNRm@nUNP<#pfy|Y$$i- z^PE>}dup&B6WulysAinIO0F<*w)(2IrTIYg*ZtPS65Y;db``5z#vHo4NmsJCQm48t zw$7(Ep<{>Yq`4=ki%6QsahW{!1-7->3lmW%rRAXKGc8}(5$xH2ZcNwJokNba^AN31<~&_jI#=g=t=Z%I3wn0Uc|Cg?27WJw^0YOSRnDXQxAM=g8L5*3SIvolfIlI9$*3}t04ahLkr z%QQN6${)*Qk3=8PDWU^O7@_)@Du67AJAtFmV z06?Q|1s(iybfSs;t?<{`LaUaI0{%DXdvvsy`wjpcU$d4%cuX4}*k(ZtDDqFn9)ZY0 z2+&(-BE+(nj-o(P_{J?5!M5;XZL_Dq+HMz&4qyq=IznJ4D&ZM*M-OB^2X-na*oQFb zq}d;X+GGxY?r%86SY&cUHzSe~7=@V;i3}P!l#B$f9199MIgiK6pPZv!4Gh^!4(pBc z%fSHB3)ztma0EFsGBW@$BjNY^&O=Gajz5~vKcUwl`0AekQvLU^SHI`Gc+g^05Urbbid7NqZc5Om-GY8V>T>jZ2ro1N8?QTisMPffi)llBL8 zgbZe72?!r%C?vD`+3boZ^}dU$5X)Lf3w=M2y98s#L$(Y=nu~Ul2Z$du-~)w{&vh~- z464{)J|X;y0c1#GE0?w-x~svX8JBf`xXp=9-=4-2~=Ez zc#`-g2s~eN0#UkqmevE^JdvxmTmpY^f4?QrAjHE5{mTd!v?Aut&d=fqvp_k-I|T#u zcD4h+-znQTTQuR@#@XDXc8meJs5>_D7acr*T~HA4o6G`6?=M?OiRSOZoqzZSfcF9q z?^XcZyKe{Qj4;1%bn1NW6e^8Y3Ace++mKUmy9@+k&)&HiV0uHSICAc52!2S3e#fLG zYSwdu)$1B|@O~kS^FfM>PCz_Fy`U6akJfw$73&1^XC3``zHXir_2XW8@|MC22|00p z(Tf29b-?lnGOwTXB-NN1-w=*OLV?OBu);fMf=WmQ4)M01f0hwG}-V z-@_^l{e!iodB1CmV{8`QmfSDD{CN0Y@2`^hK*utT!BlcoMaY5?_BviS;nY_0e1Q_| z`Xeb5$^1PqNgzd%%Kak`{KkRJl*|}^?+eQ|et)O7{_rJ92`%Y)>)*eFfAJ!Bf<6EL znEMdhPM=AB_~^X+CzFxkRUj15J46)`b;5t5>$`(v2A-??mO^<$GT?{<9G9V<6Mph; zWfFRdET(KPQ|BXj@{;&9sL0hvv^_!HjITFZJZZM~5Tu@(i-`KeP496-U{Ak)8`nqM zKm;GHoaaZ>knv2A>mgaH29=2NS&*K;?H6|yLj?itJ(A$e`o>8}M&jQO?6P+>6ZbFE zND}RZem*q)ay+YOnL&36{UZ^Nwc#%g;NrBxBCzoJ=p_dE4^Ci4XHBHSA7KL6=CTO{ zNC@itta>(vZfPJ+5ZKfOZL1f5zQEUQeFasgcb*mUcSM2eGa;hf(#@v(3$rBg zIJkH=8Wmb*AafiLy=w?TZ+cu?EonMoY~{1&hL~JFmku|&X70{i0?DvD7qt=JlXtg~ z-czT*K+-rrx>K=>51%FkMT@`2w-siF19B#6w*nS^R#ilOnFFO53=Q04`4qdWxvqwF z+@E!PNPr3uBP^7Qj2=m26S2{e;c4BT-1WRlg&PDA@$>?xZ@FqS%bLcMin61NYX^0t qcRdFFi4z7_zEM$$Q0rz42Y0U7#+M-ZYg9Pcg#HcXSUMm$Qvd(}J;a>= delta 6272 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 ", config.station.title); } break; case VOLUME: sprintf (buf, "{\"vol\": %d}", config.store.volume); break; case NRSSI: sprintf (buf, "{\"rssi\": %d}", rssi); rssi = 255; break; + case SDPOS: sprintf (buf, "{\"sdpos\": %d,\"sdend\": %d,\"sdtpos\": %d,\"sdtend\": %d}", player.getFilePos(), player.getFileSize(), 0, 0); break; case BITRATE: sprintf (buf, "{\"bitrate\": %d}", config.station.bitrate); break; case MODE: sprintf (buf, "{\"mode\": \"%s\"}", player.mode == PLAYING ? "playing" : "stopped"); break; case EQUALIZER: sprintf (buf, "{\"bass\": %d, \"middle\": %d, \"trebble\": %d}", config.store.bass, config.store.middle, config.store.trebble); break; @@ -603,6 +611,13 @@ void NetServer::requestOnChange(requestType_e request, uint8_t clientId) { String processor(const String& var) { // %Templates% if (var == "VERSION") return YOVERSION; + if (var == "MODE") { + if(config.store.play_mode==PM_SDCARD) { + return "modescard"; + }else{ + return "modeweb"; + } + } return String(); } diff --git a/yoRadio/src/core/netserver.h b/yoRadio/src/core/netserver.h index 171c212..940fae3 100644 --- a/yoRadio/src/core/netserver.h +++ b/yoRadio/src/core/netserver.h @@ -5,7 +5,7 @@ #include "ESPAsyncWebServer.h" #include "AsyncUDP.h" -enum requestType_e : uint8_t { PLAYLIST=1, STATION=2, ITEM=3, TITLE=4, VOLUME=5, NRSSI=6, BITRATE=7, MODE=8, EQUALIZER=9, BALANCE=10, PLAYLISTSAVED=11, GETMODE=12, GETINDEX=13, GETACTIVE=14, GETSYSTEM=15, GETSCREEN=16, GETTIMEZONE=17, GETWEATHER=18, GETCONTROLS=19, DSPON=20 }; +enum requestType_e : uint8_t { PLAYLIST=1, STATION=2, ITEM=3, TITLE=4, VOLUME=5, NRSSI=6, BITRATE=7, MODE=8, EQUALIZER=9, BALANCE=10, PLAYLISTSAVED=11, GETMODE=12, GETINDEX=13, GETACTIVE=14, GETSYSTEM=15, GETSCREEN=16, GETTIMEZONE=17, GETWEATHER=18, GETCONTROLS=19, DSPON=20, SDPOS=21 }; enum import_e : uint8_t { IMDONE=0, IMPL=1, IMWIFI=2 }; class NetServer { diff --git a/yoRadio/src/core/network.cpp b/yoRadio/src/core/network.cpp index 59c7e07..c5cb115 100644 --- a/yoRadio/src/core/network.cpp +++ b/yoRadio/src/core/network.cpp @@ -5,6 +5,7 @@ #include "config.h" #include "telnet.h" #include "netserver.h" +#include "player.h" Network network; @@ -39,7 +40,7 @@ void ticks() { mktime(&network.timeinfo); display.putRequest(CLOCK); } - + if(player.isRunning() && config.store.play_mode==PM_SDCARD) netserver.requestOnChange(SDPOS, 0); if(divrssi) { int rs = WiFi.RSSI(); netserver.setRSSI(rs); diff --git a/yoRadio/src/core/options.h b/yoRadio/src/core/options.h index 088b09e..5b103b0 100644 --- a/yoRadio/src/core/options.h +++ b/yoRadio/src/core/options.h @@ -1,7 +1,7 @@ #ifndef options_h #define options_h -#define YOVERSION "0.8.813" +#define YOVERSION "0.8.816" /******************************************************* DO NOT EDIT THIS FILE. diff --git a/yoRadio/src/core/player.cpp b/yoRadio/src/core/player.cpp index 54cde3d..6587655 100644 --- a/yoRadio/src/core/player.cpp +++ b/yoRadio/src/core/player.cpp @@ -124,7 +124,7 @@ void Player::setOutputPins(bool isPlaying) { if(MUTE_PIN!=255) digitalWrite(MUTE_PIN, isPlaying?!MUTE_VAL:MUTE_VAL); } -void Player::play(uint16_t stationId) { +void Player::play(uint16_t stationId, uint32_t filePos) { display.putRequest(PSTOP); setDefaults(); setOutputPins(false); @@ -136,7 +136,7 @@ void Player::play(uint16_t stationId) { display.putRequest(NEWSTATION); netserver.requestOnChange(STATION, 0); telnet.printf("##CLI.NAMESET#: %d %s\n", config.store.lastStation, config.station.name); - if (config.store.play_mode==PM_WEB?connecttohost(config.station.url):connecttoFS(SD,config.station.url)) { + if (config.store.play_mode==PM_WEB?connecttohost(config.station.url):connecttoFS(SD,config.station.url,filePos)) { mode = PLAYING; config.setTitle(""); netserver.requestOnChange(TITLE, 0); diff --git a/yoRadio/src/core/player.h b/yoRadio/src/core/player.h index 9df7dd0..d82e9c2 100644 --- a/yoRadio/src/core/player.h +++ b/yoRadio/src/core/player.h @@ -30,7 +30,7 @@ class Player: public Audio { Player(); void init(); void loop(); - void play(uint16_t stationId); + void play(uint16_t stationId, uint32_t filePos=0); void stop(const char *nttl = NULL); void prev(); void next();