Merge JPEXS's changes

This commit is contained in:
Honfika
2014-01-02 20:43:13 +01:00
4 changed files with 15 additions and 10 deletions
Binary file not shown.
+2 -2
View File
@@ -1,6 +1,6 @@
object frmMain: TfrmMain
Left = 359
Top = 168
Left = 300
Top = 617
Width = 1381
Height = 811
Caption = 'FFDec Flash Player'
+8 -5
View File
@@ -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();
@@ -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;