From 9b103b92641946baadf7a7de07c7c2d612d8e860 Mon Sep 17 00:00:00 2001 From: Marten Richter Date: Sat, 18 Oct 2014 12:44:16 +0200 Subject: [PATCH] Add channel status icons --- GNUmakefile | 10 +++- other/dolbyoff.png | Bin 0 -> 1022 bytes other/dolbyon.png | Bin 0 -> 1014 bytes other/hd1080i.png | Bin 0 -> 1553 bytes other/hd720p.png | Bin 0 -> 1560 bytes other/sd576i.png | Bin 0 -> 1581 bytes other/txtoff.png | Bin 0 -> 423 bytes other/txton.png | Bin 0 -> 428 bytes staticartwork.h | 23 ++++++--- vvideolivetv.cc | 126 ++++++++++++++++++++++++++++++++++++++------- vvideolivetv.h | 8 ++- 11 files changed, 137 insertions(+), 30 deletions(-) create mode 100644 other/dolbyoff.png create mode 100644 other/dolbyon.png create mode 100644 other/hd1080i.png create mode 100644 other/hd720p.png create mode 100644 other/sd576i.png create mode 100644 other/txtoff.png create mode 100644 other/txton.png diff --git a/GNUmakefile b/GNUmakefile index 8e1bc46..3b11831 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -46,6 +46,7 @@ include objects.mk OBJECTSWIN = threadwin.o remotewin.o ledwin.o mtdwin.o videowin.o audiowin.o osdwin.o surfacewin.o OBJECTS = $(OBJECTS1) +# Pictures for linux builds PICTURES = -Wl,--format=binary PICTURES += -Wl,other/vdrhires.png PICTURES += -Wl,other/wallpaper720p.jpg @@ -54,7 +55,14 @@ PICTURES += -Wl,other/radio.png PICTURES += -Wl,other/timers.png PICTURES += -Wl,other/tv.png PICTURES += -Wl,other/recordings.png -PICTURES += -Wl,other/restart.png +PICTURES += -Wl,other/restart.png +PICTURES += -Wl,other/hd1080i.png +PICTURES += -Wl,other/hd720p.png +PICTURES += -Wl,other/sd576i.png +PICTURES += -Wl,other/txtoff.png +PICTURES += -Wl,other/txton.png +PICTURES += -Wl,other/dolbyoff.png +PICTURES += -Wl,other/dolbyon.png PICTURES += -Wl,--format=default diff --git a/other/dolbyoff.png b/other/dolbyoff.png new file mode 100644 index 0000000000000000000000000000000000000000..907d2b314f98bf7e772ce26d1911bfeddc3deb12 GIT binary patch literal 1022 zcmV4AtdV!n)d(z1B*#S zK~#9!?V8DJ6hRb+zge>A#JEI6#RYd!1P=i>MD(DjCqeM|4j%RD$%`P0Cr=(k5q$m) zo&-I(fJ#7bYQ(r9ae_-U8YiQ1Jk$${lIfo5Y7^V~ps7iyd0q9ZSFfwz8wdmffk5ED zB_|>WfKFhEwO>8jp9(w%t^u2Xb-)Pl-IM)RpdWals+XEEPy`kMvw_vXEYAXzti2B` z2i5}>j{>v-Gk`*~28y;Si-9#Jgl`JKZD1p?AqD&MfsSUsoCiJugFrQ7hCOBz%*Ys zE7lprRp69OzSaJhw~2QFD=o5j12a90Wx!&^T@(JDZJjXzD%PF`Hm5BBz<{dWtM_FQ zS!#nhWI?Xk6~6+U1A0{TWyC$-`*gQ@0+d9gpsJ(ebx_qlpie}4faAdaCIaLI;H0WP zkLoNUC7|7>0QnffD-u?1e17Hv$72C54VO6qI&eA0D5e1GM5HBa0;~eI#_YQtSeO|BY&G}b zGDUG%5A4p82kZb25Cgov!2C;{rF#H#huVIneC zmDvj%!Bv(TB?s&TE{e!W;3n`vRjYMQncx1F03{JwW_?$u&PlFbV_)}7{-@rsSPq`fv1AMnqMdI2$utVfcyQyu*Y0LJMawX zO(MXceJ~}FasU7T07*qoM6N<$f-{G>a{vGU literal 0 HcmV?d00001 diff --git a/other/dolbyon.png b/other/dolbyon.png new file mode 100644 index 0000000000000000000000000000000000000000..2d4971fc859341d1fb91dedf991af6a23480c03b GIT binary patch literal 1014 zcmV4BpO#6a~S{t1A|FK zK~#9!?V8DJ6hRb+zc;%k#%SDe!CjPqhlm;x(SxF%1i_;RkNO{Y5k&Fi$%80@_&0b8 z=)nb40(w&;#tn%hE-}$K8BLyte!-w*x@Wpt$F@FbIx|#WSN*E$b=9v1JRXn70n6?F&0+lMz!Ts)uodV8MuBlh@e9BJ@KQvsG!h^OECuEO>wwvg1!%GR17H=f z5vVv6pa`@B*+v88tXGx+>rDvPWPv-t7GQG%@fQKDjs9~6_zVmJ)r6+mnDzRXgyL6$ z;Wz?_T}h$8+!M)Vai+jjya%3IA}iXw&D!Ugc27dMaT_f|z=#Paz*p<-wZIHl56ji4 z#5LfIHNIfqWvt;Hz#7Z!UBD~{b$M&K;+_fr!KTiH02RBR1-g?K0N|~N+^;#dRaaPL zj#`pyw8wjZ3qY@kyb5{dN0-B`mH;iPniY|;DJPytKhUqLy}(J}U;_#A5^!2XUW6tS z)fS-SQh-c^>Xhfg5!`|0-}IO5>9v<17t}^a1DVc-@tOb0RYEH= zfxT%O0lR=BME41cz%f}GyV~uR(r!7A53Tv|!U(R7&I)DSfe%nnB*`{i;0F^qDY-9nH z-w!JVm}i$OpCIbyr(j}q)De3;P7Wy9$}OoyN!~L4w1nap;>6AoxVXav2c$*ENv1Su zD1Rb2h^;yncaRtduQ}kERZ=YRRB(6Z*9JT$@BkkY{Qh9Xp%+jBo&$Yx1Q@ix%hvc& zhdnezaOO8c-~+z4XN)-%piB&ZF=xXvYeBv{9-002M;1^@s6or`?000006VoOIv0RI60 z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-U<>4BOu;ZJZt~}1)fPn zK~#9!?VT}f97Pm{|7Y2j;vk`O<0eS4g#@-lle0viHigrHaA$|k76n21+21n>cXQ4o^OF91FgkXN8!Gu_IDJ2FZq%bHz zLIDyAkdXcopsH3iOeJBQnZOvwIqbG$S5<4OI>Xyu9tOMUI}teE5RqoWIH4kVBe8vq zooXiHLjcPnvQ7!~?-Cpm!lBVPjYQ$6{&*g!>K#hp{0XpO#QO=$yw!^{vWO^;Y zyt58zD`4{et&URc{&Ct9$3_Rszfu z0~VElOc=$TdHZyVFBe4Q*cDwww>{@`1;DuT@Atg6-#VY4Pq?&e2KGvo1&5ZqYNCt2 zW0V1Jp+scft`6YEh~}>M9`nwPdm{ec`TVAvbO3nGIXC6~2<8p!^@RYfFfG9ZsPss9 zvjF}Aa67Ww-w7subUxp9ms1h>+NqN4JL3Do$liq#;Gt2;=1c{c32&o|{#O&*Z}{1^ z8{cK(n>VyqyZ}4wfLM@c2c(hs9V*80WKq13)%#k-qbec`=v>I|F9E`SAGU}DWG09G zvmj;3yCEV!2kLfL93kFE>tghoEwR=D3@wA}k^q490uzv`Q5J7Or%d^uz>>M+i0=x3 zHRs$<*%ExhvVpzQ3$W4SaV!&%#S&%HZr$*ackamDDg*GcPS1BtTa@O`Lv!;8U;dwZIsAzK}dmHfC(kynGNAC#2tZKt5~Z{ptn9;PYP6u%Cs= z6W%iWme=ncFYDcOLTooV83J(6z+Neq;G!PE>N)|*p3<3X^8;EfFcJLH^*$}GebP%Z z0N`$@2I%xVsRfQ3*ekUFi%LM6k>Y!R_D?)76;`%?M|nfT-#K z>>qq+0$Ac35&F*q7LkAq8hXHH7VnKxeCNvp_HqYg7~Q=EVKp1K5t}5D0+N-oz9U*y z$3)~&39f@#a1XQKQobKBi~k0B8yN!@d0mfrdnmx7cn07P-X10)Ma2)#cx&hZ3CYXT z6agM{zKAhmpf38(T{sizkfKLGY&iNxb z`4#`|v)|-Y5JCtcgb+dqA%qY@2qA&Xi00000NkvXXu0mjf DZ27~` literal 0 HcmV?d00001 diff --git a/other/hd720p.png b/other/hd720p.png new file mode 100644 index 0000000000000000000000000000000000000000..1ea5d3eb5e9499df61c367aff00ccb3219f0bb39 GIT binary patch literal 1560 zcmV+z2Iu*SP)002M;1^@s6or`?000006VoOIv0RI60 z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-U<>4BRI`Eq&ffq1*J(u zK~#9!?VY`fuA+nlbiTk4WpAG7=aWjmwpmP&usM|ZD=iHJnxGa~w)h`uAD zmjr;GKZ)oEX8uLfh(+W%5&cF)8Egn5@P?URhaP-EL_b1&AR^z0$k!SV_*XsbGBd-5 z9}p3N71aFB%wL8I@FN35fDm8=-ZAs%p&=N6*gV(dfB;Me1PCBN009DUUIG-6O#CE@ zesWJArw-#bu@jL}L~`8r`S7eq+tl;;R=uNb%D28igU<-Fhp&&&hHDnPX1w^QE9%u8l|MMU?$^AM3mWZO1A6pn|) zwGVSkL|4{vSLX9JmPGVLhj!y)&s7Arx%EtStdwJ~JpJ4%$GugIx%2d~39*j?tt|@8 zH8t4cU?PRq=202i1I8*qwEg4}D(|JQZ_WH=0DWw+X6Bm~ukK1KDk8dcr7tzE&2eY# z0Z$&`=ZbNYh6gB9j++fN?m!M=XXm!owPn`%Zd_i~Osv-_JzjDX=sidGfNB9oTmdN} zt$>_5Jah+7UyBh0coLDc)_-b=Z`UH0qV`>V73t6-&Z5EgN$tBkBlz61{c0{Dc&Y*< zjSznOw28$HGuOvoS(SZaM3*b)J?#RkwEj-4Q0=>KYi7P==4~z9@0t0kA${pgm!&vg zxXU8#9@bXC^Q-LqteN?~?%f>Ml^XGs4s#x@<-^P+K;!KaM}FA)FxG|V$~#Szh?Xl~ zL=@oA$$PA&KZw7Q--bO#qt(AB|dwboO4x67xETQ`{)FC9JunH zN`Ol%^lB%+KdNp`!I64wP&no!_nvgdw)d*mKB0#-^CZBN4qpZL*a{V#ppQ_1G*!X* zKt;&OO7sh5+uS;*yrIBI0;=viPXUs*%?^mjB4!by%>mPay~G#=NFH(SE|hyKM23dm z%HjDk(&fwmb0Z3xa9l55Sf(|W=JB#TtVs{~m0GJ$E#(IdW1OM&4^ zFVqMN7Dr1!MT5N?#XCq8ROWzZ zy8;rBzvLnI=|B;9?e&~5Q|8`HIoiS+|KvJ1^Sx`bIc;b^-b%>1uYj}|?+|LAp2bHQ z&}Lzcp9b9Y(z?!_YeR!$RV8tZwW)1t$XnWvD!?LST{B?3Qn?!?*0`(Cn;ubs_S)^H z<@im<>p27*pY?ozRWl$%D~M?4 z$XR{u$1Ot6sQ@uyyVT@P1BKu@Qw+Jl5OpGYhW`UX=4tKo>@AsjNlzE8cb;@2dTv{= z`m$`>as0@stot_A=8WK_xX}v`5n+nI@u4E3YrGNRlU#H59&m~R<{*;H#cz z`;KT4dBM#8%-}pAzySp~%l8AC{15Lgd;-k%CNmNJhuZ@IPUZxO=wIBP$Ir7lo)j}9 z?}7&epfm3@0zAQ9ATobwLhu_R`nFbqBK(2A{2ZKaiO35g`jzmDnII0jpKCRfy<2pXmLAsGU&9mt000000000000000000000002sY4RS?YRw literal 0 HcmV?d00001 diff --git a/other/sd576i.png b/other/sd576i.png new file mode 100644 index 0000000000000000000000000000000000000000..ddedc197355b289f2e0f894e1a7e120f5ba52166 GIT binary patch literal 1581 zcmV+|2GaS7P)002M;1^@s6or`?000006VoOIv0RI60 z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-U<>4A~~ZbrR@L!1-eN@ zK~#9!?VZ1h>qZpDzjL_+Zn%x^BRG$s3xU+$H;A`OO5ZXN2-+@90@^0M4XJMDeFVD* zqziVH+U^2rA`=K)lIEn?F;NC+U5II%dRyVAANKF&DbjdpsF7M_y)k&0N#L* zczy%$t%&>>bCIa(D*!(O$Z128fcGNurS-)x0DMRBk%WAqs-MSrz(49?S44z1{0~)C zS|OTWMC4Pe0RLxT3XlR!zy}fe*cyTfNzJR69FUN!K>-p9kWhexT!oj3E5-sq2B2to z$vuE0fTf5WBgV}EY&%S82jBs~PDD0*+#^IiI*zf>cvh-9F^)gi{_ItC*4IA7#vmbB zRVS*t2Qcq&`3!(n6q5vNZ31AWswLgdGspo|H3P6tAdZzmgwurYxu6K2M-fsc@=O4* zXbH!Y#P7T45{}781n9)l6m}l~+=>T)cL16SfyTnc6(HG}KOH3ifIC-&gccBaibaU3 z77e*)+2h(OvH;l{=Nc-I=CSrkKptVEDmE<&6kw(I+Nr9p+n%Evv$|9f(p7+quEurO z@2%IXYS~rnwK290W2^@jU}c=|>eMNS6yWS!x50R?IsVR#bK>Y^4&>;cOQ%&+R>ZCgT9>o|!$U}5m= zR-JlGGo}E4=BLQkQSIidA)1k`mt5$ zeR=ubHsWvFF$yp<%%QaIbVTMf<^m*O$uAXV2(@VK07K``WS|0uxFSieb{Uim*)f&+vaukvK z+TL$lBXttklTBHGG>x^3IT(9EvWB0}Ht(I+wx%IdZ_H3(u`_G{B;{f|AtJIAk+-hG z3kh-7;Dz!8J0K_KSFEOY0B&j(=%MAopA*PNL=J}cV_AH=fcQ5C`#%i<)`YlmLc9;G z{yfHOMTXybz^e=)z@ztZ0Du1e#}lS4-Y>)BVcuX)9$2uOhHbxtH;>5>0!*3%rm93! z6(B7qIrd%b({a}#YuGYdoGBLCuD9gabI%6rh9YAcC_t(qazK*+t%-4}zFw*Vq@|58 zA4q^|>3=$*?AuPW7<;eV4)-fM?wnk;2#Iym*09>U0C5JL1&WX5fJH_bYWKL1+4S*- zofm#B#X%l&4sM*4cfY~&zZehL`7}vwjD%XIaODr!G4n?%@=M+@?bx%?Fl@7cH0!zb~6`FT0+E}{#CHpcW=75*Y0Z02C(W?4dME)AVJSf016d?mYbOFD+kU8Kr z7Z8Ad_;@J5t2sdcfAjG?e_oDpQX;~!2g&@(h&FWT3xgEGXUQM_>=Y{9r+!=yBP5iLI@#*5JCtcgb+dqA%qY@ f2qAV`{GbhAS?(QHs()x3w&9aR)6@j*h^03jB2-S~l^D(Zo^ZP5XMEbezhY*x z4(EPKc{~mkW;Sp+^7)Sb3$?@HnhBjP`yM@LDgqT9Hno5B)TZwS4?6VSl4<`9G}u!SqSb?u?F1}2dO4Z^iz7GG{hY~}ROecy29 zmY_r#+xo&EjjZ|GzD?#|?$thDcfoDWJuc1lGXw-dV4~Pfh9&!wR(;)Iumu>T44$rj JF6*2UngGlwseJ$d literal 0 HcmV?d00001 diff --git a/other/txton.png b/other/txton.png new file mode 100644 index 0000000000000000000000000000000000000000..4e692f83c4bd231893565d7662e848fcf2e40244 GIT binary patch literal 428 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPqmk_6-z^R>iP7Dl;mYyz-Ar-gY&UW-V;vnD}?^$4N z{((X6z|;v9?C%vS)WkP`l==2Ra!M2ivgDm6x1Lq}ep1X@O3V!6ZVTc#)u4k9?-&#@rrPMHqcg @@ -152,6 +154,7 @@ VVideoLiveTV::VVideoLiveTV(ChannelList* tchanList, ULONG initialChannelNumber, V add(&osd); int channellogomove=0; + int boxdiff=166; if (osdv) { osdChannelLogo.setBackgroundColour(DrawStyle::OSDBACKGROUND); osdChannelLogo.setPosition(30,5); @@ -159,8 +162,10 @@ VVideoLiveTV::VVideoLiveTV(ChannelList* tchanList, ULONG initialChannelNumber, V osdChannelLogo.setTVMedia(info, WTVMedia::ZoomVertical); osd.add(&osdChannelLogo); channellogomove=30-5; + boxdiff=145; } + clock.setBackgroundColour(DrawStyle::OSDBACKGROUND); clock.setPosition(osd.getWidth() - 100, 4); clock.setSize(90, 30); @@ -177,22 +182,22 @@ VVideoLiveTV::VVideoLiveTV(ChannelList* tchanList, ULONG initialChannelNumber, V osd.add(&osdChanName); boxRed.setBackgroundColour(DrawStyle::RED); - boxRed.setPosition(54, 104); + boxRed.setPosition(54+0*boxdiff, 104); boxRed.setSize(18, 16); osd.add(&boxRed); boxGreen.setBackgroundColour(DrawStyle::GREEN); - boxGreen.setPosition(220, 104); + boxGreen.setPosition(54+1*boxdiff, 104); boxGreen.setSize(18, 16); osd.add(&boxGreen); boxYellow.setBackgroundColour(DrawStyle::YELLOW); - boxYellow.setPosition(390, 104); + boxYellow.setPosition(54+2*boxdiff, 104); boxYellow.setSize(18, 16); osd.add(&boxYellow); boxBlue.setBackgroundColour(DrawStyle::BLUE); - boxBlue.setPosition(560, 104); + boxBlue.setPosition(54+3*boxdiff, 104); boxBlue.setSize(18, 16); osd.add(&boxBlue); @@ -229,21 +234,50 @@ VVideoLiveTV::VVideoLiveTV(ChannelList* tchanList, ULONG initialChannelNumber, V osd.add(&sl); - sAspectRatio.setPosition(osd.getWidth() - 90, 40); - sAspectRatio.nextColour = DrawStyle::LIVETVSYMBOLS; - sAspectRatio.setVisible(false); - osd.add(&sAspectRatio); - + bufferBar.setPosition(osd.getWidth() - 90, 70); bufferBar.setSize(40, 20); bufferBar.setVisible(true); osd.add(&bufferBar); + + if (!osdv) { + sAspectRatio.setPosition(osd.getWidth() - 90, 40); + sAspectRatio.nextColour = DrawStyle::LIVETVSYMBOLS; + sAspectRatio.setVisible(false); + osd.add(&sAspectRatio); - sAudioChannels.setPosition(osd.getWidth() - 130, 40); - sAudioChannels.nextColour = DrawStyle::LIVETVSYMBOLS; - sAudioChannels.setVisible(false); - osd.add(&sAudioChannels); + sAudioChannels.setPosition(osd.getWidth() - 130, 40); + sAudioChannels.nextColour = DrawStyle::LIVETVSYMBOLS; + sAudioChannels.setVisible(false); + osd.add(&sAudioChannels); + } + if (osdv) { + TVMediaInfo ninfo; + ninfo.setStaticArtwork(sa_txtoff); + txtlogo.setPosition(54+4*boxdiff,104); + txtlogo.setSize(22,20); + txtlogo.setTVMedia(ninfo, WTVMedia::ZoomVertical); + osd.add(&txtlogo); + + ninfo.setStaticArtwork(sa_dolbyoff); + dolbylogo.setPosition(54+4*boxdiff+15,104); + dolbylogo.setSize(22,20); + dolbylogo.setTVMedia(ninfo, WTVMedia::ZoomVertical); + osd.add(&dolbylogo); + + ninfo.setStaticArtwork(sa_sd576i); + reslogo.setPosition(54+4*boxdiff+30,104); + reslogo.setSize(22,20); + reslogo.setTVMedia(ninfo, WTVMedia::ZoomVertical); + osd.add(&reslogo); + + reslogo.setVisible(false); + dolbylogo.setVisible(false); + txtlogo.setVisible(false); + } + + textUnavailable.setBackgroundColour(DrawStyle::OSDBACKGROUND); textUnavailable.setPosition(60, 30); textUnavailable.setSize(osd.getWidth() - 120, 30); @@ -258,6 +292,7 @@ VVideoLiveTV::VVideoLiveTV(ChannelList* tchanList, ULONG initialChannelNumber, V vdisplay.y=0; vdisplay.width=0; vdisplay.height=0; + } void VVideoLiveTV::preDelete() @@ -946,17 +981,26 @@ bool VVideoLiveTV::channelChange(UCHAR changeType, UINT newData) Log::getInstance()->log("VVideoLiveTV", Log::DEBUG, "Done Set player to channel %u", currentChannelIndex); // Blank out the symbols - sAspectRatio.setVisible(false); + OsdVector *osdv=dynamic_cast(Osd::getInstance()); + bufferBar.setPercent(0); - sAudioChannels.setVisible(false); + if (!osdv) { + sAudioChannels.setVisible(false); + sAspectRatio.setVisible(false); + } else { + reslogo.setVisible(false); + dolbylogo.setVisible(false); + txtlogo.setVisible(false); + } + // Remove other stuff if (textUnavailable.getVisible()) { textUnavailable.setVisible(false); } - OsdVector *osdv=dynamic_cast(Osd::getInstance()); + if (osdv) { TVMediaInfo info; Channel* currentChannel = (*chanList)[currentChannelIndex]; @@ -1154,6 +1198,7 @@ void VVideoLiveTV::processMessage(Message* m) void VVideoLiveTV::doAudioChannelSymbol() { + OsdVector *osdv=dynamic_cast(Osd::getInstance()); // get the doobery Channel* currentChannel = (*chanList)[osdChannelIndex]; @@ -1164,10 +1209,51 @@ void VVideoLiveTV::doAudioChannelSymbol() if (currentChannel->numAPids > 1) multiAudio = true; // draw the doobery - - if (multiAudio) sAudioChannels.nextSymbol = WSymbol::MULTIAUDIO; - else sAudioChannels.nextSymbol = WSymbol::SINGLEAUDIO; - sAudioChannels.setVisible(true); + if (!osdv) { + if (multiAudio) sAudioChannels.nextSymbol = WSymbol::MULTIAUDIO; + else sAudioChannels.nextSymbol = WSymbol::SINGLEAUDIO; + sAudioChannels.setVisible(true); + } + if (osdv) + { + dolbylogo.setVisible(true); + txtlogo.setVisible(true); + TVMediaInfo info; + if (currentChannel->tpid!=0) info.setStaticArtwork(sa_txton); + else info.setStaticArtwork(sa_txtoff); + txtlogo.setTVMedia(info, WTVMedia::ZoomVertical); + + + if (Audio::getInstance()->supportsAc3() && currentChannel->numDPids>1) + info.setStaticArtwork(sa_dolbyon); + else info.setStaticArtwork(sa_dolbyoff); + dolbylogo.setTVMedia(info, WTVMedia::ZoomVertical); + + Demuxer* demux=Demuxer::getInstance(); + if (demux) { + int vertical_size=demux->getVerticalSize(); + Log::getInstance()->log("VVideoRec", Log::DEBUG, "TVMedia vertical size %d", vertical_size); + reslogo.setVisible(true); + switch (vertical_size) { + case 576: + info.setStaticArtwork(sa_sd576i); + reslogo.setTVMedia(info, WTVMedia::ZoomVertical);break; + case 720: + info.setStaticArtwork(sa_hd720p); + reslogo.setTVMedia(info, WTVMedia::ZoomVertical);break; + case 1080: + info.setStaticArtwork(sa_hd1080i); + reslogo.setTVMedia(info, WTVMedia::ZoomVertical);break; + default: // we assume sd + reslogo.setVisible(false); + }; + + } else { + reslogo.setVisible(false); + } + + + } if (osd.getVisible()) { diff --git a/vvideolivetv.h b/vvideolivetv.h index 3639cd4..bdf4b39 100644 --- a/vvideolivetv.h +++ b/vvideolivetv.h @@ -144,14 +144,20 @@ class VVideoLiveTV : public Boxx, public TimerReceiver, public OSDReceiver WTextbox textGreen; WTextbox textYellow; WTextbox textBlue; - WSymbol sAspectRatio; WProgressBar bufferBar; + WSymbol sAspectRatio; WSymbol sAudioChannels; + + WTextbox textUnavailable; WTVMedia osdposterbanner; WTVMedia radioChannelLogo; WTVMedia osdChannelLogo; + WTVMedia txtlogo; + WTVMedia dolbylogo; + WTVMedia reslogo; + -- 2.39.5