From 3ec0977c31ba74d52d76732f5bc466fedeab9429 Mon Sep 17 00:00:00 2001 From: riccardo Date: Tue, 29 Mar 2011 16:10:26 +0200 Subject: [PATCH] added volume, still some changes to do in the playlist management and popups --- telemeta/htdocs/js/playerUtils.js | 2 ++ .../htdocs/timeside/skins/lab/img/volume.png | Bin 1198 -> 1860 bytes telemeta/htdocs/timeside/skins/lab/style.css | 11 ++++++++-- telemeta/htdocs/timeside/src/player.js | 20 ++++++++++++------ telemeta/htdocs/timeside/src/soundprovider.js | 7 +++++- 5 files changed, 30 insertions(+), 10 deletions(-) diff --git a/telemeta/htdocs/js/playerUtils.js b/telemeta/htdocs/js/playerUtils.js index 93b0c51c..a6f30038 100644 --- a/telemeta/htdocs/js/playerUtils.js +++ b/telemeta/htdocs/js/playerUtils.js @@ -36,7 +36,9 @@ function load_sound() { TimeSide.load(function() { provider.setSource(sound); + player.updateVolumeAnchor(provider.getVolume()); }); + // sound.load(); // Auto-loading overloads the Django test server } } diff --git a/telemeta/htdocs/timeside/skins/lab/img/volume.png b/telemeta/htdocs/timeside/skins/lab/img/volume.png index fb28016447f279cdb8f6d495da47fe278502e965..d741e5549e61624d3edb91debc8d7370246eb3fd 100644 GIT binary patch delta 1797 zcmaKp`#;l*AIIrbE?IIf<#OuGHruBpmxkk;RW#FbzfCfmMa&`h&<=*owU2($9CF2~|(T zS(#UKDO#Z8I<{3(pQNOYcA~FYIY$dtCvbMEZYO2L`@g{LnayCn%x3GGW8M>~l|U{B z_RK#`U4It*#`?7@6s;qW$#b=pBVYZur_~AjSwO(D(qF_8s-)rmI-d7-XP7i46}y-5 z--8x5@VTKsvHL|L!-eO_JBD%y^S(V~PX0FKVTY5WBTAUKz8%*XB0SWR{p#$6I7=O= zMo5jTx9uZ%q9f`GEExq&&MzT`!9;DpJD(9)xI&pXHlV;%Vxn;%e!;kGM@&ClzQG|+ zIMk2;ZHtrALLU$RSQk`a^wdN$)Sa!qm6GbPbseOB!IR4DV+cnF@)lQCczpgz3OkUG zL97k0jA|5DM62wz#cI?W$G(7Sx9C(@KM;f?C}16~A_z|;Qd`>v=gEF%ZH%0ZC>kwv zVUYZOWVC%{(|2L;erfs5ExHu5 zLaGThn3xwjJfSBvNr@rMyG~7~>Tz`&>nfAi^jAtt!ZMP+%odpRR`7J^8o0(hI*s3=H}-5qO^0VA)iDZBL1oN zWz*^53xSn5#5*Y2Wm-m2A zAU~Epnxspe5%QGISiJi=6!rd{s#g`B*A6`16%#is&5l#j2L~yGHHDkE+o;tuPs@vt zau}HLTELMctHViFJlK6vH(u(BFvVB=P9r^*>Blh>Jlp*5$zT(pxg@M^)4sp!N9~L~ zH_+DyEY`Xgd;#J|ZCdu!3#7)#iz=^c;amJ^3g_Blr<#Id!m5C-Zc@kV3HKrAU^^MA*X54&#iv6GfSZyBn@TP`YZ()> z!YS*P1i)`6PAS8wbq+rtN3!8}Gf+BCripwf!D1ZATsxCvWNA61L6fzECeQwTE&1Ys z38qymS^j!g^OXD4ez7%wCN8qvXyi5ZaIQglH-)R|+nqGD-H%=BHr5cVDFBZ>ipN4k zlBfB@0p`p`DQF5oRq4Q_WwZ=m3kMxkgrX*_Jc@|?(_nR~G(3~C*+Wfp#2r*+*6E(*ygTlXTE`X}Zu%d~p0}OdnRe~l( zHL5$Q4m@Pz4!^`9I+L_ur%b@)9#Fza0izCl5hI}EYz6c>Z~*2W8aGP>VQ@6Jo*HHu zV-%Xww9}_{ccRXTjB%=!xlF=fo3aR;KeNq||9f?sgtZc4(fwJPTOUCU;Lbe?7hEFA z|8fSqIB&&fP8E*eNhA_#zhPr~G)k*A<_U*b_Klcw2(_Nh`C&&^qUydHaB#CrfhOj+ z51mtb5EMIV;KT_R+helb6^?t|#2!E-O)=>8UX8U(;t|p?!*K~~CveoCN<-spndTP* zFu#UF^vJOPP}Vw20p@UiZXMJ4m5M3H2%PY^R}S}#ZhYo9Bizp7+$|T9g9SR)X#$h( z7%9;u_Z;+~9RGjQFjdDA%H}KP_clAE`vP+Vajf;&n4k1Dd(EwSS#4car*73 z*+B+H^hza)LmbO*WP_X6I`e_?2*_GcPqn!m9)ms>Q`+KV$<> zLm>waN1u|}9tNUH82u(4@bKhisVQ=ZmzmdVm_VLM?nev;$8wJh>Jdpw0VMLZ#gRyt dbKY#`zO->%$0MsCR)W;Qps!=ERik_o{{aR4g0uht delta 1130 zcmX@Yw~ljyIVS@M{B+)3KhZ&>P+X|N#G<71r?Zb~VaQ8Ct}hx)Q4biIw#-~8 z(Vx7&+&sJgxN-S&nau7tZ+ePL&Y!vUy*p~{v?UBvR5)d2WCDCoDf|hVq~hZ8uwLTY zDo@2G1FcpCP1U1LUPe2kq;rj8lZB?AE7V!KByfG%Z#7-r^%G7?P2QK4bi^Y+FYn@| zPh6ayDiS%|wPC$m+QZkI>`GfY<;X*s3)MT++H97FUzaM`Te&zp?7iT7-q*oZGc4lv zl+0Wgn;#@|yf$s8i&Z)Q`*(YnRQ;{_{(f%#TlOzcKP%>L$-fw~_S)JNM%Eb?`TM#J zbuadov?VJ3O4e#oP-L0wJ?ToVr_tepdo|+8OSRUlGTY(s-nLXA#oY?1cw=L*)#(jy zLi}DoanV%>Zfl();(qbLBg@aRJyW|&UOkyQS8JJn@>fYo(Q`B3C#{KDvefKyvIB>g zXoRj*{c*{*&ChpBXp6r5B4=^;@Za;tWH(2CJUI)fFl0&T&&%90vb9Tp{^YLx{mL+qS;khJ6&$;@~_{n7Aq-btugO(j$iX(Ye-mr+?#p(`d7y#uDxD;-sru1 zV92UZsq?gVhh5y9ywYIxx~Ds|&YUa==>75dadK)!VxpqNm7w+44^Gq4-=GSDK%`bJ zk+aex!F%3@rADjjMWT(?8JKTNx%2VCv1w*b) znfx~=-SwzGF>Q_8Eug6BrFy$fOAB44ayX%I}_Xc~9;zxgi9FL8{toSht0IsA`^8t zEL{~oV{+ov%Rmn-J21^j5Nz=zp#76=dA5b9Y*;F@?aAUbn^en0%~HMJSjjER=?sfs z!h2I_zlStXbRtMpDfiU08?L{;g=rUGy6kTKH>Xo&HdprH1n&fINv3F^$qB7n4@_GX im+03P>aT6E?Tfswk+yAm-%(>wsp9GC=d#Wzp$Py4V-n8* diff --git a/telemeta/htdocs/timeside/skins/lab/style.css b/telemeta/htdocs/timeside/skins/lab/style.css index abc95433..03365001 100755 --- a/telemeta/htdocs/timeside/skins/lab/style.css +++ b/telemeta/htdocs/timeside/skins/lab/style.css @@ -20,11 +20,18 @@ line-height: 13px; } -.ts-skin-lab .ts-player .ts-viewer .ts-pointer { +.ts-skin-lab .ts-player .ts-viewer { /*.ts-pointer {*/ color: #3c4251; background: #e7e7e7; } +.ts-pointer{ + border: 1px solid #B0C4DE !important; + -moz-border-radius: .5ex !important; + -webkit-border-radius: .5ex !important; + border-radius: .5ex !important; + color: #006666 !important; +} .ts-skin-lab .ts-player .ts-ruler .ts-section .ts-label { color: #c3c2cc; background: #2a3242; @@ -75,7 +82,7 @@ background-image: url('img/volume.png'); background-repeat: no-repeat; background-position: 0px 0px !important; - width:160px !important; + width:60px !important; } .ts-skin-lab .ts-player .ts-control .ts-playback .ts-play { diff --git a/telemeta/htdocs/timeside/src/player.js b/telemeta/htdocs/timeside/src/player.js index b120cac9..b24c79cd 100644 --- a/telemeta/htdocs/timeside/src/player.js +++ b/telemeta/htdocs/timeside/src/player.js @@ -107,9 +107,12 @@ TimeSide(function($N, $J) { this.elements.pause.attr('href', '#').bind('click', this.attach(this._onPause)); this.elements.play.attr('href', '#').bind('click', this.attach(this._onPlay)); // - this.elements.volume.attr('href', '#').bind('mousedown', this.attach( + this.elements.volume.attr('href', '#').click(function(){return false;}).bind('mousedown', this.attach( function(e){ - this.changeVolume(e); + if(e.which===1){ //left button + this.changeVolume(e); + } + return false; } )); @@ -160,7 +163,7 @@ TimeSide(function($N, $J) { resizeTimer = setTimeout(this.attach(this.resize), 100); })); //_updateVolumeChanged(this.soundProvider.getVolume()); - this.soundProvider.observe('volume',this.onVolumeChanged); + this.soundProvider.observe('volume',this.attach(this.onVolumeChanged)); //this.container.resize(this.attach(this.resize)); // Can loop ? }, @@ -264,7 +267,7 @@ TimeSide(function($N, $J) { var vol = event.layerX; for(var i=0; i