diff --git a/trunk/build.xml b/trunk/build.xml
index fbfc22156..b8710abf8 100644
--- a/trunk/build.xml
+++ b/trunk/build.xml
@@ -45,7 +45,7 @@
     
     <property name="INSTALLERCONFIG" value="${basedir}/installer.cfg"/>
     <property name="INSTALLERPROJECT" value="${basedir}/installer.iss"/>
-    <property name="EXECONFIG" value="${basedir}/build_exe.xml"/>
+    <property name="EXECONFIG" value="${basedir}/build_exe.xml"/>    
     <property name="RUNPARAMS" value="" />    
     <import file="build_common.xml"/>
 </project>
diff --git a/trunk/lib/FlashPlayer.exe b/trunk/lib/FlashPlayer.exe
index 6d168a784..28252f18f 100644
Binary files a/trunk/lib/FlashPlayer.exe and b/trunk/lib/FlashPlayer.exe differ
diff --git a/trunk/libsrc/FlashPlayer/uMain.dcu b/trunk/libsrc/FlashPlayer/uMain.dcu
index 9faed8f2a..02225922f 100644
Binary files a/trunk/libsrc/FlashPlayer/uMain.dcu and b/trunk/libsrc/FlashPlayer/uMain.dcu differ
diff --git a/trunk/libsrc/FlashPlayer/uMain.dfm b/trunk/libsrc/FlashPlayer/uMain.dfm
index a0629fa85..5ccb69124 100644
--- a/trunk/libsrc/FlashPlayer/uMain.dfm
+++ b/trunk/libsrc/FlashPlayer/uMain.dfm
@@ -1,6 +1,6 @@
 object frmMain: TfrmMain
-  Left = 625
-  Top = 484
+  Left = 401
+  Top = 190
   Width = 1381
   Height = 811
   Caption = 'FFDec Flash Player'
diff --git a/trunk/libsrc/FlashPlayer/uMain.pas b/trunk/libsrc/FlashPlayer/uMain.pas
index aa760ed91..e71262821 100644
--- a/trunk/libsrc/FlashPlayer/uMain.pas
+++ b/trunk/libsrc/FlashPlayer/uMain.pas
@@ -99,13 +99,27 @@ buffer:TBuf;
 pipename:PAnsiChar;
 len:integer;
 cmd:integer;
+written:cardinal;
+val:cardinal;
+
+const
+ CMD_PLAY = 1;
+ CMD_RESIZE = 2;
+ CMD_BGCOLOR = 3;
+ CMD_CURRENT_FRAME = 4;
+ CMD_TOTAL_FRAMES = 5;
+ CMD_PAUSE = 6;
+ CMD_RESUME = 7;
+ CMD_PLAYING = 8;
+ CMD_REWIND = 9;
+ CMD_GOTO = 10;
 begin
 
 pipename:=PAnsiChar('\\.\\pipe\ffdec_flashplayer_'+ParamStr(1));
 while (not self.Terminated) do
 begin
