From 253a36568d8244785866abbb12a8fd5123f074fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=F8=EDk?= Date: Thu, 2 Jan 2014 18:59:27 +0100 Subject: [PATCH] Black rectangle fix Faster flash startup --- trunk/lib/FlashPlayer.exe | Bin 493056 -> 493056 bytes trunk/libsrc/FlashPlayer/uMain.dfm | 4 ++-- trunk/libsrc/FlashPlayer/uMain.pas | 13 ++++++++----- .../flash/gui/player/FlashPlayerPanel.java | 8 +++++--- 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/trunk/lib/FlashPlayer.exe b/trunk/lib/FlashPlayer.exe index 544b31bee7e253dfc80fc86993430be5f8325b98..6d3df290bd1d9eb0c056635aeb5d28b550a640e9 100644 GIT binary patch delta 3370 zcmZve4^&gv9mn4b+$a7)fhod7VQu|W#(I)MAZ+B1LL9By6AN)r#UX|k9UaW#UsSSD zrWkT2Vz}MepA!z}bZ$L6bsk;PtUHUt(z><|shxs=8Psx9QboZni=l77`(8p{?c<#L za(}=3xxe4{{_eZ?VQpJsZCi164a>gT@g&=*xK`W#tz{h-Sv_0X!7A>u*P8Dsj@?tR z(CBXrv{=_Y1#0ZiI}ZoiHmviq_921;*g)-eqkHjZQkc|QBH=S7BLzgM@YF1sIqb#*hm(5Zlqt)vKCjY6*&dJgE>jbYmc zgQx8_%uD@Yh_{);T{ISP?}rIXw&7I+D6!aJfsswYX!dvdXm(oyf9ev*$@acbUT$ek zs5uHj?8YGJtqRe&5G)#Pf>A6Q-T2M``nKj3D6)lDT3R#g4&N6%?`A;@`ArchwNu;P z@(DaW#{na^D!?n)@yQyf?Zr0vHV1lWHe27mDqNVw+PmRnn zn0*(1tH+H@FSLck$n1i48QKkKAFZuYr8$1yExQn`#bxVq~C0YVqcqD3!gBe{>V+n$AFBsds+h zA@4WGGE78r%&g>gSk4LiXOQKD!%v^WTF8|ah-(hFuG=U?e=QQHX9D8HLmbc449|;I z#TR+LIT*Wlp=h3e01_uB6xsi=_2M-{C@ZrbQuxosd}UHWWYRZ0hoSi5%rzJBiXoKy zOakSf2VQh1PV>CKaMnCG1!fMIy@FDy5|>w0k}OWt;F%$mk@&mA5YDfNh6_&Nr-o6A zBKa`xx`mSQ_F)vaEQ#iD0u!l^Vzxd*_@~2Y^@j6}uo(`z&30qJc7>SAz;3xFY)*ju zfxiC^YT4~K;3?)mPAlP{Hq0S^E~h&cAfMu)5tNG+fo+_9$ZJ8CY z7n?>=shIuB8UAQ~}Pncy;cnn`we50TJCHpaFOtMD+IpIvL4IMs~o9 zWhUb7r4}+0as)DVZ(Fz?wruyL7*uhc-j-pwO+c}5Lr?yTdNM&4+?j&s*%yWT6Z%^i zQUyjAjbRc8|1RLKLV!Q9@TD+}f$V*w5BY8jT)kcNLH>FBA$(3ExB2&BU9{T5R>YUk zYVX9kqi8j|2yY)n$yv%bdA^(8+i#r*)bj?ERy;BL--YeH%zGMVJy)@F6s=%?j{i1_ zmTV}4quk=%yC7PEU^UP8*bR)?7RdIRYo5Ft-Ao?ULioM&+?7;a{PXl<7g47KsKM{|cZFS(`6Sx-HNp#q}XR zs_H%1m`L9fdmjeht>Agms|mq1sW_72&Y-@j%i$U4Fcx=Q_P_1o$z>Ou9mdRqO3 zdS&iL{N@QRwP`GOJa;0uH19&*Ox|M6<@~Yy55AjNu(rTm z&|h%9V65OlLA>^x+A?jm_Gj8(XwPcj(!Q@9*7~(m+W%?ebxU<=x~Fsvx<*}#?u72N z?seTex_;fD&adNj^YuykC-k}cLj4wfjlNc2uW!&Fzz0jYqS#5q4B>Vg_ZPfyC&wjQ zRW_AF)ulS4dRx`2`dBrn8dU{UE=wEdMD5Dh*b@9$5so{>Z4`TDryzvjbDrWXk|9o!RQFX1#-^p#m!YUy;9WqIr5&$dZ2(Of=lp}mn;-nnG#7UOol_N5w#H1WykP;c4 zkE{j3zX_F6!X!snrG)iSf@*Y1iL-KqS4#Ng2%nTlz>g>uDlu154}%<$AtmbN2!oVx z$`O@PqEC*nN{G(aWP~~;09MKoUMW#2NBE?~NjZXwP_lX8SXLbx)1$u<3I VZWbF;T2~*lOW`_`GpB6x{{cNNa1a0h delta 3434 zcmZve0ZsMTPMo#6&u1OkOb6D>3QV!f4g_Mv3tzB z`~Uxa|Ns8?zkUDWY)*DIC!bkC)77m{(lxrl9k2c*skMjBqVrm5-S_lh{gm$Ll#Yf$ zej{K+x~FtZ&Be?U6FfC{tz*y5HLp}{-@m!4d_GnD9Zx+(Oxb(N!SFEE4TczE$SL1j zwa0OA5!LJNy2N}-)0Fh;0CSJ7ki4-1ayQ0}Z2Cn2o^#A#S=a)CV9x=QQ#XN@r(sLB^~$pD>KW`4ymn!* z(kf)<+Jx*JTV)Pa34aO@GdhE9XyH-V_{Gi&l4QI5+>uA-cl0#}%) zjN9N;%5Yj)V~Xe+`vK!_8Ztp|<-ndqqKge*!?&jvFf?8QR#``FQpr_jDV;AluQEwn zuN)?2Z)!k*)=$UA9sLyp+gjFe>KmSl1JCR5TXd7BJTP>Kr%GUa0OLH2AsA2idCCC8 z0i*C1Ppui}VSi9KTO}>ZQEhfqCDB97^2`memM9LxN<#j$GKrdkpt)olAFTIU(dtc* zDIc^|RDaD=AfRfgWQa+me~=CgF_!2Pa4f{SNID1Bjc*y89maOyz zYd(SABiF)3G*KLcZzXEmzsVU89emJ7MdSb`&}|8iFzGA*Oag*BuQ(hSqR!6>V3O>l ztzb6S-%7>*gmc2u%cD%{x`E$>aV3wvza)8_59RUMOC%4XiQgb`{TC3&&VFsRW%jKw4y!lCj*(gO`bg z0}C`t*;24oZkiw$P-qt@og{`$ne3PG7U(>GrQxMwy$)#~xpohCl|jGlBwuLg#=ZN; z@eJ&XR9ilaL_4XrLwfcalbW4m3P7XK)tZ0&hBBSTxQjIJvnRpTa|%kW+^YId;1TG< zo|;+9i1hX~CYd`19opAYZzfq%RY^*=s0?~SgLmKDaD^hbV(b&GRK75g?#-`Q(te#; zv@vlb>DHk))Uxk+%IE+6I(Q>Zm%xjr{%1QN4cZs-_ytTWPsglBf$WhN^2mn7O5NM9 zGcmeND_~{<@+Y4(kRe8W?__r&h$wG&0Ee^s3eGJgd#0yg^2-v8(M6+NnnR1bAGr-S z+!qW(C{^me!6ZK1dEXB$+yXAW?*HCk;&kofY^*yPF-e{D4)^j#b{k#SpK&Q8*6^rd zxxsE|F`O}cWau{x8Ia+&A(69kf8tJYr@41IH}^jGA?M>h;XdU)=f30yxFK$o%guZ% zb1E~+xXAd5@qqE1@iQYb{>PZQdh_am)!wHWlfm@1>0{HUrU8@RM4RWC*PDyX`_1*{ zKbrqy{?Pn|dBl8kmHAsUZHckOTb5cXEDp;-%VEnOEU#P6T0XY)TShE*EZD+kEzVk* zm6`Q(>DNctCDI0g&4lM=lA#8rMuB~Qah1MK->7%#Pw3C+J^DU>rpY3vpSM;5?%JUwX$sri(1)b ziWJ|*=KRR35WE)8QF-ldV;`9%l*kliokOCA;&x~erE21W7U5J8?JkW)I#hs^rbT$w zM5z`rrY2gn2r5do6|WYNq9!J_2&mYq9!J_2&;;4r@Y42y%D{Qj>vQDjyOrVPiD+1eBpn(iI!LZ diff --git a/trunk/libsrc/FlashPlayer/uMain.dfm b/trunk/libsrc/FlashPlayer/uMain.dfm index e73b4033a..c6d700215 100644 --- a/trunk/libsrc/FlashPlayer/uMain.dfm +++ b/trunk/libsrc/FlashPlayer/uMain.dfm @@ -1,6 +1,6 @@ object frmMain: TfrmMain - Left = 359 - Top = 168 + Left = 300 + Top = 617 Width = 1381 Height = 811 Caption = 'FFDec Flash Player' diff --git a/trunk/libsrc/FlashPlayer/uMain.pas b/trunk/libsrc/FlashPlayer/uMain.pas index 955fb9f6c..e873eebe5 100644 --- a/trunk/libsrc/FlashPlayer/uMain.pas +++ b/trunk/libsrc/FlashPlayer/uMain.pas @@ -74,10 +74,13 @@ end; procedure TPipeThread.displaySWF(); begin windows.SetParent(frmMain.Handle,target); - flaPreview.Stop; - flaPreview.Movie := ''; - flaPreview.Free; - flaPreview := nil; + if Assigned(flaPreview) then + begin + flaPreview.Stop; + flaPreview.Movie := ''; + flaPreview.Free; + flaPreview := nil; + end; flaPreview := TMySWF.Create(frmMain); flaPreview.Left:=0; flaPreview.Top:=0; @@ -86,7 +89,7 @@ begin frmMain.Caption:='set movie:'+flashFile; flaPreview.Parent := frmMain; flaPreview.Movie:=flashFile; - + flaPreview.SetFocus; end; procedure TPipeThread.setBGColor(); diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/player/FlashPlayerPanel.java b/trunk/src/com/jpexs/decompiler/flash/gui/player/FlashPlayerPanel.java index 21f5e11c0..7fb9f846a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/player/FlashPlayerPanel.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/player/FlashPlayerPanel.java @@ -268,22 +268,24 @@ public class FlashPlayerPanel extends Panel implements FlashDisplay { this.frameRate = frameRate; if (!executed) { execute(); + /* + //How about commenting this out? Will it work? Let's try... try { Thread.sleep(1000); } catch (InterruptedException ex) { Logger.getLogger(FlashPlayerPanel.class.getName()).log(Level.SEVERE, null, ex); - } + }*/ } if (bgColor != null) { setBackground(bgColor); } + resize(); if (pipe != null) { IntByReference ibr = new IntByReference(); Kernel32.INSTANCE.WriteFile(pipe, new byte[]{CMD_PLAY}, 1, ibr, null); Kernel32.INSTANCE.WriteFile(pipe, new byte[]{(byte) flash.getBytes().length}, 1, ibr, null); Kernel32.INSTANCE.WriteFile(pipe, flash.getBytes(), flash.getBytes().length, ibr, null); - } - resize(); + } stopped = false; specialPlaying = false; specialPosition = 0;