summaryrefslogtreecommitdiff
authorTing Li <ting.li@amlogic.com>2016-05-10 10:21:26 (GMT)
committer Ting Li <ting.li@amlogic.com>2016-05-10 10:42:32 (GMT)
commit014b65138d4240ee609e81536aa97b13cd350492 (patch)
treea8098439d9c7ff075e020872c78240549c9fd109
parentd20fa73cd9ba3fc6bc68fac8fd9a27e623eded26 (diff)
downloadDLNA-014b65138d4240ee609e81536aa97b13cd350492.zip
DLNA-014b65138d4240ee609e81536aa97b13cd350492.tar.gz
DLNA-014b65138d4240ee609e81536aa97b13cd350492.tar.bz2
pd#124704 fix bug of display music&video use resource
Change-Id: I12a17d157aaa6c160730f1938176cdec2db5a372
Diffstat
-rw-r--r--libs/dlna.jar233
-rw-r--r--src/com/droidlogic/mediacenter/MediaCenterActivity.java4
-rw-r--r--src/com/droidlogic/mediacenter/airplay/MediaController.java5
-rw-r--r--src/com/droidlogic/mediacenter/dlna/DeviceFileBrowser.java9
-rw-r--r--src/com/droidlogic/mediacenter/dlna/PicUtil.java11
-rw-r--r--src/com/droidlogic/mediacenter/dlna/UPNPAdapter.java37
-rw-r--r--src/com/droidlogic/mediacenter/dlna/VideoController.java5
7 files changed, 166 insertions, 138 deletions
diff --git a/libs/dlna.jar b/libs/dlna.jar
index b7da683..8fe4b56 100644
--- a/libs/dlna.jar
+++ b/libs/dlna.jar
@@ -1,74 +1,71 @@
-PK
+PK
PLs.aO=0Ǭ0>#HrhiV
Fp"a
XD^*mW8z+mDZ!8Ƙ2[ߔ,5B-d 7@ҥssPKb`
-
-[Ah rlpx?.@a8+h6Ԇ֦i RJZCa_kxïA
-(dTW/++.^X[VA:Q m-&[a5+p6dy [kTWS ڼnтed17,t+2(}7'8iq`#85*]UvD]šr F1`$5
- S5Ŗ0pUª6ͨ,+/-+`,+a_/c[R]VlugV)^XZ5Xh Xj+ s'`Mk4USD a$V\\,@_{{sG^ژkm } Q/ذ*鏵֠dmXӪ!eeUu4S(58i8aO2)Ho)a
-HE/oik7fSaO,ciRK\hԵ}ͥAE6n |[(`Trji+m7Z۶8;QGʎDߢ[a5u5<9Lv#œPY:͂ǰK$*NZMXTV*D˚CYXķD8=1X7 &w+́2qf š
-69D9v"I`%&!t0fUZU-h~|+d\|͋|
-[;}́R!Pi6nF*oa+܎[_f2I.X
- kq!ev47o g0+ÁftVt4$<ix0Ȳխ:<ϣQYCѤ;׬v4"삗lA
-r myf׼
- vq&SWQ>L^9|Gwh_Nacu
-Yoq24ATtdAau\3אi-1l~al]K aR}D7Vrt9MA"rA6F\l4NO_:C:g1s:E!4-PCDE!x:O`hЛNz83Fj,wXt"#Y0sXK|ftdT!m8TV-^P3_c vV΀FcQiA8j2MTScht{zpT%<5*WTv`{vqIgj ':zmeB*ged94؍)6ajX駭GdK)1aWpOh!;~#c@V C(bN]׆HF
-6{dJIѶmj'JܟK;Z6`j ϙcΑ4\U{n߿:[_A8"wIm4VKI#SV
-%zj`Y-]pA
-m !#P5lC[ޞk
-$% pVzUzY ԺРծǾ@4H{[Kjc=<*BcC;b=/F)%);pokڵuЦG4ɮAc]]`=&[pևph/64hO>E z[~_:I1XҮ+6K[rle=Е
-{\7}*So'@'2*-+E-4ۍ:O`~Z:}LzS{֍NۃPӾ
-@k{ޕ-NL\ތ,Ъ6uWB QNzPtՕdZDT&j
-\6ή,, ^G~qlkuCۛͽh⮼6[yL/ݏqm+ăfhNV{Wg+$\V.~Φ]-]m{;}B/nFptM)Iw8i]lHPS 3`OJpH65U7 ?{%htxWB[N H/o|'^Zl%cA[et .ݚAl sq]EZ
-[HhmF {Jlۇ\`<9// iT#Zt:L;`:9Sgu,+|.BIc0ϖ<tf].`pL1p04v ŃMtv9Ayb ǖ8jB
-d9[kCk WE(nd󐶛@Шf췼#[BQp [WEۭQ4;uvť jjPo9`ŽdǢXgdk>ZqTDa6k4Gscb TΎ%"zʪJ=`]Q܂[,Th [kǵpe<Rji5ƞem&RvT:151zjyv7Mt@ΎcWhe򯵁YW9nSl^g3Pco2(p)~Doḏ Sػ/jvk=X} -~bŇ('shjCJ?6O$;^Ol3
-@dBcҡ, J45=k[
-4h:h -Al|ds4Np+JJ
-Oēˊ&7sʸ@Rh!t$%ck^d%Eek\qavqMIMr:׸u)Qs<-fx:ΈxrE h@0(x&ei|A=/Fyِ󡑐˺@O͇|*L6HA:Is2r`:.r4>EzM {Fc]@;lyU5X{!Z |^`'*A!|;'2[Nˋkj>h|
-
-QQ VhQ{ŀ#![Q20|yU"i|&z+'䏡@=8޳d`O SGMl4>'< {qԇWUs5e% jJZ~-#Z6ס@GM
-@).+_PU|qEƗU *5~4ׂ296Q_
-ZC*?R%|Z
-imPQbdPwȊ7ftn|n!ufLiJ'`qHȄrw !IL/~CljsNd$lY:?LB/ŭ\ lsQ|^Bb4~>u(Qu P]7OhKy խBi/XdBI@_+8膗u>39 rh|#]pR(jj̮ 4U(51: i:m_(<'Ej8.›N vĂ54t~3l"Wrm܄#ʄ~QQqgJ5[PU
-B=ߘg0DHOZ@FC/*+ѷM UkkPj4ަ7E)E(]p-K I)҄@c0xB . }ZlTcքF/Ѭ7x5[AFQ4Q9:/YH5^D
-j"iVc3.<u9Ȉ Hw͸O1b?1%Ю6HC=6VXaE3kbԢ̚ae?&Z¡{PoqƼ#ÆK
--0LպF-zߤNV8جKmLf:1q=*X,)uIЁKcETvQPq34hD8<6+?VKĈP}KF&''h s 3nheťwnB;/V5R齺JXJCʊ<y5CNPhh+p!r
-ra]<^@Sc
-W74|=B{J; RWjN< ųtʞ tݥ|%],^!#a;Q!4xU賏C`]g[bd!mL;$ 2Ha'
-^+Q^qUa:R,7;fQ49 e̲ƈ 게&[O+kI?'=\n5NuH_b~vTdr T 4j2nQK[O$hhqGDː=@RM_8Iz.VGaᶊ mO|.}d!ҕ@xB'2X͢pDz
-i4J}#d.WQ_s/awҮlvMY\M"b#ĭlK˵N-aI4!RSl"/H{E2M}_ܔhz (^#E~h4IVG"tl+O_= zs/,}vNjw.>ggi,zO#sa90L8;#_7k.^zMWCgZ l3$z^zٞ w#=J%7ki)0zp%b0Ϸت|iny%}5ӂrua]X$zɾ{>A=}X}a,o7$.˛Ee-[[ouIy[h񷴅ؤXҗE,vl\6>}(HKȨ"y0B C׿uCZiϰ=ϴ`~%[C0?̒lK~GY1?ƒ?,Zy/ 1?ђ,)?ؒ?,队ab,1|6s`zyf|YI>2j8\=k|z:k!Y1%K-#e&&}\}Ч+X|_/4yUMa
- ZU j"֜ОöA~9mХ~ N/sJǿ N "s<Yp\t\Wߍ9r\ h\"
-8 M)IĩӐSp
-#+& +#+ȊdhdEuC.8Fd1X%Gi[S$I4d؂EQ0+)rDq(}UZ"ۨ_QA0`TDǫrd,̢<l4"MiX)4xt#;*o|7P$`wenxuCLqn
->+HR-HR< =+[7Y%r pp\͐RѽLPܻ3طQG)ZQ
-#0.V}3 RXHhI_m!u&ܢ2[rMOۍ[3#m{{rAKd;6 q7xѭ37rDˌxH*T=h{<fTeðIrt'|:M>Հ5ưC/`J-9ҲHvoT#Vhgo-u}G ?"0~$iOfS I}n5aFK#gҨm4r(j32?X'?|)`)_!_Ұ9>,"fLaQ8(@7(wm >'o^gtQ\<c' 1J#HC6|[Ul,ex^0ȑ0y3PITȍ0 <J5{y?Ciy/4(d's`Wǹ>&mch #s5u|eD|3Dmb&M3F,:4f\huq"i0=<u͠yyYsǨQI
-3^&rYHW&Em[yf ӢU.AߞKU/V,J.QTJFV ex{-CO➱Se6^!iCaHJ3B(R9<΄a[ ʡcƝ0KnL*2jySsEQ4٤o#\ ,vȱRݼu#gaCFokߎs@ͪ~ZNn~4 Y /TFfٜn~fsb6J:?״GBC#{^\-*i2 _//.rf9]28ɫsYN8NM<-RIU ?F-[͈Z_Fz#Gh nixQ.\F] ظ
-C}Pj EbkPiE.nS`En&IV8R(Kzqolyv|U+g"ipVE-h1a=֬GE+W̴ŵ:òVٳ1b +p+qLc/Z\k"!~1㍅-ה
-Wco
-ONrrY-;f~!L"B8 qLO] 0~WP"(& " IHV=q#0)
-Pf*¤^f a
-o:sJ"vAS$9q˦xOjp"'Xi ;ZlczqkV&G
-naJrE>
-%2WS
-OA9E4g 59\
-//
-;ϷU^/0 ?[͒6
- ߲w< ~CG^?C9g|>x=d{9~>~>33w2_cIso\b;#Ibs,Y,aXRDY8 l?qn6Ddž0$.^fwYdlHFA
-58y;ob+[Y. 8_[|5;?a-XGq gA8ruVN|1uc\aǺNaǻ.`'6][I_p=9ٵ;;;C,-ahٹZ!;Oaiإbv]5+4?۠f.vv&F[®ն[}LeMg&GvmNb$7ے4ݖ4mM:ݑ4ݕTN*g$5{a%ٶYwil{lG쁤[؃ICI^d$}M==v'g#س<{{=^r/f/+6wU5 uM}-Km]oɂdo''Ƀ?Dzb'd$a&ױϒٮfy _/ʾJľN~}86C]70 f?$a?'_d[dC}$M8ӧrBR_FO.\_“+o)<Ut-=ܫ3
->.er3My祼S>) ))S§f<~H$^:OK=u|z">3(~Xj#/NmR3xiy,z>;u >osR;xEӼ2^ p6פڴ.m>_/JkG̗]ˏLʗ=ʏJ{ק}×u nKWoHsL27fHb]t3yK5}oK?פ?ǃ/p.ޑf]،Cq3sI)uԌ
-jt\#0H֩p{m}FY0(K e&I(%SaZM¶ql2BxLmE#aIn~%cd.Jg ,M3¤)*j9&pa( 80g1T1b592u\4S0dPJl%, k\k^ǯp^(c{a(}/ [\|L֠=P-BʡSP=WLࠠ B, >&m9, G
-l^щ{a%,]ed~Q{=0*rGb8;nm>Ќ8E|ùQJ*J){a( !vCߠ
-aXjB!s/XjUm3Vu?s>C{lڪ FKd F%)
-F`<> 0E0?P WcP K15XyJ[)2U) RaZ|/Lg{,#x9E FrCxUb9Gv';
-^&bTZl"#2pr0
-Å2jcf [[jqZ#q5P 4Bv1lWfuz7$D73'FxřF@am}@Lf bsV/4٣fXesoD Ge^lH C"
-Et X$<8^htȄb ,yb?4Yo 2@1"&lP4RgPd1u}ˣ
-R}|Ċ+L]Ф)c%K]`љ
-bU"Ɋ^AU4A ҵnqm!I *~ $ALJѽ#bAevUۻŝY,Gۺvz>-rz.Rn$Bn4<ǯ-z3h*X-ov>|h1
-ȏv<M=T<(Z<C<yQ*)~z<(MrxrAv+<]rűք28>-g>_oD)}K,A; ǝ#G[jEX{qWщuk8 w^
-Vx= "D,:KEq,%cD.4\Zę qH6Ub=Q\ȶثbK\¾dq9.J>Qleb#/Wej\wq~o5V~·Sb9Nܡz\Q#(?/+*tm3BYnGYy| ' ¡S+.$\ uήM.D^'-0D k~, "ƘE,j Gߠ g'1!iCR&}R}`h(p3mZ3Y^+ʥEr1[.tҐryf.OоQV. w?| m!ѭށ2w?`xm?+jg)ӥrZeS Icg])))?rnCWVze@)9r5tCr E.`MSUsݹQN齸>/vH,Bx KJa.S ZJ3R]짚U#NN<SgƇKo 7Cg9-Ϯ̳6ǰFa ܭ>V)0N<gR*Q|Wp+[x`{?.-^7-~g>Vꇮ;\r+%;C:zd7I"bnz{ןfQ6Ep<W0TA26@ $3e,Ei=W-C%3%"¤6=I2#QeʖFO%r}à=όX cͩ!SW>\i<oT1=?YC3H7:T
-9hE;|WUa٣X̆x^W(xCw@&DzQr"ǰCl̍]c3)WҦѥ@'gG]v+vȫ+70@ 6!Sa
-. !I[NT9 0LN"z#Ms#k0^b$or$Nyj5FyL
+
+ٸov:`c06mro yvPd`~ǿ>@a,_t絸}yA<Abq/t -,F pI}m]a]i}uR klk5xJ =ǟ+u@esTp!{oCF7 ܼnaUR2AAEu)?ޛKp !GtNLW._PS^!$aXJϺMk+J
+K
+
+U@#
+O]8T/,+)Ra 6yB5 Jʰ&kM^SMYEdX`b*kJUDJ"ŅȒ F[nN_So6嶻W#qiWB&WV!u4S(neT4;a)'M@
+RZ;~dhIYIyYӊRc5yZFSag$ai|kRm$ֵ-%~I6nq |[W2jjE)k2mxpS馎A4)4m-T<A9 o!VnA^[ (j£%㈊
+jMXXT5bbP2` ΏT6ܭx7 IԔ#i-^78 (H
++4?]A8TXŀO%-T+<~ -RmnFm
+ߠ<dR; piـAN$ PI1J~Afff_L@~ ž<k:-n-DR~a797?7ۡ18OP-Ub.71,&oSK=/*^m\M͐eWo;T|^I3}}H24u |J([I QᑑWO
+w!ZOH];Xvi/r"69LYcRF\ߩ@Xxro cp 563 לQB
+[݁j
+:TAB4|6`КN [%8Ӈ,Lh*#7cOPыo @f*ҺEU5T6A?jgth\ql.Z6GM)T#!BՇ [:ب88j^.C& DN˳ItT y
+!07 Ѐ`y\K)6`
+-aN0dpGOzh,!Ht1(6F2*Ccs+\3mqE棾'ݟK;ZK 0`UMs&s( ,G՞]ήvw<fu3j?FeD'4uU ЃG6II$3zlGklne f{Ko"
+ 3j5V{t{=JG ܼ^ե
+2ҙ\]g棺}n=?1'<3xdNZF?4Ԅ۲naWWv7@חxV@<Jb qà|2cM=$F,[gf:r`gXoCuLk+<ܶ@ YPUV24XMiF PeEJ6I~y$]n" Յ[-R[Ѧ2mmFX}!pv '^ghc'Z{)p !ҪV o`=)*_˭j4WV̩~|u9}+dEiIߑ֗WoECWW`,b nS60oGb[c7V`
+ jzonod 546njsM@T԰||}aI]mφrZ9k[QmU֖zc'ME3}„Su>6yyuqԂ_=uvi!.Ewܢ ͙MX'1n!иk+j xMuŘ{AzB}Qy}qI'FKuKkB}8ټ|\}aEopN!uFsM_?~Nuu}Rْ_Է^{rժD,i걷Gh}iOmCp"?6"6qIsݴnZcQ ԑvOA]k -*ܝ^kD4XʵkQol ݺvGF6tF4ɦ16Ouc^#V/qȓd+I^RN7nʲs:kڽb Zޢ^k55
+i G+nwc)`URCnϢnEKI6βw?gm5Wm>6X\gVb{h1D(VMtxW}$[CL41VWsrTaQ^5mhmjiY5Zamƥsm9/+Z,UTV4%"gUolm͖<6Y҄Zc5j'il%Gf띶oS/}%n/h Ziq'cDmtH*.imoAuc`DR`e: ހuC2dˉZ3-$*,W
+\/:Ϊ4, ^zs`Qux[u9+Zz $r:,uk?,DZ*S{ֺs5Y=iMcֵXw]4{_
+ p=
+hHAw'GIda9m^kRc, ]F#gM]Ĥ.o;
+;ƌMwݫ] 1LvLQSG6ӬJl[`HM*bx k= *d)[zkbt&X!'Weg2?4Nk"oJ*;K46
+eX>XE(GY#_Dnl|KLAXrʮxqtg]ͮao0u(ʈM je%*d:[CW{<l (GUV+T -wUv[HTv`om-m2-ܫҿ9rAQdؿqp?){} 0ȌDNT L
+0Ɇť%{gOeeaϪxW\<=+
+ SLc?d85uC.EM9Va**{׋R*{'1r3HXl!#Zҏu.ɌS!a~/C= B:T(RXe_Sx{tܳʾ
+OEf!pTΠ /\̂B#. %k=?[bhp"@;Hh|p(lPc4I LPMPYlPč,?2h79=Gv>+Bq8OYЈdt #9'5s-EFxb0(3։~T<糓|,GVxCUt0]VX_]SZ*Bq8_B_F KG'ŏC=t ݖoI*#btRL#/6PmN{f Pc2Ht"IspɅ/C@W*JZV!sהWՔ.^A#^""oX>RdMiuia]}UeʗD*?-,P ^LD=MmP"Ɲ
+n3;^t{*\H13܋W.\-y j|%ܡ4F[ۧn u֮5=Hx
+[jJb-y"ZiĽƖv}Qw3 91^@-S0Q#ins3IS)8V+R9zf$74T@/A9zu(1eueU(v@?* ՕbS}a1!p i^/V}=
+@ectQC GUG̗tUO0x4O%EHߘ
+jP"Dhק"ruF=16?_.iAC;vt.^oㅏ&WAtL +bnʪ8Z_}khC%p1"yPqɐDJF`= Y~J|'0k{28']G嘞bA]X׉|hG(ơ9 [_8[{C}. ԟ~5:bz
+V  c짧/HwZ#"_-kMQUVdYq7U_1@ G>mkq
+{ jFDX[y8}rUs3yZi'0s]k/0}VE؜<$4I<iH[8蠦:ErIxU/n BJ<szz7 ]0 ]L~7\?d'IB;UL;Kz`{:7%;Wڤ͂NZfyxfZZf2F/V7hB%eTr&t4enu5CPfq}%D>.Б CܺjNCl5 W̊5qZg+ۚt&Re)v9SEyiڥ.
+uba39] Eib/:"JģT*XYAqPzyO{Na wM<N`΀5n}W'5/t.PӚxnۥ헽= 8v>,[S}x:Luv6#kUb}% z&euI
+L'TDR-7.J
+n:X&xHT)2
+d?Q!O ΁VT6{Ue YoӪ*+NRAO5?SS4@g8 tA)Ĕc5e2R?(Z$r8HUFc2 >"`r5%ek+Ue,b)>wK骂6z\c;Pt$priй=@!U97 3|W&3[|ťWc(̈FQXf(5dPShhOæzB[~v֔9g ǖ_VtJS2(t{[em7nQC}IH
+Q)zQ 揈 M;!{Ht1Qѥ18Tr&u mmk=~rODM9T#@k%\kFL^jQ#Y4M\)?ep .IS<}\pIv%tvMi\UAf$4F>EWkJҪ4]o$_MSi:=6;XBS4tLUɡu:-p.vPIo49U9/SywTM9޸;^EAv=LSIħlC/yĀ4e<` 3ՁK"\̊l!wƪ*JX, ~V95&r-.N^ߕc"ڽS_ Fj2O4Lx;4F&'w?
+7]6
+}ްNMP*ؕQO^Sn}7:!4v{{gWd0DS-1}&Ռ>-'bc,>?KG*C_L*6C
+Ȋdbr
+;!7*; k6`PoDU}> p.D<p1%K []Wp%<
+WcX{ `| 9ي= ) 1Sc,'2C,i8Wa;KD-)Rs%KZ;tK*RvM/igN\`sa*ҰdXHb0TƳ(,B!H /xq/DaUJ~)
+"Zr[\M1.u>.v:f:ܟ$@@pB\gS.D.vqeKZ]t.#
+ه6&?Ů uͦ&bJ$ߪgn2sX!)sb{gF⿳/DC'fBzu^t ܣ<4#.R# %mK3ӫ6,|BZG#Fb~g%5$%D﫴(F.f9g6vZߐ]ga۷p1BBPd[B}O" t\s=wK=ssA9kf=;=ڟS3QO| EwQ/Y yXGt1,]8(mp\Mppmw4 wv~aܹedɣm0OX%|P (B6\G61YcRq]+>d(,gbigL^C3lli&#>o-룬i f]>luMO3v'v>%,`FjmV/<6ČObYՌ~qqc7"yY?=u(@ueF 3+:CCQy )vr٤
+ĝdr#]%5K$m<tIVJbYTgBW/ds
+XxuɪG;?MV>|.~; i QezEٿh.~n_ۺ$sH2qO14_//-e\2]3^2W>Փ$_PF<ϰ9G͎9Rl[BXخﱌrg1rSYH$ؙͫGn~>̋EG{E܆r^D; З]ReV]!6/{{lM+2M
+dsc :Ξ0 r/7;5+]w
+/bBI/I௙2:=NTN.3båu 6G΄b#?.y(KX=fvFwlR8L@ i䟤H2ٟ >Cs *A2lyy4ɩ=nt5]26-ds<>kn61.u~X"a lHt*0;`f3aȻDHKgNȧK|GMR 3okG Jdy‰kb%w71
+_{__O3'| '~> σ_Bp p_
+qټYyJVw
+Ubu:/l~VV7V*>_[l Bgllm[bIl``l5Dvm)[n[ܶm&cdͶJ|1ڶؾ`>ϬX}[cf~{9 ثYc >bdi?aد`گgfw3? 'Y_9hv.Pdz v:]V+ե*Y]VWkUۤ6 ]/Fv6ۢ~Ol?Yݢnx????7[w]XW^;~*{(7kp#=Hgud9&; ӎG{ֱ=`;68.a/:c/9nc/;vWOWo:>c;p$ı7[ # ; eػ E콄J~B }>N`$>M}p5۟p3<E3˄W ﰯ~f$`jwp~Ʊ,VhدZ ;-ai'J4Z <h:n^vmjs9OHd\KDɉyJ 8;'sW,|*KlxFb L<J<NȏNg&ޅ{|X.><Q~l|DLG%~cyvhsR>6iT'$-6>9T>%i?.^t>oSnӓI;yaӼ(5^/I&!>;w>7˒~<^<W&^'k/ɛy]m|A|Q|qK|I|iA~BJ_222ק%)|q\<ewTVޘr2oJ{R)攽|ecX<W<W[R>)_p_-S3ԁ<:SxGw󵩧ɩSR/㧥^OOLoHJ}>?'C~n<'
+?ߙ/p/t9R~-
+I/ LD^aJe)j %X"P,EGb
+ W,Z; 2.(LKQs!ISM8S+VS/km։->QTzjn136*xS/s\e u^eU.SJRL2RORɨ86%xH}
+Kn DKj;dvg4FEp9/Cmo=+VH/Bppu3j]ONυڦ=gҹ8k;~+tJAh<e`,>~,nhpr0 +$Μb_Ax!b0r0sv p¯Aw4`!m. eW_ᨃxA ̛4q" arAB$MC2{A{'#B*Q+Iu$A/dƄ8
+KXrx$"p `;.9e!ŗ%Z>$]#\%WG-] mqTbT[Ĝxo8qu
+QKc]+V7^b(%).q&(Ɉw)y)jK\%fdzArIFE*8E6{Ŷ%$F%g2ĽK<@] .0e%C(K<A?O@MVtī]pXY>N4QHGmě:}!6AszY
+Y`c!r0X`P9b<$&WL5֋ b\.&1ς^(9l9H@wIxOΪώNhr(@W] #A7>`\!>c=,>A-j"-(^QnJ*pg<shc.L>c@)6hD8|
+-6à< z%_*ίdtseI5t#hcx\ ]"cEdj)K^N Y'C6V,\!"~a  >QG#R.t1C_>{Hߖ-?` ۃm6yН-!F~8>qGm j 8Iv (SFc0.&`KIΰ*\z`HPewt5ݾSس.e ;{( .eP4`RF< ̥T&d/1kLG.٭0lce15Cl~^ؿĨq)C.en%TnP"
+Kɗz`iV T
+ҥ,*Pc%]2:jȒ##s(:@w>ǡ>A;q}
+ҧ%&
+TW!( `x7V&<.ނ:²wўzO|3X 8 d_l勯Y2,GMDn?;K*+le\c ,YŠ]+$ݑHW ITsAXzZ\4q2ƠDtag۝A_d8Fj^Lźң+؆K|61˥\B+@>NhhkiE\kSoQ?H#*b4(d DНHdP(%EMt98 h߂ [TG0j!y)hg)*qPؠFCJ<ܠ8%Ųǰ EDxAIWdxCIwTPq*iX%MQlf(GEձKySS y
e!(͞ lf)SQ!?Yrd@tsf43~LBK1`RAz۽IBCU`yCWUTS#>5lKBuA[TS]p!wN5+FNՊdi?L,-ϝKnod04i[._"gtdjEV2c}wfcɾ4~&:|,7!$*CL*7
CaTKF5'wVܱ4sKc k̦au2ܛ =-oF2vGЈC21φqF# 6{IeؓkcވDŽ b'eib@-3nZ
@@ -201,32 +198,35 @@ B'
_[Qz(KWHKUVtn+>IFaxf~ őfz"02NZ5<q/aF`ggv>;÷EGiMOV5!z Z]:Z*3xGIƿo
LzO`&n
(#ّ {ћ,7 `RK Ui 3%`}A`7Upm;]4Ck9 GV_+ҌNbǹ@i[ X2ab@`-u!΃oƖV6caXUi>TW}|o;FGonЭOJN]1~}SgDh,} d=Qx쁱N~[3uu8v>5@}A+!츲[J$^o1=+oݫ;FDF/L`~/WXv#e?{)SPu=Ll
-Fabvk͠lj ;sN> Ssa4R?ԯ''w_6 ͟b}Q\nEH/+ E"r`)EN0)|čL?b6c,&s-1 =F2~<Pĭ#1%a+tEPE -]Rn":(O }y2E~bԝ!-<,i+j<c`2c}D6e'<'<+!b
+Fabvk͠lj ;sN> Ssa4R?ԯ''w_6 ͟b}Q\nEH/+ E"r`)EN0)|čL?b6c,&s-1 =F2~<Pĭ#1%a+tEPE -]Rn":(O }y2E~bԝ!-<,i+j<c`2c}D6e'<'<+!b
kqx? U3$R8.UF3UxA_5-BhC*#žTp
Lv@z_XNT4Pw ⺎KY 0iSf=_s}QlY,  `7X/q<K# xn(v,fv5jDŽH7y,)xЌkͦafꀨ<
q!;%X:U9샢iIu ,bdr<ccZA03a#QFqW;1?zrb&eME^0hv̩a"g^Fj[5e>W9n;bɤ@h
-m˖ym6>MPW'A@A|b׋Μ Q&$m$~I+DO0iEf hi6e%gJ̴D OT%L6[8%8/8ƅm,TTFZXRevOU~AUnOa{G V1>?g}_`_R}%|,|Oq~&~ ۽j N
-$c 𿓲c i,7=bi TA/*Uqoxr4]?(yo>9$ܸb=Q[d>7{WyOѣ C,!rC:QVLt[ UM6= Z;6kdSjLLyPRt5̋NlL>!OYӖ{}ThæmJlHf JDGZ |cqٴN1xuM|b6:'%g(l$ont(˸})K8 oMN*YŷJoRh#\!Opӓ^ƭU/TC_4$H&AIq3"dZ wIJP1*"<7{*y5
-;kgS9VG~*]FemTE=FuX#$/6+jF-ϨG;ՍUhK&e3hg-h cڀq&F;9VvsN.U."P_ǻW ~_,x(Ux-wHC
-oBMAai^kFD뭢h}hMi]i}zz>?<ѾA7)gqPѫ~E!zQj_H;uڍս4.8<"<\xZ~T>%xӨ\Jþ8
-"0%ƌUjBI a\K+h,RK^q<
-"yc\Y^e75\܆Y%F/>+w{fO=xGևzOP?iu !Lԉ=AJ`n^7Qwgԯ(Q|*1+CQ+nh)g£L,q(SwDP15a۠
-H>LO@,RI| y ?Fߕ|OK(}׍PxRyH$8~_i)l܏`}f- S[߷NbQ<XGċ*УTNMl_ M%%c]tcA  z'Eot`oin,AP ,Rwznnp\
- &PNB,.B-@_.!z|$JTDxygqiG
-M
-pbS0Lf8#_S Pb =R0n
-<2.R٭`<s(|`_Q|ՉiiPKD
+m˖ym6>MPW'A@A|b׋Μ Q&$m$~I+DO0iEf hi6e%gJ̴D OT%L6[8%8/8ƅm,TTFZXRevOU~AUnOa{G V1>?g}_`_R}%|,|Oq~&~ ۽j N
++f*c^uX:j 9V2LS'X@ʹyǒ1U]nIZ^s-rB5i1yV4/@ݺ5-ys0L93q|PeJVTN`P1+rp N hFL@:36(dt4jj0Bű~EWkMjV
+}O;g eZW6Ea9+
+P)̶X&z,[r2혼ű\KH)=iGWY׻vuֺ>ToʻzYS%K?#wYNK:ۚK1ۦM5A:_eS:rN?X7 V/Ďvͦc
+BW?*njo7y ;VۮiLo, 5q&2Xxmپ>zBI\zukMF#LJc:}鴕ޑrag蒗e*5X_Tn:/s LTm6FaI6 6Vgs51(K: iɀ2gݶu&>uA #3b7ŒKƭ@. :Hig,`j5
+]XѹIwA/nXײ5FO>f-B  }Eb䪎0xUEIn4W*:ߴXe--∩<@+d{JӦ3i .{&dF8Ա^q >IQ1?i]Դ{Wi݉n[ ItJv ^734FGJK)R!'l2وG; 2J&{~\ne#o,KHFĝ2R}2_RY[U|Ramk273)Y!
+P!޼x+ | o P =S=+WO# ,Ee9 geTDFecTE n(ҭ#Bc)Ff`,2j1gacQXq؈hh0g[1-g;001Z1V{051V{13ޅʈDꃂ[PGQAm*QRB}\N()f9YzRDJԇG_QRUI5Z> 3?¥U(^J)-e6!zgޠf&kޢ.6|1>
+"^ࣨ_>^|h.GهItF%
+BN-J%3N0ҮxjT2g)a&L[xSp%O2\ €qu~ 'e7\G9W p/Dݐxz2=p S[;7NT(GGķm7T.L_) "B&tK^7[LOŋ3oT`o`~`#sVIyzOkh*i衪ڪNRQUҙW/;d\墎I13WŀqV02߽@hK@ .Dx|M"\'HO^]QQe2~
+kG*{KUb O"9Z!\>u58o*G9*%v&ƹ"#s4+'oЁTMH|_qx'4}i$gWŞKt>y t~*KxW}\ʆ
+Q#D̨{ȗU=>5+r Ke=-\|}f[\Z
+pͯ7PG!$+xC>WFus r
+x=Z
+z%7R 776[) !n>*NMP
+pjO@Y଼MRHѼ
+uh6w">HK|d}ya"*x
Zq!^AIf-{`[fp)jvlizאaڦ]7&oj% 2CbݲZ*hCHlcbpWBBn_;,$$(M,g{-Jvae55Kmr @pci +ER!G110|$#eȎt[F̑diY4npiEM'Ei8i Gتn\w{Ð*qK5֜^I/-H *t}QW3yZYop<4Cn9uzհ$Z/G|*T6vFJ+M& *8t"ՙI:O#K*1yf҅z0I-7V%߹#Xю(_gdKxab<ThFͰd| ۺ16b4IɎ=huKP𐘣5w|&m !}KC$ Iү~uHF,g=IN7#|HH<RJ9ìüaAYi:CZI{PPE;;OHDu=Ey),_ YD]\cBB!qꠐd 9zN#ȩPQe璛cdo
-
+
N"na5~H&W9kjb#MI&M$Pi) c/]nRi@8|mpPa!Cx!5sAyMQ&#ǐA2. N|&Gv3b,Dj7\.oWL! Gj#,8і ZrK]BfD)mfA@(i4ֲja
-Qo4+`4,D' O#gQ%,ePK~g7a
-Mh#X*29МZ
-{EJOL.caDSrEk2a[L">:cՙ%6O!Z$ƈaZe"CN1T:NqTz)\-!.S4Wh,Tuj<[5ރ
-fCЅ'#)x(U^osŻE^#^]el'U[ĦU++yTN:h)<ϖ"1N璻4є]_9'X޾C+V<cQ}ۨbZV#-P8g"S<sv1memi|XEGdO.:Ln̪Mfa7_Z};{97pY6y |(jb5('ېĸV$} ܰ)Zii .]l 40[3W𔌌ij
-'zwƯSVi9ه;}3qg`B+'t1%mYE4ņz* Ujխ?/gY dweF3S" #D( 2hM8)`O͔igM &3쑩;+.0ܛmU>`[Ƭ,Ո-n_t9KE'=Igiʠ׌c"5S2Fjʵ䦽j7#=XG h!ҨtJwMt?53%u
-dïLZ6r~;2^+ҡR[2o=Ssa#V1e\f-b
-}_7&>d*_|ۂ<#*ѼcXGqߚʗ1GzOtHb]},ײ8'rdPj@rOn'SɲOO'|'wS:|'P'?@>^o.'W#d{Ǩ*ۅx^[<NmhC%EܼH obTaMħ' ue]L <$7"p<\ȺTYe}^|n5J(uY.<
->CߒK聯K#o7 xUxhx 7P'wVQ*B}}|!ylioz7w-,mUkOqiUdEAKuKGw!W)KkD.rOl"G="%$KDւD.D"u $&Up$< m|Ê{Xw0DLsا}CyG*S:{eݸ4௫\*OBVv/#^䗻G׍ ~y rF9rb{㺖zE~*}]tzlȟN,0"7O##sGTol5S>:HM(O&9NMJVxq%\ʩZ* ~[ŻԝEVxPK2=
+Qo4+`4,D' O#gQ%,ePK~g7a
+(Q3Ff-ೈG9R髳]ټQ:X)W.3s+ST
+Oٸ \ND]ֳY<Wnt'n- 'rWYpǰ'35#/㨟hͶUy)kMb'ќYG/rUp&hD',طTu Yy<ʃIZEsVX4+ic1o+e|ƨXRv}@c(o2 إz
+]Ѓ'+H#DaV+)@Q6 g=ڃ$5Ȇ٭1Y.7m/zE5 <xLkH Fpfsf% ְ:2Wg81>:ڭH:>%`f1'pIVG eMσG-i,3XZP5kt/q
+JàA-
+MaC y.oېkyFD˼j,+<i.tryY8tIw?Epjj; 4I@7eR[!WxUނ6__5R3ɝs BsGR"H s
eY!o+5,,Gz YNUDkh+ vȺ~sfby҆;+D)),pdQs^⏜ni$0uIo2lB}ho
2%Spl&ڦt7aK(8PE^+[Y[x̦ܦ=\!>J;BB3$M)(U&C\aWPhuz7
PF0WK^Y
@@ -1322,29 +1322,38 @@ k.XPU Ѷ[ bsL&mXG
f
 XuSxy(Dvmc&
kh6mq \ Wý!wQe3lߠ/b
-=X z481s5e:.2uՃsn&=Ah(" d^ˮhYv9vӫv6{*1gP"5塷8^"7sx^;xZzx3>O<7®VA炌PKiGu
-ʡj1)yKV8V]VFbt^X˖Ld\ nf8N҆7;Ц!<) r$. ;
-Vo\XX6E'𬆯ptv@(eH+կt[f* ^)0֣}x/xdS7^1PcTV`Ue'mbNxHhޝTw-6 [S?BH]9[w79(oO`#B#53̧Aic/J1@1EHxJ˦~;I3;QQNEl~W $4>k \D ͠Ԧp
-efPiK?Nb57Sa
- :㏢fDu}$4"$ 5j(L[ O! E3O'`'QCw{fYϤ0>Ÿ]u==ObUw%M^(Jʣ
-~
-caYY-<@ь؆.^}H-xh;ߛoъo y'.}܂_!noщ=ng3?Ѓy|}‹258(61$YpQ'P̽"&XyH~ڎ3yk+iӅ(@TO! İ GCkHcE 0s/(G~fc GcSuAhXa"?q?Ccҭ1PfoɊ|;Rr8TVakӨpo#DWo?G>@#8']*"2S+@#(C#NjH!OaG1mf!"F$@@T<BGG —ʨqsA;>,$O#GjɎ]@ ;r Oa<Gpcd8'6W~5?G<?gw^,ta*Q3wD&:ǾhWG#(u4̫#WGX#KJ'~qu
+=X z481s5e:.2uՃsn&=Ah(" d^ˮhYv9vӫv6{*1gP"5塷8^"7sx^;xZzx3>O<7®VA炌PKiGu
+@}A;=`~th>e3v~]MW`Y>kw]c<w xU=>[A>vww[md5c=7u3ךYO UhrH>oK.'m[CMUy#u2{z[G{O&2e
+Q@Ĥ->- 8IDm2p#2@${U֛ |F&WDW;p‘-c!\r6OvYnVh3Y>ff
+T0_ENF|V_SGnY'I؋}a+M!ʢ HFo.YIoB/=T̜ mZBK%PgMV,ufOa?&d2aB@w8vmlpn4TH{%K0,v?nH^MA9T !3>= qN٪.꽿JUSU] k:<gkpޒix256#<1(#<IFxOH#ϫ$莂՝z9qx{L̛xVr|wZN2=f9</JGJ*]V-X^E/~ɤzHSB< /i U^5PTqV⚲,uJ'qCkh
+,&^{g\]bn>+ߚuBNAt~|82\#>|
+9H*r\t"\rF8县(r'xg"V;1?4>*.Ă6妖EIA9jc7g`b@M`7d3Zj=qDB\Fik,n9PD?=靀nzM?死Z9utMLiVu Y)QG|S8|Q֝="ByTO,L ˼lYFl htA h^3Fa߄x}f|-8,vm/
+m o˸E;~ǫ͸@>
+/6bXhgdEyrt+B`3c|bq%"j+N3rbCM^D
+L +'MBaܬzԩ*#n+?D$$SYoBJG*,bm6+9\ăjx<jLlq_gc9?)yh9yrNC
+XS@'5S%P0\yHʣaP#!MCC!M*vZZ>y#~#0/bx2'5bZ _"
+H![\L.kIJdA& & 1F<x/a#$$c8W1y}@
+Oxm8Y;'DR!pXifxFTM_ %olP6O e3# )lʆPb%#1]Q+\ΕL\JPAtdJH\h٘!cO\̺LJ(gi!w5WHu3VBzzxlJ|V:䅺,Vޚ,Nt̓='s)ཷ[]
+cds
+m;,9xGYm`ȩr$'B5%<^"" ҋWգ IQ``ެz*?
+Z}2џOg9c%yܱpOc
2P dSߐiԎl?wv~xj_ߌ ݢ)'^朕g3~=b,G7Rzgg=O\u$d|w{_9>i΅D܀"ig0I䌀CA q@^@S䋲 B%b<Ru sh(T>)j^v*q:@:p`qE?hYG ^njO " ))erx
|3ZNsY<Ei@s$YKB'Hv
(WdMd{+M/6e=ߩIDPJ3zshU5/i` ـY=@hi Zr-DjalЉ,]M*lF9j8V35B=5uVy֌W`t̍e:h%ł'|LEOojr PߍnXf0T^R}y8Py ڙU\8$WYEǦ}|YNo˳Ե GEuGo95׳ 19OQhk.%o,LtU4G7C= ]R<F:a|(٫vK:˭DMC% ]݆ޅ5DX{vvFchL;Ndũq=g?PK Mv
-ҊwIqN >+df 0G29} ȡz`f!xkZ}Oj"  p`>U`<PK7
-
-
-
-
-
-#
-
-
-
-
-b
-
-
-
-
+ҊwIqN >+df 0G29} ȡz`f!xkZ}Oj"  p`>U`<PK7
+
+
+
+
+
+
+
+
+
+=
+b
+
+
+
+
+
diff --git a/src/com/droidlogic/mediacenter/MediaCenterActivity.java b/src/com/droidlogic/mediacenter/MediaCenterActivity.java
index b2ecc6e..d1d7a33 100644
--- a/src/com/droidlogic/mediacenter/MediaCenterActivity.java
+++ b/src/com/droidlogic/mediacenter/MediaCenterActivity.java
@@ -279,9 +279,9 @@ public class MediaCenterActivity extends Activity implements FreshListener {
public void LogStart() {
if ( PrefUtils.getProperties ( "rw.app.dlna.debug", "false" ).equals("true") ) {
- org.cybergarage.util.Debug.off(); //LOG OFF
+ org.cybergarage.util.Debug.on(); //LOG OFF
} else {
- org.cybergarage.util.Debug.on(); //LOG ON
+ org.cybergarage.util.Debug.off(); //LOG ON
}
}
private BroadcastReceiver mHomeKeyReceiver =
diff --git a/src/com/droidlogic/mediacenter/airplay/MediaController.java b/src/com/droidlogic/mediacenter/airplay/MediaController.java
index 97e6926..90efae3 100644
--- a/src/com/droidlogic/mediacenter/airplay/MediaController.java
+++ b/src/com/droidlogic/mediacenter/airplay/MediaController.java
@@ -383,6 +383,7 @@ public class MediaController extends FrameLayout {
// cause the progress bar to be updated even if mShowing
// was already true. This happens, for example, if we're
// paused with the progress bar showing the user hits play.
+ mHandler.removeMessages(SHOW_PROGRESS);
mHandler.sendEmptyMessage ( SHOW_PROGRESS );
Message msg = mHandler.obtainMessage ( FADE_OUT );
if ( timeout != 0 ) {
@@ -425,7 +426,8 @@ public class MediaController extends FrameLayout {
pos = setProgress();
if ( !mDragging && mShowing && mPlayer.isPlaying() ) {
msg = obtainMessage ( SHOW_PROGRESS );
- sendMessageDelayed ( msg, 1000 - ( pos % 1000 ) );
+ removeMessages(SHOW_PROGRESS);
+ sendMessageDelayed ( msg, 1000);
}
break;
}
@@ -668,6 +670,7 @@ public class MediaController extends FrameLayout {
// Ensure that progress is properly updated in the future,
// the call to show() does not guarantee this because it is a
// no-op if we are already showing.
+ mHandler.removeMessages(SHOW_PROGRESS);
mHandler.sendEmptyMessage ( SHOW_PROGRESS );
}
};
diff --git a/src/com/droidlogic/mediacenter/dlna/DeviceFileBrowser.java b/src/com/droidlogic/mediacenter/dlna/DeviceFileBrowser.java
index 16e9682..99934fb 100644
--- a/src/com/droidlogic/mediacenter/dlna/DeviceFileBrowser.java
+++ b/src/com/droidlogic/mediacenter/dlna/DeviceFileBrowser.java
@@ -258,8 +258,13 @@ public class DeviceFileBrowser extends ListFragment implements Callbacks {
.get ( "item_uri" ) );
}
item.put ( "item_media_type", type );
- String pre_uri = (String) item.get("preview_uri");
- item.put("item_type", (null!=pre_uri &&(!pre_uri.isEmpty()))?pre_uri:getFileTypeImg(type));
+
+ String pre_uri = (String) item.get("preview_uri");
+ if ( type == TYPE_IMAGE ) {
+ item.put("item_type", (null!=pre_uri &&(!pre_uri.isEmpty()))?pre_uri:getFileTypeImg(type));
+ } else {
+ item.put("item_type", getFileTypeImg(type));
+ }
}
mediaServerTree.addLeaf ( curTree.getHead(), item );
if ( DEBUG ) { Debug.d ( TAG, "item[" + i + "] got: " + item ); }
diff --git a/src/com/droidlogic/mediacenter/dlna/PicUtil.java b/src/com/droidlogic/mediacenter/dlna/PicUtil.java
index 5070d1c..dd49a84 100644
--- a/src/com/droidlogic/mediacenter/dlna/PicUtil.java
+++ b/src/com/droidlogic/mediacenter/dlna/PicUtil.java
@@ -143,9 +143,18 @@ public class PicUtil {
}
is.close();
bos.close();
+ BitmapFactory.Options opts = new BitmapFactory.Options();
+ opts.inJustDecodeBounds = true;
+ opts.inPreferredConfig = Bitmap.Config.RGB_565;
+ BitmapFactory.decodeFile(cacheFile.getCanonicalPath(),opts);
+ if ( opts.outHeight > 140 || opts.outWidth > 140 ) {
+ int maxLength = opts.outHeight>opts.outWidth?opts.outHeight:opts.outWidth;
+ opts.inSampleSize = maxLength/140;
+ }
+ opts.inJustDecodeBounds = false;
// 从本地加载图片
- bitmap = BitmapFactory.decodeFile(cacheFile.getCanonicalPath());
+ bitmap = BitmapFactory.decodeFile(cacheFile.getCanonicalPath(),opts);
//String name =MD5Util.createMd5(imageUri);
} catch (MalformedURLException e) {
// TODO Auto-generated catch block
diff --git a/src/com/droidlogic/mediacenter/dlna/UPNPAdapter.java b/src/com/droidlogic/mediacenter/dlna/UPNPAdapter.java
index 110b7f5..64070d2 100644
--- a/src/com/droidlogic/mediacenter/dlna/UPNPAdapter.java
+++ b/src/com/droidlogic/mediacenter/dlna/UPNPAdapter.java
@@ -176,7 +176,6 @@ public class UPNPAdapter extends BaseAdapter implements Filterable {
if ( binder != null ) {
bound = binder.setViewValue ( v, data, text );
}
- android.util.Log.d("DLNA","bound"+bound);
if ( !bound ) {
if ( v instanceof Checkable ) {
if ( data instanceof Boolean ) {
@@ -200,30 +199,30 @@ public class UPNPAdapter extends BaseAdapter implements Filterable {
setViewText ( ( TextView ) v, text );
} else if ( v instanceof ImageView ) {
if ( data instanceof Integer ) {
- ((ImageView)v).setImageResource((Integer) data);
- } else {
- asynImageLoader.showImageAsyn((ImageView)v, text, R.drawable.ic_missing_thumbnail_picture);
- }
- } else if (v instanceof UPNPImageView) {
- if (data instanceof Integer) {
- ((UPNPImageView)v).setImageResource((Integer) data);
- //setViewImage((UPNPImageView) v, (Integer) data);
- } else {
- try {
- ((UPNPImageView)v).setImageResource(Integer.parseInt(text));
- } catch (NumberFormatException nfe) {
- ((UPNPImageView)v).setImageURI(Uri.parse(text));
+ ((ImageView)v).setImageResource((Integer) data);
+ } else {
+ asynImageLoader.showImageAsyn((ImageView)v, text, R.drawable.ic_missing_thumbnail_picture);
}
- //setViewImage((UPNPImageView) v, text);
+ } else if (v instanceof UPNPImageView) {
+ if (data instanceof Integer) {
+ ((UPNPImageView)v).setImageResource((Integer) data);
+ //setViewImage((UPNPImageView) v, (Integer) data);
+ } else {
+ try {
+ ((UPNPImageView)v).setImageResource(Integer.parseInt(text));
+ } catch (NumberFormatException nfe) {
+ ((UPNPImageView)v).setImageURI(Uri.parse(text));
+ }
+ //setViewImage((UPNPImageView) v, text);
+ }
+ } else {
+ throw new IllegalStateException(v.getClass().getName() + " is not a " +
+ " view that can be bounds by this UPNPAdapter");
}
- } else {
- throw new IllegalStateException(v.getClass().getName() + " is not a " +
- " view that can be bounds by this UPNPAdapter");
}
}
}
}
- }
/**
* Returns the {@link ViewBinder} used to bind data to views.
diff --git a/src/com/droidlogic/mediacenter/dlna/VideoController.java b/src/com/droidlogic/mediacenter/dlna/VideoController.java
index 673eefe..b1d1ffe 100644
--- a/src/com/droidlogic/mediacenter/dlna/VideoController.java
+++ b/src/com/droidlogic/mediacenter/dlna/VideoController.java
@@ -449,6 +449,7 @@ public class VideoController extends FrameLayout {
// cause the progress bar to be updated even if mShowing
// was already true. This happens, for example, if we're
// paused with the progress bar showing the user hits play.
+ mHandler.removeMessages(SHOW_PROGRESS);
mHandler.sendEmptyMessage ( SHOW_PROGRESS );
Message msg = mHandler.obtainMessage ( FADE_OUT );
if ( timeout != 0 ) {
@@ -491,8 +492,9 @@ public class VideoController extends FrameLayout {
if ( !mDragging && mShowing
&& mPlayer.isPlaying() ) {
msg = obtainMessage ( SHOW_PROGRESS );
+ removeMessages(SHOW_PROGRESS);
sendMessageDelayed ( msg,
- 1000 - ( pos % 1000 ) );
+ 1000);
}
break;
}
@@ -721,6 +723,7 @@ public class VideoController extends FrameLayout {
// a
// no-op if we are
// already showing.
+ mHandler.removeMessages(SHOW_PROGRESS);
mHandler.sendEmptyMessage ( SHOW_PROGRESS );
}
};
generated by cgit at 2024-05-15 19:54:46 (GMT)