-  pipe:=CreateFile(pipename,GENERIC_READ,
-		FILE_SHARE_READ + FILE_SHARE_WRITE,
+  pipe:=CreateFile(pipename,GENERIC_READ or GENERIC_WRITE,
+		FILE_SHARE_READ or FILE_SHARE_WRITE,
 		nil,
 		OPEN_EXISTING,
 		FILE_ATTRIBUTE_NORMAL,
@@ -117,7 +131,8 @@ begin
   begin
         ReadFile(pipe,buffer,1,numBytesRead,nil);
         cmd:=buffer[0];
-        if(cmd=1) then
+        case cmd of
+        CMD_PLAY:
         begin
           ReadFile(pipe,buffer,1,numBytesRead,nil);
           if(numBytesRead>0) then
@@ -128,19 +143,69 @@ begin
             Synchronize(displaySWF);
           end;
         end;
-        if(cmd=2) then
+        CMD_RESIZE:
         begin
           ReadFile(pipe,buffer,4,numBytesRead,nil);
           self.w:=buffer[0]*256+buffer[1];
           self.h:=buffer[2]*256+buffer[3];
           Synchronize(setPos);
         end;
-        if(cmd=3) then
+        CMD_BGCOLOR:
         begin
           ReadFile(pipe,buffer,3,numBytesRead,nil);
           self.bgColor := RGB(buffer[0],buffer[1],buffer[2]);
           Synchronize(setBGColor);
         end;
+        CMD_CURRENT_FRAME:
+        begin
+          if flaPreview.ReadyState = 4 then
+            val:=flaPreview.CurrentFrame
+            else
+            val:=0;
+          buffer[0]:=(val shr 8) mod 256;
+          buffer[1]:=val mod 256;
+          WriteFile(pipe,buffer,2,written,nil);
+        end;
+        CMD_TOTAL_FRAMES:
+        begin
+          if flaPreview.ReadyState = 4 then
+            val:=flaPreview.TotalFrames
+            else
+            val:=0;
+          buffer[0]:=(val shr 8) mod 256;
+          buffer[1]:=val mod 256;
+          WriteFile(pipe,buffer,2,written,nil);
+        end;
+        CMD_PAUSE:
+        begin
+          flaPreview.Stop;
+        end;
+        CMD_RESUME:
+        begin
+          flaPreview.Play;
+        end;
+        CMD_PLAYING:
+        begin
+          buffer[0]:=0;
+          if flaPreview.ReadyState = 4 then
+            if flaPreview.IsPlaying then
+              buffer[0]:=1;
+
+
+          WriteFile(pipe,buffer,1,written,nil);
+        end;
+        CMD_REWIND:
+        begin
+          flaPreview.Rewind;
+        end;
+        CMD_GOTO:
+        begin
+          ReadFile(pipe,buffer,2,numBytesRead,nil);
+          val := (buffer[0] shl 8) + buffer[1];
+          flaPreview.GotoFrame(val);
+        end;
+
+        end;
   end
   until numBytesRead<=0;
   CloseHandle(pipe);
diff --git a/trunk/src/com/jpexs/decompiler/flash/Configuration.java b/trunk/src/com/jpexs/decompiler/flash/Configuration.java
index e18c4be2c..c815b0872 100644
--- a/trunk/src/com/jpexs/decompiler/flash/Configuration.java
+++ b/trunk/src/com/jpexs/decompiler/flash/Configuration.java
@@ -64,28 +64,29 @@ public class Configuration {
      * List of replacements
      */
     public static java.util.List<Replacement> replacements = new ArrayList<>();
-
-    private static HashMap<String, Object> configDefaults = new HashMap<String, Object>() {{
-        put("decompile", true);
-        put("parallelSpeedUp", true);
-        put("autoDeobfuscate", true);
-        put("cacheOnDisk", true);
-        put("internalFlashViewer", false);
-        put("gotoMainClassOnStartup", false);
-        put("deobfuscateUsePrevTagOnly", true);
-        put("decompilationTimeoutSingleMethod", 60);
-        put("lastSaveDir", ".");
-        put("lastOpenDir", ".");
-        put("offeredAssociation", false);
-        put("locale", "en");
-        put("lastUpdatesCheckDate", null);
-        put("gui.window.width", 1000);
-        put("gui.window.height", 700);
-        put("gui.window.maximized.horizontal", false);
-        put("gui.window.maximized.vertical", false);
-        put("lastRenameType", 1);
-        put("removeNops", true);
-    }};
+    private static HashMap<String, Object> configDefaults = new HashMap<String, Object>() {
+        {
+            put("decompile", true);
+            put("parallelSpeedUp", true);
+            put("autoDeobfuscate", true);
+            put("cacheOnDisk", true);
+            put("internalFlashViewer", false);
+            put("gotoMainClassOnStartup", false);
+            put("deobfuscateUsePrevTagOnly", true);
+            put("decompilationTimeoutSingleMethod", 60);
+            put("lastSaveDir", ".");
+            put("lastOpenDir", ".");
+            put("offeredAssociation", false);
+            put("locale", "en");
+            put("lastUpdatesCheckDate", null);
+            put("gui.window.width", 1000);
+            put("gui.window.height", 700);
+            put("gui.window.maximized.horizontal", false);
+            put("gui.window.maximized.vertical", false);
+            put("lastRenameType", 1);
+            put("removeNops", true);
+        }
+    };
 
     /**
      * Saves replacements to file for future use
@@ -137,7 +138,7 @@ public class Configuration {
         T defaultValue = null;
         if (configDefaults.containsKey(cfg)) {
             @SuppressWarnings("unchecked")
-            T def = (T)configDefaults.get(cfg);
+            T def = (T) configDefaults.get(cfg);
             defaultValue = def;
         }
         return getConfig(cfg, defaultValue);
@@ -148,7 +149,7 @@ public class Configuration {
             return defaultValue;
         }
         @SuppressWarnings("unchecked")
-        T result = (T)config.get(cfg);
+        T result = (T) config.get(cfg);
         return result;
     }
 
@@ -157,7 +158,7 @@ public class Configuration {
             cfg = "parallelSpeedUp";
         }
         @SuppressWarnings("unchecked")
-        T result = (T)config.put(cfg, value);
+        T result = (T) config.put(cfg, value);
         return result;
     }
 
diff --git a/trunk/src/com/jpexs/decompiler/flash/SWFInputStream.java b/trunk/src/com/jpexs/decompiler/flash/SWFInputStream.java
index bd6d66019..c26af54ef 100644
--- a/trunk/src/com/jpexs/decompiler/flash/SWFInputStream.java
+++ b/trunk/src/com/jpexs/decompiler/flash/SWFInputStream.java
@@ -629,8 +629,8 @@ public class SWFInputStream extends InputStream {
         //pools = getConstantPool(listeners, new ActionGraphSource(ret, version, new HashMap<Integer, String>(), new HashMap<String, GraphTargetItem>(), new HashMap<String, GraphTargetItem>()), 0, version, path);
 
         /*if (pools.size() == 1) {
-            Action.setConstantPool(ret, pools.get(0));
-        }*/
+         Action.setConstantPool(ret, pools.get(0));
+         }*/
         if (goesPrev && (!DEOBFUSCATION_ALL_CODE_IN_PREVIOUS_TAG)) {
             ActionJump aj = new ActionJump(ip);
             int skip = aj.getBytes(version).length;
@@ -706,7 +706,7 @@ public class SWFInputStream extends InputStream {
 
             /*if(a instanceof ActionConstantPool){
              throw new IllegalArgumentException("CP found");
-             }     */   
+             }     */
             if (a instanceof ActionPush) {
                 if (cpool != null) {
                     ((ActionPush) a).constantPool = cpool.constants;
diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/BooleanAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/BooleanAVM2Item.java
index a97d1a564..cffea146f 100644
--- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/BooleanAVM2Item.java
+++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/BooleanAVM2Item.java
@@ -32,7 +32,7 @@ public class BooleanAVM2Item extends AVM2Item {
 
     @Override
     public String toString(boolean highlight, ConstantPool constants, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames) {
-        return hilight(value?"true":"false", highlight);
+        return hilight(value ? "true" : "false", highlight);
     }
 
     @Override
diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NewFunctionAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NewFunctionAVM2Item.java
index 1078e0e89..390859273 100644
--- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NewFunctionAVM2Item.java
+++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NewFunctionAVM2Item.java
@@ -39,6 +39,6 @@ public class NewFunctionAVM2Item extends AVM2Item {
 
     @Override
     public String toString(boolean highlight, ConstantPool constants, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames) {
-        return hilight("function" + (!functionName.equals("") ? " " + functionName : "") + "(" + paramStr + "):" + returnStr + "\r\n{\r\n", highlight) + (highlight?functionBody:Highlighting.stripHilights(functionBody)) + "\r\n" + hilight("}", highlight);
+        return hilight("function" + (!functionName.equals("") ? " " + functionName : "") + "(" + paramStr + "):" + returnStr + "\r\n{\r\n", highlight) + (highlight ? functionBody : Highlighting.stripHilights(functionBody)) + "\r\n" + hilight("}", highlight);
     }
 }
diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/TryAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/TryAVM2Item.java
index 5f7246cd2..724eaacee 100644
--- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/TryAVM2Item.java
+++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/TryAVM2Item.java
@@ -62,7 +62,7 @@ public class TryAVM2Item extends AVM2Item implements Block {
         }
         ret += hilight("}", highlight);
         for (int e = 0; e < catchExceptions.size(); e++) {
-            ret += "\r\n" + hilight("catch(" + catchExceptions.get(e).getVarName(constants, fullyQualifiedNames) + ":" + catchExceptions.get(e).getTypeName(constants, fullyQualifiedNames) + ")", highlight) + "\r\n" + hilight("{", highlight) +"\r\n";
+            ret += "\r\n" + hilight("catch(" + catchExceptions.get(e).getVarName(constants, fullyQualifiedNames) + ":" + catchExceptions.get(e).getTypeName(constants, fullyQualifiedNames) + ")", highlight) + "\r\n" + hilight("{", highlight) + "\r\n";
             List<GraphTargetItem> commands = catchCommands.get(e);
             for (GraphTargetItem ti : commands) {
                 if (!ti.isEmpty()) {
@@ -72,7 +72,7 @@ public class TryAVM2Item extends AVM2Item implements Block {
             ret += hilight("}", highlight);
         }
         if (finallyCommands.size() > 0) {
-            ret += "\r\n" + hilight("finally", highlight) +"\r\n" + hilight("{", highlight) + "\r\n";
+            ret += "\r\n" + hilight("finally", highlight) + "\r\n" + hilight("{", highlight) + "\r\n";
             for (GraphTargetItem ti : finallyCommands) {
                 if (!ti.isEmpty()) {
                     ret += ti.toStringSemicoloned(highlight, Helper.toList(constants, localRegNames, fullyQualifiedNames)) + "\r\n";
diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitClass.java b/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitClass.java
index 711b91bb3..294c7a420 100644
--- a/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitClass.java
+++ b/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitClass.java
@@ -504,7 +504,7 @@ public class TraitClass extends Trait implements TraitWithSlot {
             String stripped = highlight ? Highlighting.stripHilights(s) : s;
             if (!stripped.trim().equals("")) {
                 if (s.contains("/*classInitializer*/")) {
-                    s = s.replace("/*classInitializer*/", "");                    
+                    s = s.replace("/*classInitializer*/", "");
                     s = s + "\r\n";
                 } else {
                     if (!first) {
diff --git a/trunk/src/com/jpexs/decompiler/flash/action/Action.java b/trunk/src/com/jpexs/decompiler/flash/action/Action.java
index 330eb41b2..4666ce378 100644
--- a/trunk/src/com/jpexs/decompiler/flash/action/Action.java
+++ b/trunk/src/com/jpexs/decompiler/flash/action/Action.java
@@ -419,9 +419,9 @@ public class Action implements GraphSourceItem {
             importantOffsets = getActionsAllRefs(list, version);
         }
         /*List<ConstantPool> cps = SWFInputStream.getConstantPool(new ArrayList<DisassemblyListener>(), new ActionGraphSource(list, version, new HashMap<Integer, String>(), new HashMap<String, GraphTargetItem>(), new HashMap<String, GraphTargetItem>()), 0, version, path);
-        if (!cps.isEmpty()) {
-            setConstantPool(list, cps.get(cps.size() - 1));
-        }*/
+         if (!cps.isEmpty()) {
+         setConstantPool(list, cps.get(cps.size() - 1));
+         }*/
         HashMap<Long, List<GraphSourceItemContainer>> containers = new HashMap<>();
         HashMap<GraphSourceItemContainer, Integer> containersPos = new HashMap<>();
         offset = address;
diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/WithActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/WithActionItem.java
index b82b9b941..647c6a41f 100644
--- a/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/WithActionItem.java
+++ b/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/WithActionItem.java
@@ -49,7 +49,7 @@ public class WithActionItem extends ActionItem {
         String ret;
         List<Object> localData = new ArrayList<>();
         localData.add(constants);
-        ret = hilight("with(", highlight) + scope.toString(highlight, localData) + hilight(")", highlight) + "\r\n" + hilight("{",highlight) + "\r\n";
+        ret = hilight("with(", highlight) + scope.toString(highlight, localData) + hilight(")", highlight) + "\r\n" + hilight("{", highlight) + "\r\n";
         for (GraphTargetItem ti : items) {
             ret += ti.toString(highlight, localData) + "\r\n";
         }
diff --git a/trunk/src/com/jpexs/decompiler/flash/action/parser/pcode/ASMParser.java b/trunk/src/com/jpexs/decompiler/flash/action/parser/pcode/ASMParser.java
index e620e964d..8f10ebe59 100644
--- a/trunk/src/com/jpexs/decompiler/flash/action/parser/pcode/ASMParser.java
+++ b/trunk/src/com/jpexs/decompiler/flash/action/parser/pcode/ASMParser.java
@@ -54,7 +54,7 @@ public class ASMParser {
         cpool.setAddress(address, version, false);
         address += cpool.getBytes(version).length;
         list.add(cpool);
-        
+
         while (true) {
             ASMParsedSymbol symb = lexer.yylex();
             if (symb.type == ASMParsedSymbol.TYPE_LABEL) {
@@ -347,7 +347,7 @@ public class ASMParser {
         }
         return a;
     }
-    
+
     private static List<Action> parseAllActions(FlasmLexer lexer, int version) throws IOException, ParseException {
         List<Action> list = new ArrayList<>();
         Stack<GraphSourceItemContainer> containers = new Stack<>();
@@ -380,14 +380,14 @@ public class ASMParser {
     public static List<Action> parse(long address, long containerSWFOffset, boolean ignoreNops, String source, int version) throws IOException, ParseException {
         FlasmLexer lexer = new FlasmLexer(new StringReader(source));
         List<Action> list = parseAllActions(lexer, version);
-        
+
         List<String> constantPool = new ArrayList<>();
-        for(Action a : list) {
+        for (Action a : list) {
             if (a instanceof ActionConstantPool) {
                 constantPool.addAll(((ActionConstantPool) a).constantPool);
             }
         }
-        
+
         lexer = new FlasmLexer(new StringReader(source));
         List<Label> labels = new ArrayList<>();
         List<Action> ret = parse(containerSWFOffset, ignoreNops, labels, address, lexer, constantPool, version);
diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionPush.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionPush.java
index b84ecc863..4df87c827 100644
--- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionPush.java
+++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionPush.java
@@ -199,7 +199,7 @@ public class ActionPush extends Action {
                     if (constantPool.contains((String) symb.value)) {
                         values.add(new ConstantIndex(constantPool.indexOf(symb.value), constantPool));
                     } else {
-                    values.add(symb.value);
+                        values.add(symb.value);
                     }
                     break;
                 case ASMParsedSymbol.TYPE_FLOAT:
@@ -226,7 +226,7 @@ public class ActionPush extends Action {
             }
         }
     }
-    
+
     @Override
     public String getASMSourceReplaced(List<? extends GraphSourceItem> container, List<Long> knownAddreses, List<String> constantPool, int version, boolean hex, boolean highlight) {
         if (replacement == null || replacement.size() < values.size()) {
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/ImagePanel.java b/trunk/src/com/jpexs/decompiler/flash/gui/ImagePanel.java
index c2ee5d52f..68d7ba773 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/ImagePanel.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/ImagePanel.java
@@ -17,6 +17,7 @@
 package com.jpexs.decompiler.flash.gui;
 
 import com.jpexs.decompiler.flash.SWF;
+import com.jpexs.decompiler.flash.gui.player.FlashDisplay;
 import com.jpexs.decompiler.flash.tags.base.CharacterTag;
 import com.jpexs.decompiler.flash.tags.base.DrawableTag;
 import java.awt.BorderLayout;
@@ -35,13 +36,16 @@ import javax.swing.JColorChooser;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 
-public class ImagePanel extends JPanel implements ActionListener {
+public class ImagePanel extends JPanel implements ActionListener, FlashDisplay {
 
     public JLabel label = new JLabel();
     public DrawableTag drawable;
     private Timer timer;
     private int percent;
     private int frame;
+    private SWF swf;
+    private HashMap<Integer, CharacterTag> characters;
+    private int frameRate;
 
     @Override
     public void setBackground(Color bg) {
@@ -97,39 +101,22 @@ public class ImagePanel extends JPanel implements ActionListener {
         label.setIcon(icon);
     }
 
-    public void setDrawable(final DrawableTag drawable, final SWF swf, final HashMap<Integer, CharacterTag> characters) {
+    public void setDrawable(final DrawableTag drawable, final SWF swf, final HashMap<Integer, CharacterTag> characters, int frameRate) {
+        pause();
         this.drawable = drawable;
-        if (timer != null) {
-            timer.cancel();
-        }
+        this.swf = swf;
+        this.characters = characters;
 
         if (drawable.getNumFrames() == 0) {
             label.setIcon(null);
             return;
         }
+        percent = 0;
         if (drawable.getNumFrames() == 1) {
             setImage(drawable.toImage(0, swf.tags, swf.displayRect, characters, new Stack<Integer>()));
             return;
         }
-        timer = new Timer();
-
-        percent = 0;
-        timer.schedule(new TimerTask() {
-            @Override
-            public void run() {
-                int nframe = percent * drawable.getNumFrames() / 100;
-                if (nframe != frame) {
-                    ImageIcon icon = new ImageIcon(drawable.toImage(nframe, swf.tags, swf.displayRect, characters, new Stack<Integer>()));
-                    label.setIcon(icon);
-                }
-                if (percent == 100) {
-                    percent = 0;
-                } else {
-                    percent++;
-                }
-
-            }
-        }, 0, 20);
+        play();
     }
 
     public void setImage(Image image) {
@@ -140,4 +127,90 @@ public class ImagePanel extends JPanel implements ActionListener {
         ImageIcon icon = new ImageIcon(image);
         label.setIcon(icon);
     }
+
+    @Override
+    public int getCurrentFrame() {
+        if (drawable == null) {
+            return 0;
+        }
+        return percent * drawable.getNumFrames() / 100;
+    }
+
+    @Override
+    public int getTotalFrames() {
+        if (drawable == null) {
+            return 0;
+        }
+        return drawable.getNumFrames();
+    }
+
+    @Override
+    public void pause() {
+        if (timer != null) {
+            timer.cancel();
+            timer = null;
+        }
+    }
+
+    private void drawFrame() {
+        int nframe = percent * drawable.getNumFrames() / 100;
+        if (nframe != frame) {
+            ImageIcon icon = new ImageIcon(drawable.toImage(nframe, swf.tags, swf.displayRect, characters, new Stack<Integer>()));
+            label.setIcon(icon);
+        }
+    }
+
+    @Override
+    public void play() {
+        pause();
+        if (drawable.getNumFrames() > 1) {
+
+            timer = new Timer();
+            timer.schedule(new TimerTask() {
+                @Override
+                public void run() {
+                    drawFrame();
+                    if (percent == 100) {
+                        percent = 0;
+                    } else {
+                        percent++;
+                    }
+
+                }
+            }, 0, 20);
+        }
+    }
+
+    @Override
+    public void rewind() {
+        percent = 0;
+        drawFrame();
+    }
+
+    @Override
+    public boolean isPlaying() {
+        if (drawable == null) {
+            return false;
+        }
+        return (drawable.getNumFrames() <= 1) || (timer != null);
+    }
+
+    @Override
+    public void gotoFrame(int frame) {
+        percent = frame * 100 / drawable.getNumFrames();
+        drawFrame();
+    }
+
+    @Override
+    public int getFrameRate() {
+        if (drawable == null) {
+            return 1;
+        }
+        return drawable.getNumFrames() / 2;
+    }
+
+    @Override
+    public boolean isLoaded() {
+        return drawable != null;
+    }
 }
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/Main.java b/trunk/src/com/jpexs/decompiler/flash/gui/Main.java
index 4e9339288..88b2749ad 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/Main.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/Main.java
@@ -784,8 +784,7 @@ public class Main {
                         System.out.println("Configuration saved");
                         return;
                     }
-                }
-                else if (args[pos].equals("-onerror")) {
+                } else if (args[pos].equals("-onerror")) {
                     parameterProcessed = true;
                     pos++;
                     if (args.length <= pos) {
@@ -817,8 +816,7 @@ public class Main {
                     }
 
                     pos++;
-                }
-                else if (args[pos].equals("-timeout")) {
+                } else if (args[pos].equals("-timeout")) {
                     parameterProcessed = true;
                     pos++;
                     if (args.length <= pos) {
@@ -1072,12 +1070,12 @@ public class Main {
             }
         }
     }
-    
-    private static Boolean parseBooleanConfigValue(String value){
-        if (value == null){
+
+    private static Boolean parseBooleanConfigValue(String value) {
+        if (value == null) {
             return null;
         }
-        
+
         Boolean bValue = null;
         value = value.toLowerCase();
         if (value.equals("0") || value.equals("false") || value.equals("no") || value.equals("off")) {
@@ -1088,7 +1086,7 @@ public class Main {
         }
         return bValue;
     }
-    
+
     public static String tempFile(String url) throws IOException {
         File f = new File(getFFDecHome() + "saved" + File.separator);
         if (!f.exists()) {
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/MainFrame.java b/trunk/src/com/jpexs/decompiler/flash/gui/MainFrame.java
index 5cc2d78bf..e4091d97e 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/MainFrame.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/MainFrame.java
@@ -37,6 +37,7 @@ import com.jpexs.decompiler.flash.gui.abc.LineMarkedEditorPane;
 import com.jpexs.decompiler.flash.gui.abc.TreeElement;
 import com.jpexs.decompiler.flash.gui.action.ActionPanel;
 import com.jpexs.decompiler.flash.gui.player.FlashPlayerPanel;
+import com.jpexs.decompiler.flash.gui.player.PlayerControls;
 import com.jpexs.decompiler.flash.tags.ABCContainerTag;
 import com.jpexs.decompiler.flash.tags.DefineBinaryDataTag;
 import com.jpexs.decompiler.flash.tags.DefineBitsJPEG2Tag;
@@ -1224,7 +1225,10 @@ public class MainFrame extends AppRibbonFrame implements ActionListener, TreeSel
         displayPanel = new JPanel(new CardLayout());
 
         if (flashPanel != null) {
-            leftComponent = flashPanel;
+            JPanel flashPlayPanel = new JPanel(new BorderLayout());
+            flashPlayPanel.add(flashPanel, BorderLayout.CENTER);
+            flashPlayPanel.add(new PlayerControls(flashPanel), BorderLayout.SOUTH);
+            leftComponent = flashPlayPanel;
         } else {
             JPanel swtPanel = new JPanel(new BorderLayout());
             swtPanel.add(new JLabel("<html><center>" + translate("notavailonthisplatform") + "</center></html>", JLabel.CENTER), BorderLayout.CENTER);
@@ -1288,7 +1292,11 @@ public class MainFrame extends AppRibbonFrame implements ActionListener, TreeSel
         JPanel previewPanel = new JPanel(new BorderLayout());
 
         previewImagePanel = new ImagePanel();
-        previewPanel.add(previewImagePanel, BorderLayout.CENTER);
+
+        JPanel previewCnt = new JPanel(new BorderLayout());
+        previewCnt.add(previewImagePanel, BorderLayout.CENTER);
+        previewCnt.add(new PlayerControls(previewImagePanel), BorderLayout.SOUTH);
+        previewPanel.add(previewCnt, BorderLayout.CENTER);
         JLabel prevIntLabel = new HeaderLabel(translate("swfpreview.internal"));
         prevIntLabel.setHorizontalAlignment(SwingConstants.CENTER);
         //prevIntLabel.setBorder(new BevelBorder(BevelBorder.RAISED));
@@ -2220,7 +2228,7 @@ public class MainFrame extends AppRibbonFrame implements ActionListener, TreeSel
             case "SELECTCOLOR":
                 Color newColor = JColorChooser.showDialog(null, AppStrings.translate("dialog.selectcolor.title"), View.swfBackgroundColor);
                 if (newColor != null) {
-                    View.swfBackgroundColor = newColor;                    
+                    View.swfBackgroundColor = newColor;
                     reload(true);
                 }
                 break;
@@ -2866,10 +2874,10 @@ public class MainFrame extends AppRibbonFrame implements ActionListener, TreeSel
         setEditText(false);
         reload(false);
     }
-    
-    private void stopFlashPlayer(){
+
+    private void stopFlashPlayer() {
         if (flashPanel != null) {
-            if(!flashPanel.isStopped()){
+            if (!flashPanel.isStopped()) {
                 flashPanel.stopSWF();
             }
         }
@@ -2935,12 +2943,12 @@ public class MainFrame extends AppRibbonFrame implements ActionListener, TreeSel
             swfPreviewPanel.load(swf);
             swfPreviewPanel.play();
         } /*else if (tagObj instanceof DefineVideoStreamTag) {
-            showCard(CARDEMPTYPANEL);
-        } else if ((tagObj instanceof DefineSoundTag) || (tagObj instanceof SoundStreamHeadTag) || (tagObj instanceof SoundStreamHead2Tag)) {
-            showCard(CARDEMPTYPANEL);
-        } */else if (tagObj instanceof DefineBinaryDataTag) {
+         showCard(CARDEMPTYPANEL);
+         } else if ((tagObj instanceof DefineSoundTag) || (tagObj instanceof SoundStreamHeadTag) || (tagObj instanceof SoundStreamHead2Tag)) {
+         showCard(CARDEMPTYPANEL);
+         } */ else if (tagObj instanceof DefineBinaryDataTag) {
             stopFlashPlayer();
-            showCard(CARDEMPTYPANEL);            
+            showCard(CARDEMPTYPANEL);
         } else if (tagObj instanceof ASMSource) {
             stopFlashPlayer();
             showCard(CARDACTIONSCRIPTPANEL);
@@ -2953,7 +2961,7 @@ public class MainFrame extends AppRibbonFrame implements ActionListener, TreeSel
         } else if ((tagObj instanceof DrawableTag) && (!(tagObj instanceof TextTag)) && (miInternalViewer.isSelected())) {
             stopFlashPlayer();
             showCard(CARDDRAWPREVIEWPANEL);
-            previewImagePanel.setDrawable((DrawableTag) tagObj, swf, characters);
+            previewImagePanel.setDrawable((DrawableTag) tagObj, swf, characters, 50/*FIXME*/);
         } else if (tagObj instanceof FrameNode && ((FrameNode) tagObj).isDisplayed() && (miInternalViewer.isSelected())) {
             stopFlashPlayer();
             showCard(CARDDRAWPREVIEWPANEL);
@@ -2977,42 +2985,56 @@ public class MainFrame extends AppRibbonFrame implements ActionListener, TreeSel
                 }
                 tempFile = File.createTempFile("temp", ".swf");
                 tempFile.deleteOnExit();
-                
+
                 Color backgroundColor = View.swfBackgroundColor;
-                    if (tagObj instanceof FontTag) { //Fonts are always black on white
-                        backgroundColor = View.DEFAULT_BACKGROUND_COLOR;
-                    }
-                    
+                if (tagObj instanceof FontTag) { //Fonts are always black on white
+                    backgroundColor = View.DEFAULT_BACKGROUND_COLOR;
+                }
+                int frameCount = 1;
+                int frameRate = swf.frameRate;
+                HashMap<Integer, VideoFrameTag> videoFrames = new HashMap<>();
+                DefineVideoStreamTag vs = null;
+                if (tagObj instanceof DefineVideoStreamTag) {
+                    vs = (DefineVideoStreamTag) tagObj;
+                    swf.populateVideoFrames(vs.getCharacterId(), new ArrayList<Object>(swf.tags), videoFrames);
+                    frameCount = videoFrames.size();
+                }
+
+                List<SoundStreamBlockTag> soundFrames = new ArrayList<>();
+                if (tagObj instanceof SoundStreamHeadTypeTag) {
+                    SWF.populateSoundStreamBlocks(new ArrayList<Object>(swf.tags), (Tag) tagObj, soundFrames);
+                    frameCount = soundFrames.size();
+                }
+
+                if ((tagObj instanceof DefineMorphShapeTag) || (tagObj instanceof DefineMorphShape2Tag)) {
+                    frameCount = 100;
+                    frameRate = 50;
+                }
+
+                if (tagObj instanceof DefineSoundTag) {
+                    frameCount = 1;
+                }
                 try (FileOutputStream fos = new FileOutputStream(tempFile)) {
                     SWFOutputStream sos = new SWFOutputStream(fos, 10);
                     sos.write("FWS".getBytes());
                     sos.write(swf.version);
 
-                    int frameCount = 100;
-                    HashMap<Integer, VideoFrameTag> videoFrames=new HashMap<>(); 
-                    DefineVideoStreamTag vs=null;
-                    if (tagObj instanceof DefineVideoStreamTag){
-                        vs = (DefineVideoStreamTag)tagObj;
-                        swf.populateVideoFrames(vs.getCharacterId(), new ArrayList<Object>(swf.tags), videoFrames);                            
-                        frameCount = videoFrames.size();
-                    }
-                                
-                            
+
                     ByteArrayOutputStream baos = new ByteArrayOutputStream();
                     SWFOutputStream sos2 = new SWFOutputStream(baos, 10);
                     int width = swf.displayRect.Xmax - swf.displayRect.Xmin;
                     int height = swf.displayRect.Ymax - swf.displayRect.Ymin;
                     sos2.writeRECT(swf.displayRect);
                     sos2.writeUI8(0);
-                    sos2.writeUI8(50);//swf.frameRate);
+                    sos2.writeUI8(frameRate);
                     sos2.writeUI16(frameCount); //framecnt
-                    
+
                     /*FileAttributesTag fa = new FileAttributesTag();
-                    sos2.writeTag(fa);
-*/
-                     if (tagObj instanceof FrameNode) {
+                     sos2.writeTag(fa);
+                     */
+                    if (tagObj instanceof FrameNode) {
                         FrameNode fn = (FrameNode) tagObj;
-                        if(fn.getParent() == null){
+                        if (fn.getParent() == null) {
                             for (Tag t : swf.tags) {
                                 if (t instanceof SetBackgroundColorTag) {
                                     backgroundColor = ((SetBackgroundColorTag) t).backgroundColor.toColor();
@@ -3020,10 +3042,10 @@ public class MainFrame extends AppRibbonFrame implements ActionListener, TreeSel
                                 }
                             }
                         }
-                     }
+                    }
 
                     sos2.writeTag(new SetBackgroundColorTag(null, new RGB(backgroundColor)));
-                                        
+
                     if (tagObj instanceof FrameNode) {
                         FrameNode fn = (FrameNode) tagObj;
                         Object parent = fn.getParent();
@@ -3159,67 +3181,65 @@ public class MainFrame extends AppRibbonFrame implements ActionListener, TreeSel
                                 sos2.writeTag(new PlaceObject2Tag(null, false, false, false, true, false, true, false, true, 1, chtId, mat, null, ratio, null, 0, null));
                                 sos2.writeTag(new ShowFrameTag(null));
                             }
-                        } else if (tagObj instanceof SoundStreamHeadTypeTag){
-                            List<SoundStreamBlockTag> sbs=new ArrayList<>();
-                            SWF.populateSoundStreamBlocks(new ArrayList<Object>(swf.tags), (Tag)tagObj,sbs);
-                            for(SoundStreamBlockTag blk:sbs){
+                        } else if (tagObj instanceof SoundStreamHeadTypeTag) {
+                            for (SoundStreamBlockTag blk : soundFrames) {
                                 sos2.writeTag(blk);
                                 sos2.writeTag(new ShowFrameTag(null));
                             }
-                        } else if (tagObj instanceof DefineSoundTag){
-                            ExportAssetsTag ea=new ExportAssetsTag();
-                            ea.tags.add(1);
+                        } else if (tagObj instanceof DefineSoundTag) {
+                            ExportAssetsTag ea = new ExportAssetsTag();
+                            DefineSoundTag ds = (DefineSoundTag) tagObj;
+                            ea.tags.add(ds.soundId);
                             ea.names.add("my_define_sound");
                             sos2.writeTag(ea);
-                            DoActionTag doa=new DoActionTag(null, new byte[]{}, SWF.DEFAULT_VERSION, 0);
-                            List<Action> actions=ASMParser.parse(0, 0, false, 
-                                    "ConstantPool \"my_sound\" \"Sound\" \"my_define_sound\" \"attachSound\" \"start\"\n" +
-                                    "Push \"my_sound\" 0.0 \"Sound\"\n"+
-                                    "NewObject\n"+
-                                    "DefineLocal\n"+
-                                    "Push \"my_define_sound\" 1 \"my_sound\"\n"+
-                                    "GetVariable\n"+
-                                    "Push \"attachSound\"\n"+
-                                    "CallMethod\n"+
-                                    "Pop\n"+                                                                    
-                                    "Push 9999 0.0 2 \"my_sound\"\n"+
-                                    "GetVariable\n"+
-                                    "Push \"start\"\n"+
-                                    "CallMethod\n"+
-                                    "Pop\n"+
-                                    "Stop", SWF.DEFAULT_VERSION);                                                        
+                            DoActionTag doa = new DoActionTag(null, new byte[]{}, SWF.DEFAULT_VERSION, 0);
+                            List<Action> actions = ASMParser.parse(0, 0, false,
+                                    "ConstantPool \"my_sound\" \"Sound\" \"my_define_sound\" \"attachSound\" \"start\"\n"
+                                    + "Push \"my_sound\" 0.0 \"Sound\"\n"
+                                    + "NewObject\n"
+                                    + "DefineLocal\n"
+                                    + "Push \"my_define_sound\" 1 \"my_sound\"\n"
+                                    + "GetVariable\n"
+                                    + "Push \"attachSound\"\n"
+                                    + "CallMethod\n"
+                                    + "Pop\n"
+                                    + "Push 9999 0 2 \"my_sound\"\n"
+                                    + "GetVariable\n"
+                                    + "Push \"start\"\n"
+                                    + "CallMethod\n"
+                                    + "Pop\n"
+                                    + "Stop", SWF.DEFAULT_VERSION);
                             doa.setActions(actions, SWF.DEFAULT_VERSION);
                             sos2.writeTag(doa);
                             sos2.writeTag(new ShowFrameTag(null));
                             sos2.writeTag(new ShowFrameTag(null));
-                        } else if (tagObj instanceof DefineVideoStreamTag){
- 
-                            sos2.writeTag(new PlaceObject2Tag(null, false, false, false, false, false, true, true, false, 1, chtId, mat, null, 0, null, 0, null));                            
-                            List<VideoFrameTag> frs=new ArrayList<>(videoFrames.values());
-                            Collections.sort(frs,new Comparator<VideoFrameTag>() {
+                        } else if (tagObj instanceof DefineVideoStreamTag) {
 
+                            sos2.writeTag(new PlaceObject2Tag(null, false, false, false, false, false, true, true, false, 1, chtId, mat, null, 0, null, 0, null));
+                            List<VideoFrameTag> frs = new ArrayList<>(videoFrames.values());
+                            Collections.sort(frs, new Comparator<VideoFrameTag>() {
                                 @Override
                                 public int compare(VideoFrameTag o1, VideoFrameTag o2) {
-                                    return o1.frameNum-o2.frameNum;
+                                    return o1.frameNum - o2.frameNum;
                                 }
                             });
-                            boolean first=true;
-                            int ratio=0;
-                            for(VideoFrameTag f:frs){
-                                if(!first){
+                            boolean first = true;
+                            int ratio = 0;
+                            for (VideoFrameTag f : frs) {
+                                if (!first) {
                                     ratio++;
-                                    sos2.writeTag(new PlaceObject2Tag(null, false, false, false, true, false, false, false, true, 1, 0 , null, null, ratio, null, 0, null));                            
+                                    sos2.writeTag(new PlaceObject2Tag(null, false, false, false, true, false, false, false, true, 1, 0, null, null, ratio, null, 0, null));
                                 }
                                 sos2.writeTag(f);
-                                sos2.writeTag(new ShowFrameTag(null));                                
+                                sos2.writeTag(new ShowFrameTag(null));
                                 first = false;
                             }
                         } else {
                             sos2.writeTag(new PlaceObject2Tag(null, false, false, false, true, false, true, true, false, 1, chtId, mat, null, 0, null, 0, null));
                             sos2.writeTag(new ShowFrameTag(null));
                         }
-                        
-                        
+
+
                     }//not showframe
 
                     sos2.writeTag(new EndTag(null));
@@ -3228,11 +3248,11 @@ public class MainFrame extends AppRibbonFrame implements ActionListener, TreeSel
                     sos.writeUI32(sos.getPos() + data.length + 4);
                     sos.write(data);
                     fos.flush();
-                }                
+                }
                 showCard(CARDFLASHPANEL);
                 if (flashPanel != null) {
                     if (flashPanel instanceof FlashPlayerPanel) {
-                        flashPanel.displaySWF(tempFile.getAbsolutePath(), backgroundColor);
+                        flashPanel.displaySWF(tempFile.getAbsolutePath(), backgroundColor, frameRate);
                     }
                 }
 
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/MyProgressBarUI.java b/trunk/src/com/jpexs/decompiler/flash/gui/MyProgressBarUI.java
index ebcfe9bb9..9ebc564ea 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/MyProgressBarUI.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/MyProgressBarUI.java
@@ -36,14 +36,14 @@ import org.pushingpixels.trident.ease.Spline;
  */
 public class MyProgressBarUI extends SubstanceProgressBarUI {
 
-    private final class SubstanceChangeListener implements ChangeListener {
+    private final class MySubstanceChangeListener implements ChangeListener {
 
         @Override
         public void stateChanged(ChangeEvent e) {
             SubstanceCoreUtilities.testComponentStateChangeThreadingViolation(progressBar);
 
             if (displayTimeline != null) { //Main Change - this should be first                
-                displayTimeline.abort();
+                //displayTimeline.abort();                
             }
             int currValue = progressBar.getValue();
             int span = progressBar.getMaximum() - progressBar.getMinimum();
@@ -57,24 +57,24 @@ public class MyProgressBarUI extends SubstanceProgressBarUI {
                     * totalPixels / span;
 
 
-            displayTimeline = new Timeline(progressBar);
-            displayTimeline.addPropertyToInterpolate(Timeline
-                    .<Integer>property("displayedValue").from(displayedValue)
-                    .to(currValue).setWith(new TimelinePropertyBuilder.PropertySetter<Integer>() {
-                @Override
-                public void set(Object obj, String fieldName,
-                        Integer value) {
-                    displayedValue = value;
-                    progressBar.repaint();
-                }
-            }));
-            displayTimeline.setEase(new Spline(0.4f));
-            AnimationConfigurationManager.getInstance().configureTimeline(
-                    displayTimeline);
+            /*displayTimeline = new Timeline(progressBar);
+             displayTimeline.addPropertyToInterpolate(Timeline
+             .<Integer>property("displayedValue").from(displayedValue)
+             .to(currValue).setWith(new TimelinePropertyBuilder.PropertySetter<Integer>() {
+             @Override
+             public void set(Object obj, String fieldName,
+             Integer value) {
+             displayedValue = value;
+             progressBar.repaint();
+             }
+             }));
+             displayTimeline.setEase(new Spline(0.4f));
+             AnimationConfigurationManager.getInstance().configureTimeline(
+             displayTimeline);*/
 
             boolean isInCellRenderer = (SwingUtilities.getAncestorOfClass(
                     CellRendererPane.class, progressBar) != null);
-            if (currValue > 0 && !isInCellRenderer && Math.abs(pixelDelta) > 5) {
+            if (false) {//currValue > 0 && !isInCellRenderer && Math.abs(pixelDelta) > 5) {
                 displayTimeline.play();
             } else {
                 displayedValue = currValue;
@@ -92,7 +92,7 @@ public class MyProgressBarUI extends SubstanceProgressBarUI {
     protected void installListeners() {
         super.installListeners();
         this.progressBar.removeChangeListener(substanceValueChangeListener);
-        substanceValueChangeListener = new MyProgressBarUI.SubstanceChangeListener();
+        this.substanceValueChangeListener = new MySubstanceChangeListener();
         this.progressBar.addChangeListener(this.substanceValueChangeListener);
     }
 }
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/SWFPreviwPanel.java b/trunk/src/com/jpexs/decompiler/flash/gui/SWFPreviwPanel.java
index f1742c92d..6669cf7ab 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/SWFPreviwPanel.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/SWFPreviwPanel.java
@@ -18,6 +18,7 @@ package com.jpexs.decompiler.flash.gui;
 
 import com.jpexs.decompiler.flash.SWF;
 import static com.jpexs.decompiler.flash.gui.AppStrings.translate;
+import com.jpexs.decompiler.flash.gui.player.PlayerControls;
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.FlowLayout;
@@ -59,7 +60,8 @@ public class SWFPreviwPanel extends JPanel {
         prevLabel.setHorizontalAlignment(SwingConstants.CENTER);
         //prevLabel.setBorder(new BevelBorder(BevelBorder.RAISED));
         add(prevLabel, BorderLayout.NORTH);
-        add(buffering, BorderLayout.SOUTH);
+        //add(buffering, BorderLayout.SOUTH);
+        add(new PlayerControls(pan), BorderLayout.SOUTH);
     }
     private SWF swf;
 
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/View.java b/trunk/src/com/jpexs/decompiler/flash/gui/View.java
index 2c21a4517..bee71c9be 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/View.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/View.java
@@ -55,9 +55,9 @@ import org.pushingpixels.substance.api.skin.SubstanceOfficeBlue2007LookAndFeel;
  */
 public class View {
 
-    public static final Color DEFAULT_BACKGROUND_COLOR = new Color(217,231,250);
+    public static final Color DEFAULT_BACKGROUND_COLOR = new Color(217, 231, 250);
     public static Color swfBackgroundColor = DEFAULT_BACKGROUND_COLOR;
-        
+
     /**
      * Sets windows Look and Feel
      */
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/graphics/pause16.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/pause16.png
new file mode 100644
index 000000000..ec61099b0
Binary files /dev/null and b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/pause16.png differ
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/graphics/play16.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/play16.png
new file mode 100644
index 000000000..f8c8ec683
Binary files /dev/null and b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/play16.png differ
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/graphics/stop16.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/stop16.png
new file mode 100644
index 000000000..e6f75d232
Binary files /dev/null and b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/stop16.png differ
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/locales/MainFrame.properties b/trunk/src/com/jpexs/decompiler/flash/gui/locales/MainFrame.properties
index 5364f4513..fd21bd090 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/locales/MainFrame.properties
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/locales/MainFrame.properties
@@ -345,4 +345,9 @@ ColorChooser.resetText = Reset
 ColorChooser.previewText = Preview
 ColorChooser.swatchesNameText = Swatches
 ColorChooser.swatchesRecentText = Recent:
-ColorChooser.sampleText=Sample Text  Sample Text
\ No newline at end of file
+ColorChooser.sampleText=Sample Text  Sample Text
+
+#after version 1.7.1:
+preview.play = Play
+preview.pause = Pause
+preview.stop = Stop
\ No newline at end of file
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/locales/MainFrame_cs.properties b/trunk/src/com/jpexs/decompiler/flash/gui/locales/MainFrame_cs.properties
index b974bb5c3..1958cd44d 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/locales/MainFrame_cs.properties
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/locales/MainFrame_cs.properties
@@ -350,4 +350,9 @@ ColorChooser.resetText = Obnovit
 ColorChooser.previewText = N\u00e1hled
 ColorChooser.swatchesNameText = Vzorn\u00edk
 ColorChooser.swatchesRecentText = Ned\u00e1vn\u00e9:
-ColorChooser.sampleText=Vzorov\u00fd Text  Vzorov\u00fd Text
\ No newline at end of file
+ColorChooser.sampleText=Vzorov\u00fd Text  Vzorov\u00fd Text
+
+#after version 1.7.1:
+preview.play = P\u0159ehr\u00e1t
+preview.pause = Pauza
+preview.stop = Zastavit
\ No newline at end of file
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/player/FlashDisplay.java b/trunk/src/com/jpexs/decompiler/flash/gui/player/FlashDisplay.java
new file mode 100644
index 000000000..49e6f2d2e
--- /dev/null
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/player/FlashDisplay.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2013 JPEXS
+ *
+ * This program 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.
+ *
+ * This program 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.jpexs.decompiler.flash.gui.player;
+
+import java.awt.Color;
+
+/**
+ *
+ * @author JPEXS
+ */
+public interface FlashDisplay {
+
+    public int getCurrentFrame();
+
+    public int getTotalFrames();
+
+    public void pause();
+
+    public void play();
+
+    public void rewind();
+
+    public boolean isPlaying();
+
+    public void gotoFrame(int frame);
+
+    public void setBackground(Color color);
+
+    public int getFrameRate();
+
+    public boolean isLoaded();
+}
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 64a1bb4d4..0f28464c6 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/player/FlashPlayerPanel.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/player/FlashPlayerPanel.java
@@ -2,6 +2,7 @@ package com.jpexs.decompiler.flash.gui.player;
 
 import com.jpexs.decompiler.flash.gui.FlashUnsupportedException;
 import com.jpexs.decompiler.flash.gui.Main;
+import com.jpexs.decompiler.flash.gui.View;
 import com.sun.jna.Native;
 import com.sun.jna.Platform;
 import com.sun.jna.WString;
@@ -30,7 +31,7 @@ import javax.swing.JFrame;
  *
  * @author JPEXS
  */
-public class FlashPlayerPanel extends Panel {
+public class FlashPlayerPanel extends Panel implements FlashDisplay {
 
     private boolean executed = false;
     private String flash;
@@ -38,11 +39,18 @@ public class FlashPlayerPanel extends Panel {
     private static List<HANDLE> processes = new ArrayList<>();
     private static List<HANDLE> pipes = new ArrayList<>();
     private JFrame frame;
-    private boolean stopped=false;
-    
+    private boolean stopped = true;
     private static final int CMD_PLAY = 1;
     private static final int CMD_RESIZE = 2;
     private static final int CMD_BGCOLOR = 3;
+    private static final int CMD_CURRENT_FRAME = 4;
+    private static final int CMD_TOTAL_FRAMES = 5;
+    private static final int CMD_PAUSE = 6;
+    private static final int CMD_RESUME = 7;
+    private static final int CMD_PLAYING = 8;
+    private static final int CMD_REWIND = 9;
+    private static final int CMD_GOTO = 10;
+    private int frameRate;
 
     private synchronized void resize() {
         if (pipe != null) {
@@ -54,12 +62,37 @@ public class FlashPlayerPanel extends Panel {
         }
     }
 
-    public synchronized void setBackgroundColor(Color color) {
+    @Override
+    public synchronized int getCurrentFrame() {
+        byte[] res = new byte[2];
+        IntByReference ibr = new IntByReference();
+        Kernel32.INSTANCE.WriteFile(pipe, new byte[]{CMD_CURRENT_FRAME}, 1, ibr, null);
+        if (Kernel32.INSTANCE.ReadFile(pipe, res, res.length, ibr, null)) {
+            return ((res[0] & 0xff) << 8) + (res[1] & 0xff);
+        } else {
+            return 0;
+        }
+    }
+
+    @Override
+    public synchronized int getTotalFrames() {
+        byte[] res = new byte[2];
+        IntByReference ibr = new IntByReference();
+        Kernel32.INSTANCE.WriteFile(pipe, new byte[]{CMD_TOTAL_FRAMES}, 1, ibr, null);
+        if (Kernel32.INSTANCE.ReadFile(pipe, res, res.length, ibr, null)) {
+            return ((res[0] & 0xff) << 8) + (res[1] & 0xff);
+        } else {
+            return 0;
+        }
+    }
+
+    @Override
+    public synchronized void setBackground(Color color) {
         IntByReference ibr = new IntByReference();
         Kernel32.INSTANCE.WriteFile(pipe, new byte[]{CMD_BGCOLOR}, 1, ibr, null);
-        Kernel32.INSTANCE.WriteFile(pipe, new byte[]{(byte)color.getRed(),(byte)color.getGreen(),(byte)color.getBlue()},3,ibr,null);
+        Kernel32.INSTANCE.WriteFile(pipe, new byte[]{(byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()}, 3, ibr, null);
     }
-    
+
     public FlashPlayerPanel(JFrame frame) {
         if (!Platform.isWindows()) {
             throw new FlashUnsupportedException();
@@ -95,7 +128,7 @@ public class FlashPlayerPanel extends Panel {
         hwndFrame.setPointer(Native.getComponentPointer(frame));
 
 
-        pipe = Kernel32.INSTANCE.CreateNamedPipe("\\\\.\\pipe\\ffdec_flashplayer_" + hwnd.getPointer().hashCode(), Kernel32.PIPE_ACCESS_OUTBOUND, Kernel32.PIPE_TYPE_BYTE, 1, 0, 0, 0, null);
+        pipe = Kernel32.INSTANCE.CreateNamedPipe("\\\\.\\pipe\\ffdec_flashplayer_" + hwnd.getPointer().hashCode(), Kernel32.PIPE_ACCESS_DUPLEX, Kernel32.PIPE_TYPE_BYTE, 1, 0, 0, 0, null);
 
 
 
@@ -121,21 +154,19 @@ public class FlashPlayerPanel extends Panel {
         executed = true;
     }
 
-    public synchronized void stopSWF(){
-        displaySWF("-",null);
+    public synchronized void stopSWF() {
+        displaySWF("-", null, 1);
         stopped = true;
     }
 
     public synchronized boolean isStopped() {
         return stopped;
     }
-    public synchronized void displaySWF(String flash){
-        displaySWF(flash, Color.white);
-    }
-    
-    public synchronized void displaySWF(String flash,Color bgColor) {
+
+    public synchronized void displaySWF(String flash, Color bgColor, int frameRate) {
         this.flash = flash;
         repaint();
+        this.frameRate = frameRate;
         if (!executed) {
             execute();
             try {
@@ -143,9 +174,9 @@ public class FlashPlayerPanel extends Panel {
             } catch (InterruptedException ex) {
                 Logger.getLogger(FlashPlayerPanel.class.getName()).log(Level.SEVERE, null, ex);
             }
-        }        
-        if(bgColor!=null){
-            setBackgroundColor(bgColor);
+        }
+        if (bgColor != null) {
+            setBackground(bgColor);
         }
         if (pipe != null) {
             IntByReference ibr = new IntByReference();
@@ -173,4 +204,51 @@ public class FlashPlayerPanel extends Panel {
         }
         super.paint(g);
     }
+
+    @Override
+    public void pause() {
+        IntByReference ibr = new IntByReference();
+        Kernel32.INSTANCE.WriteFile(pipe, new byte[]{CMD_PAUSE}, 1, ibr, null);
+    }
+
+    @Override
+    public void rewind() {
+        IntByReference ibr = new IntByReference();
+        Kernel32.INSTANCE.WriteFile(pipe, new byte[]{CMD_REWIND}, 1, ibr, null);
+    }
+
+    @Override
+    public void play() {
+        IntByReference ibr = new IntByReference();
+        Kernel32.INSTANCE.WriteFile(pipe, new byte[]{CMD_RESUME}, 1, ibr, null);
+    }
+
+    @Override
+    public boolean isPlaying() {
+        IntByReference ibr = new IntByReference();
+        Kernel32.INSTANCE.WriteFile(pipe, new byte[]{CMD_PLAYING}, 1, ibr, null);
+        byte res[] = new byte[1];
+        if (Kernel32.INSTANCE.ReadFile(pipe, res, res.length, ibr, null)) {
+            return res[0] == 1;
+        } else {
+            return false;
+        }
+    }
+
+    @Override
+    public void gotoFrame(int frame) {
+        IntByReference ibr = new IntByReference();
+        Kernel32.INSTANCE.WriteFile(pipe, new byte[]{CMD_GOTO}, 1, ibr, null);
+        Kernel32.INSTANCE.WriteFile(pipe, new byte[]{(byte) ((frame >> 8) & 0xff), (byte) (frame & 0xff)}, 2, ibr, null);
+    }
+
+    @Override
+    public int getFrameRate() {
+        return frameRate;
+    }
+
+    @Override
+    public boolean isLoaded() {
+        return !isStopped();
+    }
 }
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/player/PlayerControls.java b/trunk/src/com/jpexs/decompiler/flash/gui/player/PlayerControls.java
new file mode 100644
index 000000000..c7a3d1b3b
--- /dev/null
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/player/PlayerControls.java
@@ -0,0 +1,181 @@
+/*
+ * Copyright (C) 2013 JPEXS
+ *
+ * This program 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.
+ *
+ * This program 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.jpexs.decompiler.flash.gui.player;
+
+import com.jpexs.decompiler.flash.gui.AppStrings;
+import com.jpexs.decompiler.flash.gui.View;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Insets;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.Timer;
+import java.util.TimerTask;
+import javax.swing.BoxLayout;
+import javax.swing.Icon;
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JProgressBar;
+
+/**
+ *
+ * @author JPEXS
+ */
+public class PlayerControls extends JPanel implements ActionListener {
+
+    private JButton pauseButton;
+    private boolean paused = false;
+    private FlashDisplay display;
+    private JProgressBar progress;
+    private Timer timer;
+    private JLabel timeLabel;
+    private JLabel totalTimeLabel;
+    private static final Icon pauseIcon = View.getIcon("pause16");
+    private static final Icon playIcon = View.getIcon("play16");
+
+    public PlayerControls(final FlashDisplay display) {
+        this.display = display;
+        JPanel controlPanel = new JPanel(new BorderLayout());
+        timeLabel = new JLabel("00:00.00");
+        totalTimeLabel = new JLabel("00:00.00");
+        controlPanel.add(timeLabel, BorderLayout.WEST);
+        controlPanel.add(totalTimeLabel, BorderLayout.EAST);
+        setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
+        JPanel buttonsPanel = new JPanel();
+        buttonsPanel.setLayout(new FlowLayout());
+
+        pauseButton = new JButton(AppStrings.translate("preview.pause"), pauseIcon);
+        pauseButton.setMargin(new Insets(0, 0, 0, 0));
+        pauseButton.setActionCommand("PAUSE");
+        pauseButton.addActionListener(this);
+        JButton stopButton = new JButton(AppStrings.translate("preview.stop"), View.getIcon("stop16"));
+        stopButton.setMargin(new Insets(0, 0, 0, 0));
+        stopButton.setActionCommand("STOP");
+        stopButton.addActionListener(this);
+        buttonsPanel.add(pauseButton);
+        buttonsPanel.add(stopButton);
+        controlPanel.add(buttonsPanel, BorderLayout.CENTER);
+
+        progress = new JProgressBar();
+        Dimension pref = progress.getPreferredSize();
+        pref.height = 20;
+        progress.setPreferredSize(pref);
+        progress.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mousePressed(MouseEvent e) {
+                int frame = e.getX() * display.getTotalFrames() / progress.getWidth();
+                boolean p = paused;
+                display.gotoFrame(frame);
+                if (!p) {
+                    display.play();
+                }
+            }
+        });
+        add(progress);
+        add(controlPanel);
+        timer = new Timer();
+        timer.schedule(new TimerTask() {
+            @Override
+            public void run() {
+                update();
+            }
+        }, 100, 100);
+    }
+
+    private String formatMs(long ms) {
+        long s = ms / 1000;
+        ms = ms % 1000;
+        long m = s / 60;
+        s = s % 60;
+        long h = m / 60;
+        m = m % 60;
+        return "" + (h > 0 ? h + ":" : "") + pad(m) + ":" + pad(s) + "." + pad(ms / 10);
+    }
+
+    private String pad(long t) {
+        String ret = "" + t;
+        while (ret.length() < 2) {
+            ret = "0" + ret;
+        }
+        return ret;
+    }
+
+    private void update() {
+        View.execInEventDispatch(new Runnable() {
+            @Override
+            public void run() {
+                if (!display.isLoaded()) {
+                    return;
+                }
+                int totalFrames = display.getTotalFrames();
+                int currentFrame = display.getCurrentFrame();
+                int frameRate = display.getFrameRate();
+                if (totalFrames == 0) {
+                    progress.setIndeterminate(true);
+                } else {
+                    progress.setMaximum(totalFrames);
+                    progress.setMinimum(0);
+                    progress.setValue(currentFrame);
+                    progress.setIndeterminate(false);
+                }
+                if (frameRate != 0) {
+                    timeLabel.setText(formatMs((currentFrame * 1000) / frameRate));
+                    totalTimeLabel.setText(formatMs((totalFrames * 1000) / frameRate));
+                }
+                if (totalFrames <= 1 && isVisible()) {
+                    setVisible(false);
+                }
+                if (totalFrames > 1 && !isVisible()) {
+                    setVisible(true);
+                }
+                if (display.isPlaying() == paused) {
+                    paused = !paused;
+
+                    if (paused) {
+                        pauseButton.setText(AppStrings.translate("preview.play"));
+                        pauseButton.setIcon(playIcon);
+                    } else {
+                        pauseButton.setText(AppStrings.translate("preview.pause"));
+                        pauseButton.setIcon(pauseIcon);
+                    }
+                }
+            }
+        });
+
+    }
+
+    @Override
+    public void actionPerformed(ActionEvent e) {
+        switch (e.getActionCommand()) {
+            case "PAUSE":
+                if (paused) {
+                    display.play();
+                } else {
+                    display.pause();
+                }
+                break;
+            case "STOP":
+                display.pause();
+                display.rewind();
+                break;
+        }
+    }
+}
diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineFont2Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineFont2Tag.java
index 78f4731ab..5112199b4 100644
--- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineFont2Tag.java
+++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineFont2Tag.java
@@ -354,7 +354,7 @@ public class DefineFont2Tag extends FontTag {
     }
 
     @Override
-    public int getGlyphKerningAdjustment(List<Tag> tags, int glyphIndex,int nextGlyphIndex) {
+    public int getGlyphKerningAdjustment(List<Tag> tags, int glyphIndex, int nextGlyphIndex) {
         char c1 = glyphToChar(tags, glyphIndex);
         char c2 = glyphToChar(tags, nextGlyphIndex);
         int kerningAdjustment = 0;
diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineFont3Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineFont3Tag.java
index 33cdc1d80..31e517e7a 100644
--- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineFont3Tag.java
+++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineFont3Tag.java
@@ -351,9 +351,9 @@ public class DefineFont3Tag extends FontTag {
     public boolean hasLayout() {
         return fontFlagsHasLayout;
     }
-    
+
     @Override
-    public int getGlyphKerningAdjustment(List<Tag> tags, int glyphIndex,int nextGlyphIndex) {
+    public int getGlyphKerningAdjustment(List<Tag> tags, int glyphIndex, int nextGlyphIndex) {
         char c1 = glyphToChar(tags, glyphIndex);
         char c2 = glyphToChar(tags, nextGlyphIndex);
         int kerningAdjustment = 0;
diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineFontTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineFontTag.java
index eebefc521..d24e9a76c 100644
--- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineFontTag.java
+++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineFontTag.java
@@ -267,9 +267,9 @@ public class DefineFontTag extends FontTag {
         }
         return ret;
     }
-    
+
     @Override
-    public int getGlyphKerningAdjustment(List<Tag> tags, int glyphIndex,int nextGlyphIndex) {
+    public int getGlyphKerningAdjustment(List<Tag> tags, int glyphIndex, int nextGlyphIndex) {
         return 0;
     }
 }
diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineText2Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineText2Tag.java
index 6c03857e3..f1a8af380 100644
--- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineText2Tag.java
+++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineText2Tag.java
@@ -326,9 +326,9 @@ public class DefineText2Tag extends TextTag implements DrawableTag {
                         tr.glyphEntries = new GLYPHENTRY[txt.length()];
                         for (int i = 0; i < txt.length(); i++) {
                             char c = txt.charAt(i);
-                            Character nextChar=null;
-                            if(i+1<txt.length()){
-                                nextChar = txt.charAt(i+1);
+                            Character nextChar = null;
+                            if (i + 1 < txt.length()) {
+                                nextChar = txt.charAt(i + 1);
                             }
 
                             if (!font.containsChar(tags, c)) {
@@ -336,7 +336,7 @@ public class DefineText2Tag extends TextTag implements DrawableTag {
                                     return false;
                                 }
                             }
-                            if (nextChar!=null && !font.containsChar(tags, nextChar)) {
+                            if (nextChar != null && !font.containsChar(tags, nextChar)) {
                                 if (!missingCharHandler.handle(font, tags, nextChar)) {
                                     return false;
                                 }
@@ -347,12 +347,12 @@ public class DefineText2Tag extends TextTag implements DrawableTag {
                             int advance;
                             if (font.hasLayout()) {
                                 int kerningAdjustment = 0;
-                                if(nextChar!=null){
+                                if (nextChar != null) {
                                     kerningAdjustment = font.getGlyphKerningAdjustment(tags, tr.glyphEntries[i].glyphIndex, font.charToGlyph(tags, nextChar));
                                 }
-                                advance = (int)Math.round(20.0 * Math.round((double) textHeight * (font.getGlyphAdvance(tr.glyphEntries[i].glyphIndex)+kerningAdjustment) / (font.getDivider() * 1024.0)));
+                                advance = (int) Math.round(20.0 * Math.round((double) textHeight * (font.getGlyphAdvance(tr.glyphEntries[i].glyphIndex) + kerningAdjustment) / (font.getDivider() * 1024.0)));
                             } else {
-                                advance = (int)Math.round(20.0 * FontTag.getSystemFontAdvance(fontName, font.getFontStyle(), textHeight / 20, c,nextChar));
+                                advance = (int) Math.round(20.0 * FontTag.getSystemFontAdvance(fontName, font.getFontStyle(), textHeight / 20, c, nextChar));
                             }
                             tr.glyphEntries[i].glyphAdvance = advance;
 
diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineTextTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineTextTag.java
index 85a3b29df..1bac0e4f2 100644
--- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineTextTag.java
+++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineTextTag.java
@@ -325,9 +325,9 @@ public class DefineTextTag extends TextTag implements DrawableTag {
                         tr.glyphEntries = new GLYPHENTRY[txt.length()];
                         for (int i = 0; i < txt.length(); i++) {
                             char c = txt.charAt(i);
-                            Character nextChar=null;
-                            if(i+1<txt.length()){
-                                nextChar = txt.charAt(i+1);
+                            Character nextChar = null;
+                            if (i + 1 < txt.length()) {
+                                nextChar = txt.charAt(i + 1);
                             }
 
                             if (!font.containsChar(tags, c)) {
@@ -335,7 +335,7 @@ public class DefineTextTag extends TextTag implements DrawableTag {
                                     return false;
                                 }
                             }
-                            if (nextChar!=null && !font.containsChar(tags, nextChar)) {
+                            if (nextChar != null && !font.containsChar(tags, nextChar)) {
                                 if (!missingCharHandler.handle(font, tags, nextChar)) {
                                     return false;
                                 }
@@ -346,12 +346,12 @@ public class DefineTextTag extends TextTag implements DrawableTag {
                             int advance;
                             if (font.hasLayout()) {
                                 int kerningAdjustment = 0;
-                                if(nextChar!=null){
+                                if (nextChar != null) {
                                     kerningAdjustment = font.getGlyphKerningAdjustment(tags, tr.glyphEntries[i].glyphIndex, font.charToGlyph(tags, nextChar));
                                 }
-                                advance = (int)Math.round(20.0 * Math.round((double) textHeight * (font.getGlyphAdvance(tr.glyphEntries[i].glyphIndex)+kerningAdjustment) / (font.getDivider() * 1024.0)));
+                                advance = (int) Math.round(20.0 * Math.round((double) textHeight * (font.getGlyphAdvance(tr.glyphEntries[i].glyphIndex) + kerningAdjustment) / (font.getDivider() * 1024.0)));
                             } else {
-                                advance = (int)Math.round(20.0 * FontTag.getSystemFontAdvance(fontName, font.getFontStyle(), textHeight / 20, c,nextChar));
+                                advance = (int) Math.round(20.0 * FontTag.getSystemFontAdvance(fontName, font.getFontStyle(), textHeight / 20, c, nextChar));
                             }
                             tr.glyphEntries[i].glyphAdvance = advance;
 
diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineVideoStreamTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineVideoStreamTag.java
index 1af4ba70d..d379faa36 100644
--- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineVideoStreamTag.java
+++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineVideoStreamTag.java
@@ -101,6 +101,6 @@ public class DefineVideoStreamTag extends CharacterTag implements BoundedTag {
 
     @Override
     public RECT getRect(HashMap<Integer, CharacterTag> characters, Stack<Integer> visited) {
-        return new RECT(0, 20*width, 0, 20*height);
+        return new RECT(0, 20 * width, 0, 20 * height);
     }
 }
diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/ExportAssetsTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/ExportAssetsTag.java
index e356bb55f..d5d54604e 100644
--- a/trunk/src/com/jpexs/decompiler/flash/tags/ExportAssetsTag.java
+++ b/trunk/src/com/jpexs/decompiler/flash/tags/ExportAssetsTag.java
@@ -40,13 +40,12 @@ public class ExportAssetsTag extends Tag {
     public List<String> names;
     public static final int ID = 56;
 
-    
-    public ExportAssetsTag(){
+    public ExportAssetsTag() {
         super(null, ID, "ExportAssets", new byte[]{}, 0);
         tags = new ArrayList<>();
         names = new ArrayList<>();
     }
-    
+
     /**
      * Constructor
      *
diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/FileAttributesTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/FileAttributesTag.java
index a07945b90..ff5014752 100644
--- a/trunk/src/com/jpexs/decompiler/flash/tags/FileAttributesTag.java
+++ b/trunk/src/com/jpexs/decompiler/flash/tags/FileAttributesTag.java
@@ -37,10 +37,10 @@ public class FileAttributesTag extends Tag {
     private int reserved3;
     public static final int ID = 69;
 
-    public FileAttributesTag(){
+    public FileAttributesTag() {
         super(null, ID, "FileAttributes", new byte[]{}, 0);
     }
-    
+
     public FileAttributesTag(SWF swf, byte data[], int version, long pos) throws IOException {
         super(swf, ID, "FileAttributes", data, pos);
         SWFInputStream sis = new SWFInputStream(new ByteArrayInputStream(data), version);
diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/font/CharacterRanges.java b/trunk/src/com/jpexs/decompiler/flash/tags/font/CharacterRanges.java
index 5d467a930..f1ba4683e 100644
--- a/trunk/src/com/jpexs/decompiler/flash/tags/font/CharacterRanges.java
+++ b/trunk/src/com/jpexs/decompiler/flash/tags/font/CharacterRanges.java
@@ -29,45 +29,44 @@ import java.util.logging.Logger;
  * @author JPEXS
  */
 public class CharacterRanges {
-    
-    
-    public static int rangeCount(){
+
+    public static int rangeCount() {
         return languages.size();
     }
-    
-    public static String rangeName(int index){
+
+    public static String rangeName(int index) {
         return languages.get(index).name;
     }
-    
-    public static int glyphCount(int index){
-        List<Range> ranges=languages.get(index).ranges;
-        int cnt=0;
-        for(Range r:ranges){
-            for(int i=r.from;i<=r.to;i++){
+
+    public static int glyphCount(int index) {
+        List<Range> ranges = languages.get(index).ranges;
+        int cnt = 0;
+        for (Range r : ranges) {
+            for (int i = r.from; i <= r.to; i++) {
                 cnt++;
             }
         }
         return cnt;
     }
-    
-    public static List<String> rangeNames(){
-        List<String> ret=new ArrayList<>();
-        for(int i=0;i<rangeCount();i++){
+
+    public static List<String> rangeNames() {
+        List<String> ret = new ArrayList<>();
+        for (int i = 0; i < rangeCount(); i++) {
             ret.add(rangeName(i));
         }
         return ret;
     }
-    
-    public static int[] rangeCodes(int index){
-        List<Range> ranges=languages.get(index).ranges;
-        List<Integer> ret=new ArrayList<>();
-        for(Range r:ranges){
-            for(int i=r.from;i<=r.to;i++){
+
+    public static int[] rangeCodes(int index) {
+        List<Range> ranges = languages.get(index).ranges;
+        List<Integer> ret = new ArrayList<>();
+        for (Range r : ranges) {
+            for (int i = r.from; i <= r.to; i++) {
                 ret.add(i);
             }
         }
-        int retArr[]=new int[ret.size()];
-        for(int i=0;i<ret.size();i++){
+        int retArr[] = new int[ret.size()];
+        for (int i = 0; i < ret.size(); i++) {
             retArr[i] = ret.get(i);
         }
         return retArr;
@@ -115,18 +114,18 @@ public class CharacterRanges {
     private static final List<Language> languages = new ArrayList<>();
 
     static {
-        BufferedReader br =new BufferedReader(new InputStreamReader(CharacterRanges.class.getResourceAsStream("/com/jpexs/decompiler/flash/tags/font/character_ranges.txt")));
+        BufferedReader br = new BufferedReader(new InputStreamReader(CharacterRanges.class.getResourceAsStream("/com/jpexs/decompiler/flash/tags/font/character_ranges.txt")));
         String s;
         try {
-            while((s=br.readLine())!=null){
-                String parts[]=s.split(":");
-                Language lng=new Language(parts[0]);
+            while ((s = br.readLine()) != null) {
+                String parts[] = s.split(":");
+                Language lng = new Language(parts[0]);
                 String ranges[] = parts[1].split(",");
-                for(String r:ranges){
-                    if(r.contains("-")){
-                        String fromTo[]=r.split("-");
-                        lng.ranges.add(new Range(Integer.parseInt(fromTo[0], 16),Integer.parseInt(fromTo[1], 16)));
-                    }else{
+                for (String r : ranges) {
+                    if (r.contains("-")) {
+                        String fromTo[] = r.split("-");
+                        lng.ranges.add(new Range(Integer.parseInt(fromTo[0], 16), Integer.parseInt(fromTo[1], 16)));
+                    } else {
                         lng.ranges.add(new Range(Integer.parseInt(r, 16)));
                     }
                 }
diff --git a/trunk/src/com/jpexs/decompiler/flash/types/shaperecords/SHAPERECORD.java b/trunk/src/com/jpexs/decompiler/flash/types/shaperecords/SHAPERECORD.java
index b62411aba..af0873a77 100644
--- a/trunk/src/com/jpexs/decompiler/flash/types/shaperecords/SHAPERECORD.java
+++ b/trunk/src/com/jpexs/decompiler/flash/types/shaperecords/SHAPERECORD.java
@@ -841,7 +841,7 @@ public abstract class SHAPERECORD implements Cloneable, NeedsCharacters {
     public static BufferedImage shapeToImage(List<Tag> tags, int shapeNum, FILLSTYLEARRAY fillStyles, LINESTYLEARRAY lineStylesList, List<SHAPERECORD> records, Color defaultColor) {
         String key = "shape_" + records.hashCode() + "_" + (defaultColor == null ? "null" : defaultColor.hashCode());
         if (cache.contains(key)) {
-            return (BufferedImage) ((SerializableImage)cache.get(key)).getImage();
+            return (BufferedImage) ((SerializableImage) cache.get(key)).getImage();
         }
         RECT rect = new RECT();
         List<Path> paths = getPaths(rect, shapeNum, fillStyles, lineStylesList, /*numFillBits, numLineBits,*/ records);
diff --git a/trunk/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java b/trunk/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java
index d3ce0fea8..8bf2540bc 100644
--- a/trunk/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java
+++ b/trunk/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java
@@ -2293,9 +2293,9 @@ public class XFLConverter {
                         fontStyle = font.getFontStyle();
                     }
                     String installedFont;
-                    if((installedFont = FontTag.isFontInstalled(fontName))!=null){
+                    if ((installedFont = FontTag.isFontInstalled(fontName)) != null) {
                         psFontName = new Font(installedFont, fontStyle, 10).getPSName();
-                    }else{
+                    } else {
                         psFontName = fontName;
                     }
                 }
@@ -2450,12 +2450,12 @@ public class XFLConverter {
                         bold = ft.isBold();
                         size = det.fontHeight;
                         fontFace = fontName;
-                        String installedFont=null;
-                        if((installedFont=FontTag.isFontInstalled(fontName))!=null){
+                        String installedFont = null;
+                        if ((installedFont = FontTag.isFontInstalled(fontName)) != null) {
                             fontName = installedFont;
                             fontFace = new Font(installedFont, (italic ? Font.ITALIC : 0) | (bold ? Font.BOLD : 0) | (!italic && !bold ? Font.PLAIN : 0), size < 0 ? 10 : size).getPSName();
-                        }                        
-                        
+                        }
+
                     }
                 }
                 if (det.hasLayout) {
@@ -3178,9 +3178,9 @@ public class XFLConverter {
                                     fontName = ft.getFontName(tags);
                                 }
                                 String installedFont;
-                                if((installedFont = FontTag.isFontInstalled(fontName))!=null){
+                                if ((installedFont = FontTag.isFontInstalled(fontName)) != null) {
                                     fontFace = new Font(installedFont, (italic ? Font.ITALIC : 0) | (bold ? Font.BOLD : 0) | (!italic && !bold ? Font.PLAIN : 0), size < 0 ? 10 : size).getPSName();
-                                }else{
+                                } else {
                                     fontFace = fontName;
                                 }
                                 break;
diff --git a/trunk/src/com/jpexs/helpers/Cache.java b/trunk/src/com/jpexs/helpers/Cache.java
index b35e8b4ba..4ce67f48b 100644
--- a/trunk/src/com/jpexs/helpers/Cache.java
+++ b/trunk/src/com/jpexs/helpers/Cache.java
@@ -151,7 +151,11 @@ public class Cache {
 
                 return;
             }
-            temp.deleteOnExit();
+            try {
+                temp.deleteOnExit();
+            } catch (IllegalStateException iex) {
+                return;
+            }
             try (ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream(temp))) {
                 oos.writeObject(value);
                 oos.flush();
@@ -159,9 +163,8 @@ public class Cache {
                 cacheFiles.put(key, temp);
 
 
-            } catch (IOException ex) {
-                Logger.getLogger(Helper.class
-                        .getName()).log(Level.SEVERE, null, ex);
+            } catch (Exception ex) {
+                //ignore
             }
         } else if (storageType == STORAGE_MEMORY) {
             cacheMemory.put(key, value);
diff --git a/trunk/src/com/sun/jna/platform/win32/Kernel32.java b/trunk/src/com/sun/jna/platform/win32/Kernel32.java
index 1adcee34a..d2cfa5ad3 100644
--- a/trunk/src/com/sun/jna/platform/win32/Kernel32.java
+++ b/trunk/src/com/sun/jna/platform/win32/Kernel32.java
@@ -78,6 +78,8 @@ public interface Kernel32 extends WinNT {
     boolean WriteFile(HANDLE hFile, byte[] lpBuffer, int nNumberOfBytesToWrite,
             IntByReference lpNumberOfBytesWritten,
             WinBase.OVERLAPPED lpOverlapped);
+
+    boolean ReadFile(HANDLE hFile, byte[] lpBuffer, int nNumberOfBytesToRead, IntByReference lpNumberOfBytesRead, WinBase.OVERLAPPED lpOverlapped);
     //
     // Define the NamedPipe definitions
     //