From 298bd2a4762ddf104a647be693bc6ce86e17e835 Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 15 Sep 2016 19:32:49 +0300 Subject: [PATCH] New player icons and sources created. --- Telegram/Resources/icons/player_next.png | Bin 0 -> 188 bytes Telegram/Resources/icons/player_next@2x.png | Bin 0 -> 297 bytes Telegram/Resources/icons/player_pause.png | Bin 0 -> 118 bytes Telegram/Resources/icons/player_pause@2x.png | Bin 0 -> 156 bytes Telegram/Resources/icons/player_play.png | Bin 0 -> 14676 bytes Telegram/Resources/icons/player_play@2x.png | Bin 0 -> 14817 bytes Telegram/Resources/icons/player_previous.png | Bin 0 -> 182 bytes .../Resources/icons/player_previous@2x.png | Bin 0 -> 292 bytes Telegram/Resources/icons/player_repeat.png | Bin 0 -> 211 bytes Telegram/Resources/icons/player_repeat@2x.png | Bin 0 -> 235 bytes Telegram/Resources/icons/player_volume0.png | Bin 0 -> 129 bytes .../Resources/icons/player_volume0@2x.png | Bin 0 -> 167 bytes Telegram/Resources/icons/player_volume1.png | Bin 0 -> 139 bytes .../Resources/icons/player_volume1@2x.png | Bin 0 -> 217 bytes Telegram/Resources/icons/player_volume2.png | Bin 0 -> 154 bytes .../Resources/icons/player_volume2@2x.png | Bin 0 -> 226 bytes Telegram/Resources/icons/player_volume3.png | Bin 0 -> 157 bytes .../Resources/icons/player_volume3@2x.png | Bin 0 -> 242 bytes Telegram/Resources/icons/playlist_cancel.png | Bin 0 -> 216 bytes .../Resources/icons/playlist_cancel@2x.png | Bin 0 -> 330 bytes .../Resources/icons/playlist_download.png | Bin 0 -> 135 bytes .../Resources/icons/playlist_download@2x.png | Bin 0 -> 177 bytes Telegram/Resources/icons/playlist_pause.png | Bin 0 -> 117 bytes .../Resources/icons/playlist_pause@2x.png | Bin 0 -> 230 bytes Telegram/Resources/icons/playlist_play.png | Bin 0 -> 265 bytes Telegram/Resources/icons/playlist_play@2x.png | Bin 0 -> 352 bytes Telegram/Resources/icons/title_pause.png | Bin 0 -> 88 bytes Telegram/Resources/icons/title_pause@2x.png | Bin 0 -> 99 bytes Telegram/Resources/icons/title_play.png | Bin 0 -> 168 bytes Telegram/Resources/icons/title_play@2x.png | Bin 0 -> 274 bytes .../media/player/media_player.style | 23 ++++++++++++++ .../media/player/media_player_button.cpp | 28 ++++++++++++++++++ .../media/player/media_player_button.h | 27 +++++++++++++++++ .../media/player/media_player_cover.cpp | 28 ++++++++++++++++++ .../media/player/media_player_cover.h | 27 +++++++++++++++++ .../media/player/media_player_list.cpp | 28 ++++++++++++++++++ .../media/player/media_player_list.h | 27 +++++++++++++++++ .../media/player/media_player_playback.cpp | 28 ++++++++++++++++++ .../media/player/media_player_playback.h | 27 +++++++++++++++++ .../player/media_player_volume_controller.cpp | 28 ++++++++++++++++++ .../player/media_player_volume_controller.h | 27 +++++++++++++++++ .../media/player/media_player_widget.cpp | 28 ++++++++++++++++++ .../media/player/media_player_widget.h | 27 +++++++++++++++++ Telegram/gyp/Telegram.gyp | 13 ++++++++ 44 files changed, 366 insertions(+) create mode 100644 Telegram/Resources/icons/player_next.png create mode 100644 Telegram/Resources/icons/player_next@2x.png create mode 100644 Telegram/Resources/icons/player_pause.png create mode 100644 Telegram/Resources/icons/player_pause@2x.png create mode 100644 Telegram/Resources/icons/player_play.png create mode 100644 Telegram/Resources/icons/player_play@2x.png create mode 100644 Telegram/Resources/icons/player_previous.png create mode 100644 Telegram/Resources/icons/player_previous@2x.png create mode 100644 Telegram/Resources/icons/player_repeat.png create mode 100644 Telegram/Resources/icons/player_repeat@2x.png create mode 100644 Telegram/Resources/icons/player_volume0.png create mode 100644 Telegram/Resources/icons/player_volume0@2x.png create mode 100644 Telegram/Resources/icons/player_volume1.png create mode 100644 Telegram/Resources/icons/player_volume1@2x.png create mode 100644 Telegram/Resources/icons/player_volume2.png create mode 100644 Telegram/Resources/icons/player_volume2@2x.png create mode 100644 Telegram/Resources/icons/player_volume3.png create mode 100644 Telegram/Resources/icons/player_volume3@2x.png create mode 100644 Telegram/Resources/icons/playlist_cancel.png create mode 100644 Telegram/Resources/icons/playlist_cancel@2x.png create mode 100644 Telegram/Resources/icons/playlist_download.png create mode 100644 Telegram/Resources/icons/playlist_download@2x.png create mode 100644 Telegram/Resources/icons/playlist_pause.png create mode 100644 Telegram/Resources/icons/playlist_pause@2x.png create mode 100644 Telegram/Resources/icons/playlist_play.png create mode 100644 Telegram/Resources/icons/playlist_play@2x.png create mode 100644 Telegram/Resources/icons/title_pause.png create mode 100644 Telegram/Resources/icons/title_pause@2x.png create mode 100644 Telegram/Resources/icons/title_play.png create mode 100644 Telegram/Resources/icons/title_play@2x.png create mode 100644 Telegram/SourceFiles/media/player/media_player.style create mode 100644 Telegram/SourceFiles/media/player/media_player_button.cpp create mode 100644 Telegram/SourceFiles/media/player/media_player_button.h create mode 100644 Telegram/SourceFiles/media/player/media_player_cover.cpp create mode 100644 Telegram/SourceFiles/media/player/media_player_cover.h create mode 100644 Telegram/SourceFiles/media/player/media_player_list.cpp create mode 100644 Telegram/SourceFiles/media/player/media_player_list.h create mode 100644 Telegram/SourceFiles/media/player/media_player_playback.cpp create mode 100644 Telegram/SourceFiles/media/player/media_player_playback.h create mode 100644 Telegram/SourceFiles/media/player/media_player_volume_controller.cpp create mode 100644 Telegram/SourceFiles/media/player/media_player_volume_controller.h create mode 100644 Telegram/SourceFiles/media/player/media_player_widget.cpp create mode 100644 Telegram/SourceFiles/media/player/media_player_widget.h diff --git a/Telegram/Resources/icons/player_next.png b/Telegram/Resources/icons/player_next.png new file mode 100644 index 0000000000000000000000000000000000000000..2649ce5d756f16594db8ee80faae1eb97ea7c422 GIT binary patch literal 188 zcmeAS@N?(olHy`uVBq!ia0vp^fs_I3_VAXv4L2AK3qE?YvxFf9T7-PQy==gnyp4 ow6_lnU7qyz$IeZ2SNvsFTXRa->Bu{ApmP{JUHx3vIVCg!00$dJ@&Et; literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/player_next@2x.png b/Telegram/Resources/icons/player_next@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..2c93ed70eae54b406d666de0c706e71bb3422cfe GIT binary patch literal 297 zcmV+^0oMMBP)# zF^YvS6h+@;8{!6Bk%+hu7h+>&;gT%GLI`fcLe6h~{_qEtB(E@Y;gv@Y#2cT|_dQvb zAtF(u2^N{{nL&qTxT2%J0Mr{--M-S@lk&00000NkvXXu0mjfeBXhE literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/player_pause.png b/Telegram/Resources/icons/player_pause.png new file mode 100644 index 0000000000000000000000000000000000000000..85ea133ff0c15b6ded17aefe5d72038f7fc677dc GIT binary patch literal 118 zcmeAS@N?(olHy`uVBq!ia0vp^d_XL~!3HGNrubO_DO*n$#}JK)Z@Ufo7!-JzR{pOS z*uxhdZM|dG7a=x1hDmmcnGBkD)pDd;J3RKzOo)9p(em8K*^8H`WWArGl5=5=g`4gD S-xffF7(8A5T-G@yGywpsj(d666g7v&pqrP%^M7XXFc?pcKk37?VCK~PJ;77&J>{G8&cgGS!n?SC{ONC` zwu&hSEO2OKV&xLi2v~3+{y?!`bky6D^e~q-bF$B$<1PNra`(*RIp=}aF?hQAxvXg%^#2ZhR76z%w)5_G`E0fZ_2p zy?lGl|Nnhwe&@3DGKa>tKe{GzUj!kvW@I=&PJZtupF3BrAm6*sU0q9lR$Ifn9E5Ja z%l|AxM~>Z#Q0f7#IO$FnMrGC1<4V~q;kc(;M2%2pvu7#lEOxmPp4NKw&P6hwOcLnWRX9(t7>?{^qd{Jo#C|g$cVbF(<_bVyf7e;F9UMD5Vpr{ztfkAP(?CKQE?ZVxLUj{Q_5iMRO4n zW$f~lJf7cHFGv2$MrT~tl6k&XtHo=5anqhA_H>#T5_}>NBZ`KAIf>er=PjY5V~XGbXVo?`K0T;MyI%4)-7RqaYJw6eaY-^jR~eYdSM#my(U{u7$~*6bg;n9mlKd9ZNgz&|ZR|jjHR9Xs~4E;hd>v;|8coS_W4R(a6Iifh_M)2!seRW`PW zkQ*HISCtf(xCaZ0su@1nhcbM-tvTn-j5x2jI47os{+J+=cTwn*1>xb~8)OJ&Z3zly zS(};*68MWcCXf{^6~&Y+BxNZHa{y&~4zhvDimTjE7N`Yz%BnnN+PdQAG+mj-yk$&h z_+}$eHkOq38~{&uOSF5hHoU|*7YhpmyLPN@KmKl+<3 z(IL%}Qp1`<7U&#UxMcYThuH*vy0vw&qoM_elBL)V_P1O%y13^Wr&!~V@;$-Ul@--L z&T^{1BQOEn(%KwW!&$d!|91kz{J`G5Mr{TgU3XKMCy;c{;FwcxO|kKoX|f=0bf<@z zTdnOSGQ5BOSG3ld2wPhxXmQCdozRSbtjT0Ckg+MjB#0S)Nn5jWsGsyFwNefA$%H^& zyy$<|t+2b@y6gH@*xhbzI(HhHn@iNIwKW5mfA)sw!UVZZz_|fQ>XR~jdvm*EO!IJM zGOv*h?D)$vL9Q$Cw0Cqg?rIvv6f}a4x-pz8@DDwh$*`5&E|5DFzHzJ4I?0WlaEpWH z72V>*FdZubX;5Q^i;4&e7%oVI8Z%r}L{PwRK^oMU;i4jf0)`9HpvDXr6%iCLT#yDe zX1J(`pn&0mG^jDdMMVS!3>Tz9jTtT~A}C8Ps4>GuMFa&57oj3(}y* z*TofSKKzFb^2A?_JldCg{kLKASRkhkj~5V{zaOC&_9JxV8u|SLp{jt;pL-CJ-$rP? z`NmUcw-N0JBl#^w@28IrpI*Iu!`h)QdV17}O{ey0XM0baiHv@7+r;i4wvN8KX7uXN zSN1b2zxn&p{*i6o`PB0p4xFj2TX*8)%hkQdU;FNtO^ADcx%%yM7v2$9Y+W_>*gvb* zpOjL+Uq0~ic;w*09iM)kzIJp$x^TpNW!)3Ay%&!Ed&ffdy~AGYV(iUoO9R2I!>6dzTKRdU;ue>yk4*&YryC;?@5*afZ8QPxzaO<9Z F{{fGF?&Sag literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/player_play@2x.png b/Telegram/Resources/icons/player_play@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..efdd63789bc0ab325dcb3f990bbe858b65a5bf56 GIT binary patch literal 14817 zcmeI3ZEO@p7{|AYZ8-$0B37biSrB>Y-R`|?+grA$rB`eTS4z2R8&uft&b6D~-JZ8w zdTo@Kf(lgu(I9CAjfs5l15%?TN|f*czmQl68Y3}50)*J|W(+Y<8l2s`-c7Gp1`HqP zaxYJ3{{LrYfAh?AzwEa9x)-O~X4xo;np#`qZ-Bq^;b(4PKKvdQ6Eoq@w%fBplU+Lu~a3SGlKzc5%*9mh-Squifbu;M>E|sTbq3 z!AOiNA)&#)G&LOjtAc4WjF`Z(ot>SIPPapgw?ezu%W^K(<+4MCUGIt-Qo2vSIMI`v>z z46qGA*E-@ds9pyzWlpZEH`GvOamHjadnTMaNT?Io%$}spDuv_8%`+K+UowEt>E%3j&I#W^&Mk1ar4;MQ!I`Me{*txxkgdqDFHd%Iq9)11XXr-BlJ;i{w#cA*974lHpS$ zQY&C%(N>YoG$P7$SqW8ISc}7H0iRoBb2TF_tJH+rsBTD68PxiHu)(3Kiol1wUZA)= z_R?~t-0t!4irpJ(@!I8b5aKvV=1VW0w^LorZqFIv@>N>|L+1O^CR|&$LMSW(Fu1`GLI#hID@W*j7}*I zDqCSe-0eEPa`agD=);ey6Nxceb_p&Q`QL+nRAUMpeV-N{yD)jJV9RH+e3sg0~64SIYBl zUSzYIvmNzn0)(6VD%`-jS(YAnU6v=iBd4)BV|16IMx-NUOfD7j58YbHWGlQ~fOjfv z`c`G^BByu4eGW2Lbe|KW>Bt}`4QxzsVG*GMf(xaAjR`I+B2++dp){~D!G%SH3J5Ng z1~w+Ru!v9r!G+Sm#sn7@5h@_KP#V~n;KCw81q2sL0~-@uSVX9R;6iC&V}c8d2o(@q zC=F~(aA6Ul0)h*rfsF|+EFx4uaG^A?F~NmJgbD~Qlm<2?xUh&&0l|gRz{Ug@77;2S zxKJ9{nBc-9LIngDN&_1cTv$Y?fZ#%DU}J&{iwG4ETqq4}OmJZlp#p*nrGbqJE-WHc zKyaZnura}fMT80nE|dl~z9TMM=HWjOg-`r-!bkhAtbg({d@PWbYZ?L+)%`3*ZQM*z zH*Uk8o6m0>99%O(Gdt%k zDLj4X{h!ZYeEK`7xMo@HZm@UZ zz|fz=zBQHAjg7IV-ua5AE)8!N2c*7vD=LqP16$7(zb##x5q$65R_@^&wuOEBHw}IN z#zT!8mMxH)XRbIpykCGz%BDY1&bQc) zFR9&Cw7Qb{{7~fjgF}r6AAe={Tl)r{>t8&#K;8P=p8m-2GryeK@N56HDdBT3o$_20 zuWr9}=7^{NwZ*?XuDp3>PGQgR-!-duUifGA${C+t`SxPrqbE1)TYkBFDpkhYt`{vD RX*3_gtgWu|A6T-s=Rfh$H2DAk literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/player_previous.png b/Telegram/Resources/icons/player_previous.png new file mode 100644 index 0000000000000000000000000000000000000000..4460c3dafd68bf247a94522eaff034dca2ca45ea GIT binary patch literal 182 zcmeAS@N?(olHy`uVBq!ia0vp^fduIr-yhwoU`~Em%-!T zO@?h#gznG$;IG)?pxK(N7IPtLa`Ce7by^JD_3l+iW!o2?o~!>U;NSjp$^6wa7p{u) h|7qRGn^yZ$`@`*1!mV9LTYwH>@O1TaS?83{1OO6wMLYli literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/player_previous@2x.png b/Telegram/Resources/icons/player_previous@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..bb31bf5311b7caca243afeb0bc82acc5c794923d GIT binary patch literal 292 zcmV+<0o(qGP)# zF$#n*5JiW%hIj!_6hu6hjg^H*vXFpu{C>3E<_s ztm_){JbyKif++asMi0Y)<2W8o?t&^JG~3PP_nF1gJQBkDVF-0000hnz_ zdl7L=xvp#4bQ}lnP6*-IRkc>pZ<|7rN-4dTr2D>?NKf5bQ_lG(X&|K}QcBB&oU>YM z;;Z}wwN^>e22e_Q_wr%WFz-CiY4g7Cz@O$C{T|$%7~|S{0A|J;!4Lg_nWDnADenLP N002ovPDHLkV1gepSi}GT literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/player_repeat@2x.png b/Telegram/Resources/icons/player_repeat@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..870d4ff84b70adce7df6aba6e64f7b5cad007d3e GIT binary patch literal 235 zcmVDtJfAg#(j?#3le?A(BAyv|d(9jeuki=`Y_=NGw+kV!GjxTK!jVEIf-A2&1Z5ByH0QwLS!XB_opNNno zAwwcb$dE`9G3leLPWgx1^mb+Jm&h69UF2>H?hbn;p=3yaq?!PL^7J$QmHr=H^~fsv l(YYrp08neS%WM%e@&0fldAas{H}x4 c@5UAKZc8^MvCLYi3N(|!)78&qol`;+0NK1LzyJUM literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/player_volume0@2x.png b/Telegram/Resources/icons/player_volume0@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..dbaec7557b3fbf85db5f17402bc758cceb39bb1c GIT binary patch literal 167 zcmeAS@N?(olHy`uVBq!ia0vp^azHG_!3HE3EPS&CNacCDIEHw1zP)P5b-;j!*Pj(v53sOtTDYP0&;v=X#_$0C znrpr_ec@MHg#CWV8yHUx4Q+jR-=;HEhV6WTM$W^6ik9{Rwl+L@AD7?e)|qzopr02$FeaR2}S literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/player_volume1.png b/Telegram/Resources/icons/player_volume1.png new file mode 100644 index 0000000000000000000000000000000000000000..e45f3561220f6e34e3eb7109ad4775f8ed00935e GIT binary patch literal 139 zcmeAS@N?(olHy`uVBq!ia0vp^{2(?58;~rMGjRk`L7py-AsQ3cUfd{jK!Jn#!jaGa z_lrF%d2wiK($ZJ5!8Iui3{!e%dIrsU%ss8JMfFdM@tyZ??q{!-cUL`KvAU9ba!vB2 oj>qqoek(4Q)75yqL*cZ3-RZ4K`kJW$K+_pKUHx3vIVCg!06ID}5dZ)H literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/player_volume1@2x.png b/Telegram/Resources/icons/player_volume1@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..933e8ca9942210ffcf59c213a3149c2c5a12bb17 GIT binary patch literal 217 zcmeAS@N?(olHy`uVBq!ia0vp^azHG_!3HE3EPS&CM0vV6hIn+|z3Rx<-m;$oI&h2+U{6LJi@qIw~j`m%Ll&|p4Tc~Hy zyzap5LN&XSzuFjf^oI1OT>ZM0VMf^6qbssQ*YX$be0Oxut2xG7&&#BJ?qBuVCAc)& zZ|j`Nx<}ZL?8!3o3{Bl~Lo@cIdA*R%JGS!$;T0{r58K+X>^ls!sJ^O<{mp}EJbt-7 RsX(_fc)I$ztaD0e0syrxTg(6e literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/player_volume2.png b/Telegram/Resources/icons/player_volume2.png new file mode 100644 index 0000000000000000000000000000000000000000..70faf11334c0b1d9ffeed7ab459af70895f73d0e GIT binary patch literal 154 zcmeAS@N?(olHy`uVBq!ia0vp^{2(?58;~rMGjRk`iJmTwAsQ3+UUcMZP~dU7Xn*YY ze6eef4`paAoVaU)r}%|EiVO{#^VZ%hvwF@ut*}Ma=1|A+1%G4KPgTiL=4{9nJ;xV$ zZ1XSn`0q6do=4v8UC#J% z9;(44*I^HpaI1Ilb=2B%7Y}uvfL%NrmWa8qOjz5Y1(*NJ<&;u@pVWPB`DCE?)LKJz z>2NgfIBJprg2$ctRpY7ONe<`sdg#jZ;3z(b#^4C9)jK_7u!oQI8HRiKcG$v?z#4uG cmiXx0FEA+vNfqZb0{{R307*qoM6N<$f`E2pSpWb4 literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/player_volume3.png b/Telegram/Resources/icons/player_volume3.png new file mode 100644 index 0000000000000000000000000000000000000000..7d27dc27a7f5db0fe32deb9d5631055bce098e9c GIT binary patch literal 157 zcmeAS@N?(olHy`uVBq!ia0vp^{2(?58;~rMGjRk`DV{ElAsQ3+PCU!i;K0$6zUX^> zl&ycehEK_4K2GL;A9~+#F}zAin{?&eN47MJtJxcF$y8+<9J0KBzDi6*kyC|{;kL+{ zX+00M{xz;Iw@aARQS|+qLfy5yr+?KvKed3d+Cr-2Gqbhj*`444$rjF6*2U FngAR`IC}s9 literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/player_volume3@2x.png b/Telegram/Resources/icons/player_volume3@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..501e14e1413bf9496a7ced6c49ec8497d536297c GIT binary patch literal 242 zcmV*O zKI&CW@ILC@V}kcl3)U4Hcpud;TVB=QM_I)d{>cx`T7VgT8B8m@5?)rQj>o&R9b*jO zHFN0ru><{%IcF$uI~!w$x2S@P;n)*mYaVy`sm>>TU s@bDy>hZ&wkYp{i{^2oUwtnuvFCq`_1GrPv3$^ZZW07*qoM6N<$f|XZk5C8xG literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/playlist_cancel.png b/Telegram/Resources/icons/playlist_cancel.png new file mode 100644 index 0000000000000000000000000000000000000000..a7b9ede8ebc829dacf28ded742b9f881da8f9b2c GIT binary patch literal 216 zcmV;}04M*6P)FG3`H-qkbYW0=%$}j5CS3yeriAn-QQUZ?TC*H+2}bTQJm*VGoy$Qz_fDCG&6ed ziTl3!B*r+vrIh!+)=G#7+q6;(ljL<>1OTR#2C0Wb2v4J5w-_T=Y2d%Gk~)|lG}*Qd zeVlW{*>u6xLtqAn5QgzyDd)VLxtBzQFtg=?y`-wdaU4|D=ToL7B2-oG`_3=vl3RJ; SPGOk<0000Y z+Tp!t2!SFJ&;P;CYLR&Ful*qej^lXrM1=dk^M5(#is9?Je(c}2?f8=?c#Y%<9!p@Y zeO-`~q~Ihu&+~BxEs{d`AppQ-S&Ah&xH0B_i)tj5@Vfv2opVV*CHzy+DtUoF3u+|^ z_`9G~l7aIFiR$}4)dm1`U6)=1Z(-=sEL){8^H*d4%|rT3vHDkaU5*&lY@GH)Z&J@kw|7f8 k_qCd@JP^6!67w73X+4!oZlC_F4>Xy<)78&qol`;+00-GI+W-In literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/playlist_download@2x.png b/Telegram/Resources/icons/playlist_download@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..6dad4371804925453f6af2274bd24f349abaff75 GIT binary patch literal 177 zcmeAS@N?(olHy`uVBq!ia0vp^5oblW)lhym0V1SzvmaEODO&bmYgOaDQTYbn4P<_PR?xclpv>bk_;E3oc+&9YN}SecXa7LUCqDJ zU-lmV7iYzmg$gYUEByt8l4ZD(dV*x-g&xfb-Y6HiK`QVE37pqIizD`O8-S{J&${wN*E^JoqYoB`Wld(3GHcXa5T7FBLH6KYhk0X#T$ab;k>J dYGvpDQZK5r((%lTSpsx8gQu&X%Q~loCIHL-R+j(( literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/playlist_play.png b/Telegram/Resources/icons/playlist_play.png new file mode 100644 index 0000000000000000000000000000000000000000..780df063d0eb4bd59f74f8aed3bb1e4b8c6b4b73 GIT binary patch literal 265 zcmV+k0rvihP)4u*Y0002cNkl0C!!Rzjo46(wecuxV!E+ISl#;rxaUAEFNU^RfX`0@R`P$vMgd42BAHgl#;5dux(ra zjk>PG_kI0eo9CH0j`jCw-*@sn$FeN_&2HNk&-3(d?KlpmX(EcEkFWm?W+3P$`M>hV P00000NkvXXu0mjfJ=t}K literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/playlist_play@2x.png b/Telegram/Resources/icons/playlist_play@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..2adbd4c11f6fcf5478917c85e8f82948755b6e8a GIT binary patch literal 352 zcmV-m0iXVfP)p+chT}LqgbY$j6h*;D$S_S4 zqA21c1OQrV2q6#z0S_U=wrwcO61Hvg5Hd(9k!2YlA;UP12*Z$%5b#}JUDv_$JRU*@ zr4-7tgk@PggbedMBTZ92LWW@&eyXqcgaF_;4zz6x*L6We_%K$#0bEME&9W@iG!1<| zddf{$UD>NbY>JxAvsX%?s;c)tMpmtZO><>4eyr1|%O$WD@{V@}4e^Are!Q|NQ^|zn)DaAtj~7 kP;x?xR~m^e{z wwgEHWQy!lP*OLs3*?Of+vM#J}Y(A>MFgKQ6Aw0eNAW#>Br>mdKI;Vst0Ly_Kl>h($ literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/title_play.png b/Telegram/Resources/icons/title_play.png new file mode 100644 index 0000000000000000000000000000000000000000..90bd38b2e1257b3b817e04e763bfef9f7586705d GIT binary patch literal 168 zcmeAS@N?(olHy`uVBq!ia0vp@K+Mg-1|*kkVowB8`JOJ0AsQ3cPTI|TK!L|)E~mzg zCPs;t+!qqftQr#St}kNthj^%DGCcJR|FLB9)BX;Q&0d-n?<;@n+wz9GhI(oy_C#`@ z-ExgX@l7k+*04Fn)rt-GtPS1PY>iR2Y;gan_*}<*?!Wn&mDTR$Q9nDRn_QWvtLL#B Q0h($ literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/title_play@2x.png b/Telegram/Resources/icons/title_play@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..11c9a68d42ccf7066aa3f84e095ea23cebaed748 GIT binary patch literal 274 zcmV+t0qy>YP)_k-qySs_XPmgburH~Ns{P_0@hmEw$&E}wrwNNbA1tj_nvVaiQ`yT6gZB9 zx~}y_fpuNUvP@qD;GCoDI-)4j6$SQvr>ZJ_QD9jX(lkXxcm&&Dz-{_p&hwOMn&kP_ zDc6!Mu3R$ Y0w~S@-;rUgCIA2c07*qoM6N<$f+KBu#sB~S literal 0 HcmV?d00001 diff --git a/Telegram/SourceFiles/media/player/media_player.style b/Telegram/SourceFiles/media/player/media_player.style new file mode 100644 index 000000000..30d08fdcc --- /dev/null +++ b/Telegram/SourceFiles/media/player/media_player.style @@ -0,0 +1,23 @@ +/* +This file is part of Telegram Desktop, +the official desktop version of Telegram messaging app, see https://telegram.org + +Telegram Desktop is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +It is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +In addition, as a special exception, the copyright holders give permission +to link the code of portions of this program with the OpenSSL library. + +Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE +Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org +*/ + +using "basic.style"; + diff --git a/Telegram/SourceFiles/media/player/media_player_button.cpp b/Telegram/SourceFiles/media/player/media_player_button.cpp new file mode 100644 index 000000000..d2272e588 --- /dev/null +++ b/Telegram/SourceFiles/media/player/media_player_button.cpp @@ -0,0 +1,28 @@ +/* +This file is part of Telegram Desktop, +the official desktop version of Telegram messaging app, see https://telegram.org + +Telegram Desktop is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +It is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +In addition, as a special exception, the copyright holders give permission +to link the code of portions of this program with the OpenSSL library. + +Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE +Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org +*/ +#include "stdafx.h" +#include "media/player/media_player_button.h" + +namespace Media { +namespace Player { + +} // namespace Player +} // namespace Media diff --git a/Telegram/SourceFiles/media/player/media_player_button.h b/Telegram/SourceFiles/media/player/media_player_button.h new file mode 100644 index 000000000..948c76012 --- /dev/null +++ b/Telegram/SourceFiles/media/player/media_player_button.h @@ -0,0 +1,27 @@ +/* +This file is part of Telegram Desktop, +the official desktop version of Telegram messaging app, see https://telegram.org + +Telegram Desktop is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +It is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +In addition, as a special exception, the copyright holders give permission +to link the code of portions of this program with the OpenSSL library. + +Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE +Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org +*/ +#pragma once + +namespace Media { +namespace Player { + +} // namespace Clip +} // namespace Media diff --git a/Telegram/SourceFiles/media/player/media_player_cover.cpp b/Telegram/SourceFiles/media/player/media_player_cover.cpp new file mode 100644 index 000000000..aa7c0de49 --- /dev/null +++ b/Telegram/SourceFiles/media/player/media_player_cover.cpp @@ -0,0 +1,28 @@ +/* +This file is part of Telegram Desktop, +the official desktop version of Telegram messaging app, see https://telegram.org + +Telegram Desktop is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +It is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +In addition, as a special exception, the copyright holders give permission +to link the code of portions of this program with the OpenSSL library. + +Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE +Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org +*/ +#include "stdafx.h" +#include "media/player/media_player_cover.h" + +namespace Media { +namespace Player { + +} // namespace Player +} // namespace Media diff --git a/Telegram/SourceFiles/media/player/media_player_cover.h b/Telegram/SourceFiles/media/player/media_player_cover.h new file mode 100644 index 000000000..948c76012 --- /dev/null +++ b/Telegram/SourceFiles/media/player/media_player_cover.h @@ -0,0 +1,27 @@ +/* +This file is part of Telegram Desktop, +the official desktop version of Telegram messaging app, see https://telegram.org + +Telegram Desktop is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +It is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +In addition, as a special exception, the copyright holders give permission +to link the code of portions of this program with the OpenSSL library. + +Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE +Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org +*/ +#pragma once + +namespace Media { +namespace Player { + +} // namespace Clip +} // namespace Media diff --git a/Telegram/SourceFiles/media/player/media_player_list.cpp b/Telegram/SourceFiles/media/player/media_player_list.cpp new file mode 100644 index 000000000..a8f62db55 --- /dev/null +++ b/Telegram/SourceFiles/media/player/media_player_list.cpp @@ -0,0 +1,28 @@ +/* +This file is part of Telegram Desktop, +the official desktop version of Telegram messaging app, see https://telegram.org + +Telegram Desktop is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +It is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +In addition, as a special exception, the copyright holders give permission +to link the code of portions of this program with the OpenSSL library. + +Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE +Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org +*/ +#include "stdafx.h" +#include "media/player/media_player_list.h" + +namespace Media { +namespace Player { + +} // namespace Player +} // namespace Media diff --git a/Telegram/SourceFiles/media/player/media_player_list.h b/Telegram/SourceFiles/media/player/media_player_list.h new file mode 100644 index 000000000..948c76012 --- /dev/null +++ b/Telegram/SourceFiles/media/player/media_player_list.h @@ -0,0 +1,27 @@ +/* +This file is part of Telegram Desktop, +the official desktop version of Telegram messaging app, see https://telegram.org + +Telegram Desktop is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +It is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +In addition, as a special exception, the copyright holders give permission +to link the code of portions of this program with the OpenSSL library. + +Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE +Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org +*/ +#pragma once + +namespace Media { +namespace Player { + +} // namespace Clip +} // namespace Media diff --git a/Telegram/SourceFiles/media/player/media_player_playback.cpp b/Telegram/SourceFiles/media/player/media_player_playback.cpp new file mode 100644 index 000000000..43665cec4 --- /dev/null +++ b/Telegram/SourceFiles/media/player/media_player_playback.cpp @@ -0,0 +1,28 @@ +/* +This file is part of Telegram Desktop, +the official desktop version of Telegram messaging app, see https://telegram.org + +Telegram Desktop is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +It is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +In addition, as a special exception, the copyright holders give permission +to link the code of portions of this program with the OpenSSL library. + +Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE +Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org +*/ +#include "stdafx.h" +#include "media/player/media_player_playback.h" + +namespace Media { +namespace Player { + +} // namespace Player +} // namespace Media diff --git a/Telegram/SourceFiles/media/player/media_player_playback.h b/Telegram/SourceFiles/media/player/media_player_playback.h new file mode 100644 index 000000000..948c76012 --- /dev/null +++ b/Telegram/SourceFiles/media/player/media_player_playback.h @@ -0,0 +1,27 @@ +/* +This file is part of Telegram Desktop, +the official desktop version of Telegram messaging app, see https://telegram.org + +Telegram Desktop is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +It is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +In addition, as a special exception, the copyright holders give permission +to link the code of portions of this program with the OpenSSL library. + +Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE +Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org +*/ +#pragma once + +namespace Media { +namespace Player { + +} // namespace Clip +} // namespace Media diff --git a/Telegram/SourceFiles/media/player/media_player_volume_controller.cpp b/Telegram/SourceFiles/media/player/media_player_volume_controller.cpp new file mode 100644 index 000000000..d9ac5dda0 --- /dev/null +++ b/Telegram/SourceFiles/media/player/media_player_volume_controller.cpp @@ -0,0 +1,28 @@ +/* +This file is part of Telegram Desktop, +the official desktop version of Telegram messaging app, see https://telegram.org + +Telegram Desktop is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +It is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +In addition, as a special exception, the copyright holders give permission +to link the code of portions of this program with the OpenSSL library. + +Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE +Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org +*/ +#include "stdafx.h" +#include "media/player/media_player_volume_controller.h" + +namespace Media { +namespace Player { + +} // namespace Player +} // namespace Media diff --git a/Telegram/SourceFiles/media/player/media_player_volume_controller.h b/Telegram/SourceFiles/media/player/media_player_volume_controller.h new file mode 100644 index 000000000..948c76012 --- /dev/null +++ b/Telegram/SourceFiles/media/player/media_player_volume_controller.h @@ -0,0 +1,27 @@ +/* +This file is part of Telegram Desktop, +the official desktop version of Telegram messaging app, see https://telegram.org + +Telegram Desktop is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +It is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +In addition, as a special exception, the copyright holders give permission +to link the code of portions of this program with the OpenSSL library. + +Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE +Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org +*/ +#pragma once + +namespace Media { +namespace Player { + +} // namespace Clip +} // namespace Media diff --git a/Telegram/SourceFiles/media/player/media_player_widget.cpp b/Telegram/SourceFiles/media/player/media_player_widget.cpp new file mode 100644 index 000000000..db1a34e90 --- /dev/null +++ b/Telegram/SourceFiles/media/player/media_player_widget.cpp @@ -0,0 +1,28 @@ +/* +This file is part of Telegram Desktop, +the official desktop version of Telegram messaging app, see https://telegram.org + +Telegram Desktop is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +It is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +In addition, as a special exception, the copyright holders give permission +to link the code of portions of this program with the OpenSSL library. + +Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE +Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org +*/ +#include "stdafx.h" +#include "media/player/media_player_widget.h" + +namespace Media { +namespace Player { + +} // namespace Player +} // namespace Media diff --git a/Telegram/SourceFiles/media/player/media_player_widget.h b/Telegram/SourceFiles/media/player/media_player_widget.h new file mode 100644 index 000000000..948c76012 --- /dev/null +++ b/Telegram/SourceFiles/media/player/media_player_widget.h @@ -0,0 +1,27 @@ +/* +This file is part of Telegram Desktop, +the official desktop version of Telegram messaging app, see https://telegram.org + +Telegram Desktop is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +It is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +In addition, as a special exception, the copyright holders give permission +to link the code of portions of this program with the OpenSSL library. + +Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE +Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org +*/ +#pragma once + +namespace Media { +namespace Player { + +} // namespace Clip +} // namespace Media diff --git a/Telegram/gyp/Telegram.gyp b/Telegram/gyp/Telegram.gyp index 0e8db7009..63659a9a7 100644 --- a/Telegram/gyp/Telegram.gyp +++ b/Telegram/gyp/Telegram.gyp @@ -35,6 +35,7 @@ '<(src_loc)/dialogs/dialogs.style', '<(src_loc)/history/history.style', '<(src_loc)/media/view/mediaview.style', + '<(src_loc)/media/player/media_player.style', '<(src_loc)/overview/overview.style', '<(src_loc)/profile/profile.style', '<(src_loc)/settings/settings.style', @@ -237,6 +238,18 @@ '<(src_loc)/intro/introsignup.h', '<(src_loc)/intro/introstart.cpp', '<(src_loc)/intro/introstart.h', + '<(src_loc)/media/player/media_player_button.cpp', + '<(src_loc)/media/player/media_player_button.h', + '<(src_loc)/media/player/media_player_cover.cpp', + '<(src_loc)/media/player/media_player_cover.h', + '<(src_loc)/media/player/media_player_list.cpp', + '<(src_loc)/media/player/media_player_list.h', + '<(src_loc)/media/player/media_player_playback.cpp', + '<(src_loc)/media/player/media_player_playback.h', + '<(src_loc)/media/player/media_player_volume_controller.cpp', + '<(src_loc)/media/player/media_player_volume_controller.h', + '<(src_loc)/media/player/media_player_widget.cpp', + '<(src_loc)/media/player/media_player_widget.h', '<(src_loc)/media/view/media_clip_controller.cpp', '<(src_loc)/media/view/media_clip_controller.h', '<(src_loc)/media/view/media_clip_playback.cpp',