diff --git a/CHANGELOG.md b/CHANGELOG.md index b484db746..047952cb4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -70,6 +70,7 @@ All notable changes to this project will be documented in this file. - Quotes in tree node parameter values that need them - The label of option "automatic deobfuscation" changed to "deobfuscate code" - SetTabIndex tag moved from others to frames folder +- SWF3 actions split into SWF1, SWF2 and SWF3 actions (in FFDec source code, docs, etc.) ### Removed - Resample wav to 44kHz feature from GUI diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWFInputStream.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWFInputStream.java index 69160e588..936976b87 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWFInputStream.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWFInputStream.java @@ -21,16 +21,16 @@ import com.jpexs.decompiler.flash.action.flashlite.ActionFSCommand2; import com.jpexs.decompiler.flash.action.flashlite.ActionStrictMode; import com.jpexs.decompiler.flash.action.special.ActionEnd; import com.jpexs.decompiler.flash.action.special.ActionUnknown; -import com.jpexs.decompiler.flash.action.swf3.ActionGetURL; +import com.jpexs.decompiler.flash.action.swf1.ActionGetURL; import com.jpexs.decompiler.flash.action.swf3.ActionGoToLabel; -import com.jpexs.decompiler.flash.action.swf3.ActionGotoFrame; -import com.jpexs.decompiler.flash.action.swf3.ActionNextFrame; -import com.jpexs.decompiler.flash.action.swf3.ActionPlay; -import com.jpexs.decompiler.flash.action.swf3.ActionPrevFrame; +import com.jpexs.decompiler.flash.action.swf1.ActionGotoFrame; +import com.jpexs.decompiler.flash.action.swf1.ActionNextFrame; +import com.jpexs.decompiler.flash.action.swf1.ActionPlay; +import com.jpexs.decompiler.flash.action.swf1.ActionPrevFrame; import com.jpexs.decompiler.flash.action.swf3.ActionSetTarget; -import com.jpexs.decompiler.flash.action.swf3.ActionStop; -import com.jpexs.decompiler.flash.action.swf3.ActionStopSounds; -import com.jpexs.decompiler.flash.action.swf3.ActionToggleQuality; +import com.jpexs.decompiler.flash.action.swf1.ActionStop; +import com.jpexs.decompiler.flash.action.swf2.ActionStopSounds; +import com.jpexs.decompiler.flash.action.swf1.ActionToggleQuality; import com.jpexs.decompiler.flash.action.swf3.ActionWaitForFrame; import com.jpexs.decompiler.flash.action.swf4.ActionAdd; import com.jpexs.decompiler.flash.action.swf4.ActionAnd; diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/FSCommandActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/FSCommandActionItem.java index 3191bc369..4764fbe3c 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/FSCommandActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/FSCommandActionItem.java @@ -19,7 +19,7 @@ package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.SourceGeneratorLocalData; import com.jpexs.decompiler.flash.action.model.operations.StringAddActionItem; import com.jpexs.decompiler.flash.action.parser.script.ActionSourceGenerator; -import com.jpexs.decompiler.flash.action.swf3.ActionGetURL; +import com.jpexs.decompiler.flash.action.swf1.ActionGetURL; import com.jpexs.decompiler.flash.action.swf4.ActionGetURL2; import com.jpexs.decompiler.flash.action.swf4.ActionPush; import com.jpexs.decompiler.flash.ecma.Undefined; diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/GetURLActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/GetURLActionItem.java index 7f051dd34..696f99444 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/GetURLActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/GetURLActionItem.java @@ -18,7 +18,7 @@ package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.SourceGeneratorLocalData; import com.jpexs.decompiler.flash.action.parser.script.ActionSourceGenerator; -import com.jpexs.decompiler.flash.action.swf3.ActionGetURL; +import com.jpexs.decompiler.flash.action.swf1.ActionGetURL; import com.jpexs.decompiler.flash.helpers.GraphTextWriter; import com.jpexs.decompiler.graph.CompilationException; import com.jpexs.decompiler.graph.GraphSourceItem; diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/GotoFrame2ActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/GotoFrame2ActionItem.java index 8f9737086..f18d231cb 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/GotoFrame2ActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/GotoFrame2ActionItem.java @@ -19,8 +19,8 @@ package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.SourceGeneratorLocalData; import com.jpexs.decompiler.flash.action.parser.script.ActionSourceGenerator; import com.jpexs.decompiler.flash.action.swf3.ActionGoToLabel; -import com.jpexs.decompiler.flash.action.swf3.ActionGotoFrame; -import com.jpexs.decompiler.flash.action.swf3.ActionPlay; +import com.jpexs.decompiler.flash.action.swf1.ActionGotoFrame; +import com.jpexs.decompiler.flash.action.swf1.ActionPlay; import com.jpexs.decompiler.flash.action.swf4.ActionGotoFrame2; import com.jpexs.decompiler.flash.action.swf4.ActionPush; import com.jpexs.decompiler.flash.ecma.Undefined; diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/GotoFrameActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/GotoFrameActionItem.java index 5c339884a..5e98d43bc 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/GotoFrameActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/GotoFrameActionItem.java @@ -18,7 +18,7 @@ package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.SourceGeneratorLocalData; import com.jpexs.decompiler.flash.action.parser.script.ActionSourceGenerator; -import com.jpexs.decompiler.flash.action.swf3.ActionGotoFrame; +import com.jpexs.decompiler.flash.action.swf1.ActionGotoFrame; import com.jpexs.decompiler.flash.helpers.GraphTextWriter; import com.jpexs.decompiler.graph.CompilationException; import com.jpexs.decompiler.graph.GraphSourceItem; diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/NextFrameActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/NextFrameActionItem.java index 68e911431..6313f5050 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/NextFrameActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/NextFrameActionItem.java @@ -18,7 +18,7 @@ package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.SourceGeneratorLocalData; import com.jpexs.decompiler.flash.action.parser.script.ActionSourceGenerator; -import com.jpexs.decompiler.flash.action.swf3.ActionNextFrame; +import com.jpexs.decompiler.flash.action.swf1.ActionNextFrame; import com.jpexs.decompiler.flash.action.swf4.ActionPush; import com.jpexs.decompiler.flash.ecma.Undefined; import com.jpexs.decompiler.flash.helpers.GraphTextWriter; diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/PlayActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/PlayActionItem.java index decbc69e4..906f2b944 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/PlayActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/PlayActionItem.java @@ -18,7 +18,7 @@ package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.SourceGeneratorLocalData; import com.jpexs.decompiler.flash.action.parser.script.ActionSourceGenerator; -import com.jpexs.decompiler.flash.action.swf3.ActionPlay; +import com.jpexs.decompiler.flash.action.swf1.ActionPlay; import com.jpexs.decompiler.flash.action.swf4.ActionPush; import com.jpexs.decompiler.flash.ecma.Undefined; import com.jpexs.decompiler.flash.helpers.GraphTextWriter; diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/PrevFrameActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/PrevFrameActionItem.java index 20bf9e623..28c05a929 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/PrevFrameActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/PrevFrameActionItem.java @@ -18,7 +18,7 @@ package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.SourceGeneratorLocalData; import com.jpexs.decompiler.flash.action.parser.script.ActionSourceGenerator; -import com.jpexs.decompiler.flash.action.swf3.ActionPrevFrame; +import com.jpexs.decompiler.flash.action.swf1.ActionPrevFrame; import com.jpexs.decompiler.flash.action.swf4.ActionPush; import com.jpexs.decompiler.flash.ecma.Undefined; import com.jpexs.decompiler.flash.helpers.GraphTextWriter; diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/StopActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/StopActionItem.java index 37ebba80b..c5f2a4348 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/StopActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/StopActionItem.java @@ -18,7 +18,7 @@ package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.SourceGeneratorLocalData; import com.jpexs.decompiler.flash.action.parser.script.ActionSourceGenerator; -import com.jpexs.decompiler.flash.action.swf3.ActionStop; +import com.jpexs.decompiler.flash.action.swf1.ActionStop; import com.jpexs.decompiler.flash.action.swf4.ActionPush; import com.jpexs.decompiler.flash.ecma.Undefined; import com.jpexs.decompiler.flash.helpers.GraphTextWriter; diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/StopAllSoundsActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/StopAllSoundsActionItem.java index e4bbf0730..cab88c240 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/StopAllSoundsActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/StopAllSoundsActionItem.java @@ -18,7 +18,7 @@ package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.SourceGeneratorLocalData; import com.jpexs.decompiler.flash.action.parser.script.ActionSourceGenerator; -import com.jpexs.decompiler.flash.action.swf3.ActionStopSounds; +import com.jpexs.decompiler.flash.action.swf2.ActionStopSounds; import com.jpexs.decompiler.flash.action.swf4.ActionPush; import com.jpexs.decompiler.flash.ecma.Undefined; import com.jpexs.decompiler.flash.helpers.GraphTextWriter; diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/ToggleHighQualityActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/ToggleHighQualityActionItem.java index cc02f56ec..4194d449b 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/ToggleHighQualityActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/ToggleHighQualityActionItem.java @@ -18,7 +18,7 @@ package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.SourceGeneratorLocalData; import com.jpexs.decompiler.flash.action.parser.script.ActionSourceGenerator; -import com.jpexs.decompiler.flash.action.swf3.ActionToggleQuality; +import com.jpexs.decompiler.flash.action.swf1.ActionToggleQuality; import com.jpexs.decompiler.flash.action.swf4.ActionPush; import com.jpexs.decompiler.flash.ecma.Undefined; import com.jpexs.decompiler.flash.helpers.GraphTextWriter; diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/UnLoadMovieNumActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/UnLoadMovieNumActionItem.java index 4240edd0e..43b738f55 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/UnLoadMovieNumActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/UnLoadMovieNumActionItem.java @@ -19,7 +19,7 @@ package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.SourceGeneratorLocalData; import com.jpexs.decompiler.flash.action.model.operations.StringAddActionItem; import com.jpexs.decompiler.flash.action.parser.script.ActionSourceGenerator; -import com.jpexs.decompiler.flash.action.swf3.ActionGetURL; +import com.jpexs.decompiler.flash.action.swf1.ActionGetURL; import com.jpexs.decompiler.flash.action.swf4.ActionGetURL2; import com.jpexs.decompiler.flash.action.swf4.ActionPush; import com.jpexs.decompiler.flash.ecma.Undefined; diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/parser/pcode/ASMParser.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/parser/pcode/ASMParser.java index 18ba839f6..99fa4d559 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/parser/pcode/ASMParser.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/parser/pcode/ASMParser.java @@ -26,16 +26,16 @@ import com.jpexs.decompiler.flash.action.special.ActionDeobfuscatePop; import com.jpexs.decompiler.flash.action.special.ActionEnd; import com.jpexs.decompiler.flash.action.special.ActionNop; import com.jpexs.decompiler.flash.action.special.ActionUnknown; -import com.jpexs.decompiler.flash.action.swf3.ActionGetURL; +import com.jpexs.decompiler.flash.action.swf1.ActionGetURL; import com.jpexs.decompiler.flash.action.swf3.ActionGoToLabel; -import com.jpexs.decompiler.flash.action.swf3.ActionGotoFrame; -import com.jpexs.decompiler.flash.action.swf3.ActionNextFrame; -import com.jpexs.decompiler.flash.action.swf3.ActionPlay; -import com.jpexs.decompiler.flash.action.swf3.ActionPrevFrame; +import com.jpexs.decompiler.flash.action.swf1.ActionGotoFrame; +import com.jpexs.decompiler.flash.action.swf1.ActionNextFrame; +import com.jpexs.decompiler.flash.action.swf1.ActionPlay; +import com.jpexs.decompiler.flash.action.swf1.ActionPrevFrame; import com.jpexs.decompiler.flash.action.swf3.ActionSetTarget; -import com.jpexs.decompiler.flash.action.swf3.ActionStop; -import com.jpexs.decompiler.flash.action.swf3.ActionStopSounds; -import com.jpexs.decompiler.flash.action.swf3.ActionToggleQuality; +import com.jpexs.decompiler.flash.action.swf1.ActionStop; +import com.jpexs.decompiler.flash.action.swf2.ActionStopSounds; +import com.jpexs.decompiler.flash.action.swf1.ActionToggleQuality; import com.jpexs.decompiler.flash.action.swf3.ActionWaitForFrame; import com.jpexs.decompiler.flash.action.swf4.ActionAdd; import com.jpexs.decompiler.flash.action.swf4.ActionAnd; diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf3/ActionGetURL.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf1/ActionGetURL.java similarity index 98% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf3/ActionGetURL.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf1/ActionGetURL.java index 2e8d10afd..ccc9e4a1e 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf3/ActionGetURL.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf1/ActionGetURL.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.action.swf3; +package com.jpexs.decompiler.flash.action.swf1; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; @@ -48,7 +48,7 @@ import java.util.Set; * * @author JPEXS */ -@SWFVersion(from = 3) +@SWFVersion(from = 1) public class ActionGetURL extends Action { /** diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf3/ActionGotoFrame.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf1/ActionGotoFrame.java similarity index 98% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf3/ActionGotoFrame.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf1/ActionGotoFrame.java index 32b088413..a2079df15 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf3/ActionGotoFrame.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf1/ActionGotoFrame.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.action.swf3; +package com.jpexs.decompiler.flash.action.swf1; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; @@ -41,7 +41,7 @@ import java.util.Set; * * @author JPEXS */ -@SWFVersion(from = 3) +@SWFVersion(from = 1) public class ActionGotoFrame extends Action { /** diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf3/ActionNextFrame.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf1/ActionNextFrame.java similarity index 97% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf3/ActionNextFrame.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf1/ActionNextFrame.java index 517fa3fe9..5a3b2fdab 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf3/ActionNextFrame.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf1/ActionNextFrame.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.action.swf3; +package com.jpexs.decompiler.flash.action.swf1; import com.jpexs.decompiler.flash.action.Action; import com.jpexs.decompiler.flash.action.DisplayObject; @@ -37,7 +37,7 @@ import java.util.Set; * * @author JPEXS */ -@SWFVersion(from = 3) +@SWFVersion(from = 1) public class ActionNextFrame extends Action { /** diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf3/ActionPlay.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf1/ActionPlay.java similarity index 97% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf3/ActionPlay.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf1/ActionPlay.java index 18077c1f9..8838a8922 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf3/ActionPlay.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf1/ActionPlay.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.action.swf3; +package com.jpexs.decompiler.flash.action.swf1; import com.jpexs.decompiler.flash.action.Action; import com.jpexs.decompiler.flash.action.DisplayObject; @@ -40,7 +40,7 @@ import java.util.Set; * * @author JPEXS */ -@SWFVersion(from = 3) +@SWFVersion(from = 1) public class ActionPlay extends Action { /** diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf3/ActionPrevFrame.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf1/ActionPrevFrame.java similarity index 97% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf3/ActionPrevFrame.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf1/ActionPrevFrame.java index 96a6f202b..6fe3e9605 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf3/ActionPrevFrame.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf1/ActionPrevFrame.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.action.swf3; +package com.jpexs.decompiler.flash.action.swf1; import com.jpexs.decompiler.flash.action.Action; import com.jpexs.decompiler.flash.action.DisplayObject; @@ -37,7 +37,7 @@ import java.util.Set; * * @author JPEXS */ -@SWFVersion(from = 3) +@SWFVersion(from = 1) public class ActionPrevFrame extends Action { /** diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf3/ActionStop.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf1/ActionStop.java similarity index 97% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf3/ActionStop.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf1/ActionStop.java index 40aaf516e..7dc79b05d 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf3/ActionStop.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf1/ActionStop.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.action.swf3; +package com.jpexs.decompiler.flash.action.swf1; import com.jpexs.decompiler.flash.action.Action; import com.jpexs.decompiler.flash.action.DisplayObject; @@ -37,7 +37,7 @@ import java.util.Set; * * @author JPEXS */ -@SWFVersion(from = 3) +@SWFVersion(from = 1) public class ActionStop extends Action { /** diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf3/ActionToggleQuality.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf1/ActionToggleQuality.java similarity index 97% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf3/ActionToggleQuality.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf1/ActionToggleQuality.java index 2cb8e1dfe..93a487f56 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf3/ActionToggleQuality.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf1/ActionToggleQuality.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.action.swf3; +package com.jpexs.decompiler.flash.action.swf1; import com.jpexs.decompiler.flash.action.Action; import com.jpexs.decompiler.flash.action.LocalDataArea; @@ -36,7 +36,7 @@ import java.util.Set; * * @author JPEXS */ -@SWFVersion(from = 3) +@SWFVersion(from = 1) public class ActionToggleQuality extends Action { /** diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf1/package-info.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf1/package-info.java new file mode 100644 index 000000000..f8b1db867 --- /dev/null +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf1/package-info.java @@ -0,0 +1,4 @@ +/** + * SWF 1 actions. + */ +package com.jpexs.decompiler.flash.action.swf1; diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf3/ActionStopSounds.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf2/ActionStopSounds.java similarity index 97% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf3/ActionStopSounds.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf2/ActionStopSounds.java index 3bd91e6d4..311461c3b 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf3/ActionStopSounds.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf2/ActionStopSounds.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.action.swf3; +package com.jpexs.decompiler.flash.action.swf2; import com.jpexs.decompiler.flash.action.Action; import com.jpexs.decompiler.flash.action.LocalDataArea; @@ -36,7 +36,7 @@ import java.util.Set; * * @author JPEXS */ -@SWFVersion(from = 3) +@SWFVersion(from = 2) public class ActionStopSounds extends Action { /** diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf2/package-info.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf2/package-info.java new file mode 100644 index 000000000..197c6b5ff --- /dev/null +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf2/package-info.java @@ -0,0 +1,4 @@ +/** + * SWF 2 actions. + */ +package com.jpexs.decompiler.flash.action.swf2; diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/locales/docs/pcode/AS2.properties b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/locales/docs/pcode/AS2.properties index 99c69bdb3..440d2d84a 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/locales/docs/pcode/AS2.properties +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/locales/docs/pcode/AS2.properties @@ -20,7 +20,7 @@ ui.swfVersion=Since SWF version: #----------------------- Actions action.gotoframe.name=GotoFrame action.gotoframe.code=0x81 -action.gotoframe.swfVersion=3 +action.gotoframe.swfVersion=1 action.gotoframe.shortDescription=Go to frame action.gotoframe.description= action.gotoframe.stackBefore= @@ -28,7 +28,7 @@ action.gotoframe.stackAfter= action.gotoframe.operands=frame:UI16 action.geturl.name=GetURL action.geturl.code=0x83 -action.geturl.swfVersion=3 +action.geturl.swfVersion=1 action.geturl.shortDescription=Get URL action.geturl.description= action.geturl.stackBefore= @@ -36,7 +36,7 @@ action.geturl.stackAfter= action.geturl.operands=urlString:STRING, targetString:STRING action.nextframe.name=NextFrame action.nextframe.code=0x04 -action.nextframe.swfVersion=3 +action.nextframe.swfVersion=1 action.nextframe.shortDescription=Go to next frame action.nextframe.description= action.nextframe.stackBefore= @@ -44,7 +44,7 @@ action.nextframe.stackAfter= action.nextframe.operands= action.prevframe.name=PrevFrame action.prevframe.code=0x05 -action.prevframe.swfVersion=3 +action.prevframe.swfVersion=1 action.prevframe.shortDescription=Go to previous frame action.prevframe.description= action.prevframe.stackBefore= @@ -52,7 +52,7 @@ action.prevframe.stackAfter= action.prevframe.operands= action.play.name=Play action.play.code=0x06 -action.play.swfVersion=3 +action.play.swfVersion=1 action.play.shortDescription=Play action.play.description=Start playing at current frame action.play.stackBefore= @@ -60,7 +60,7 @@ action.play.stackAfter= action.play.operands= action.stop.name=Stop action.stop.code=0x07 -action.stop.swfVersion=3 +action.stop.swfVersion=1 action.stop.shortDescription=Stop action.stop.description=Stop playing at current frame action.stop.stackBefore= @@ -68,7 +68,7 @@ action.stop.stackAfter= action.stop.operands= action.togglequality.name=ToggleQuality action.togglequality.code=0x08 -action.togglequality.swfVersion=3 +action.togglequality.swfVersion=1 action.togglequality.shortDescription=Toggle quality action.togglequality.description=Toggles display quality between high and low action.togglequality.stackBefore= @@ -76,7 +76,7 @@ action.togglequality.stackAfter= action.togglequality.operands= action.stopsounds.name=StopSounds action.stopsounds.code=0x09 -action.stopsounds.swfVersion=3 +action.stopsounds.swfVersion=2 action.stopsounds.shortDescription=Stop sounds action.stopsounds.description=Stop playing all sounds action.stopsounds.stackBefore= diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/locales/docs/pcode/AS2_nl.properties b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/locales/docs/pcode/AS2_nl.properties index c76cbe342..b0bf18da3 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/locales/docs/pcode/AS2_nl.properties +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/locales/docs/pcode/AS2_nl.properties @@ -20,43 +20,43 @@ ui.swfVersion=Sinds SWF-versie: #----------------------- Actions action.gotoframe.name=Ga naar frame action.gotoframe.code=0x81 -action.gotoframe.swfVersion=3 +action.gotoframe.swfVersion=1 action.gotoframe.shortDescription=Ga naar frame action.gotoframe.operands=frame:UI16 action.geturl.name=GetURL action.geturl.code=0x83 -action.geturl.swfVersion=3 +action.geturl.swfVersion=1 action.geturl.shortDescription=Haal URL op action.geturl.stackBefore= action.geturl.operands=urlString:STRING, doelString:STRING action.nextframe.name=VolgendeFrame action.nextframe.code=0x04 -action.nextframe.swfVersion=3 +action.nextframe.swfVersion=1 action.nextframe.shortDescription=Ga naar volgende frame action.nextframe.description= action.prevframe.name=VorigeFrame action.prevframe.code=0x05 -action.prevframe.swfVersion=3 +action.prevframe.swfVersion=1 action.prevframe.shortDescription=Ga naar vorige frame action.prevframe.description= action.play.name=Afspelen action.play.code=0x06 -action.play.swfVersion=3 +action.play.swfVersion=1 action.play.shortDescription=Afspelen action.play.description=Begin met spelen op het huidige frame action.stop.name=Stop action.stop.code=0x07 -action.stop.swfVersion=3 +action.stop.swfVersion=1 action.stop.shortDescription=Stop action.stop.description=Stop met spelen bij het huidige frame action.togglequality.name=SchakelKwaliteit action.togglequality.code=0x08 -action.togglequality.swfVersion=3 +action.togglequality.swfVersion=1 action.togglequality.shortDescription=Schakelkwaliteit action.togglequality.description=Schakelt de weergavekwaliteit tussen hoog en laag action.stopsounds.name=StopGeluiden action.stopsounds.code=0x09 -action.stopsounds.swfVersion=3 +action.stopsounds.swfVersion=2 action.stopsounds.shortDescription=Stop geluiden action.stopsounds.description=Stop met het afspelen van alle geluiden action.waitforframe.name=WachtOpFrame diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/locales/docs/pcode/AS2_tr.properties b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/locales/docs/pcode/AS2_tr.properties index 31f006e68..951ccb3ee 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/locales/docs/pcode/AS2_tr.properties +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/locales/docs/pcode/AS2_tr.properties @@ -20,7 +20,7 @@ ui.swfVersion = SWF s\u00fcr\u00fcm\u00fcnden beri: #----------------------- Actions action.gotoframe.name = \u00c7er\u00e7eveye git action.gotoframe.code = 0x81 -action.gotoframe.swfVersion = 3 +action.gotoframe.swfVersion = 1 action.gotoframe.shortDescription = \u00c7er\u00e7eveye git action.gotoframe.description = action.gotoframe.stackBefore = @@ -28,7 +28,7 @@ action.gotoframe.stackAfter = action.gotoframe.operands = \u00e7er\u00e7eve:UI16 action.geturl.name = URL al action.geturl.code = 0x83 -action.geturl.swfVersion = 3 +action.geturl.swfVersion = 1 action.geturl.shortDescription = URL al action.geturl.description = action.geturl.stackBefore = @@ -36,7 +36,7 @@ action.geturl.stackAfter = action.geturl.operands = urlDizesi:D\u0130ZE, hedefDizesi:D\u0130ZE action.nextframe.name = Sonraki \u00c7er\u00e7eve action.nextframe.code = 0x04 -action.nextframe.swfVersion = 3 +action.nextframe.swfVersion = 1 action.nextframe.shortDescription = Sonraki \u00e7er\u00e7eveye git action.nextframe.description = action.nextframe.stackBefore = @@ -44,7 +44,7 @@ action.nextframe.stackAfter = action.nextframe.operands = action.prevframe.name = \u00d6nceki \u00c7er\u00e7eve action.prevframe.code = 0x05 -action.prevframe.swfVersion = 3 +action.prevframe.swfVersion = 1 action.prevframe.shortDescription = \u00d6nceki \u00e7er\u00e7eveye git action.prevframe.description = action.prevframe.stackBefore = @@ -52,7 +52,7 @@ action.prevframe.stackAfter = action.prevframe.operands = action.play.name = Oynat action.play.code = 0x06 -action.play.swfVersion = 3 +action.play.swfVersion = 1 action.play.shortDescription = Oynat action.play.description = Ge\u00e7erli \u00e7er\u00e7evede oynatmaya ba\u015fla action.play.stackBefore = @@ -60,7 +60,7 @@ action.play.stackAfter = action.play.operands = action.stop.name = Durdur action.stop.code = 0x07 -action.stop.swfVersion = 3 +action.stop.swfVersion = 1 action.stop.shortDescription = Durdur action.stop.description = Ge\u00e7erli \u00e7er\u00e7evede oynatmay\u0131 durdur action.stop.stackBefore = @@ -68,7 +68,7 @@ action.stop.stackAfter = action.stop.operands = action.togglequality.name = Kaliteyi De\u011fi\u015ftir action.togglequality.code = 0x08 -action.togglequality.swfVersion = 3 +action.togglequality.swfVersion = 1 action.togglequality.shortDescription = Kaliteyi de\u011fi\u015ftir action.togglequality.description = G\u00f6r\u00fcnt\u00fc kalitesini y\u00fcksek ve d\u00fc\u015f\u00fck aras\u0131nda de\u011fi\u015ftirir action.togglequality.stackBefore = @@ -76,7 +76,7 @@ action.togglequality.stackAfter = action.togglequality.operands = action.stopsounds.name = Sesleri Durdur action.stopsounds.code = 0x09 -action.stopsounds.swfVersion = 3 +action.stopsounds.swfVersion = 2 action.stopsounds.shortDescription = Sesleri durdur action.stopsounds.description = T\u00fcm sesleri \u00e7almay\u0131 durdur action.stopsounds.stackBefore = diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/locales/docs/pcode/AS2_zh.properties b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/locales/docs/pcode/AS2_zh.properties index 5e90ef27d..42197ef42 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/locales/docs/pcode/AS2_zh.properties +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/locales/docs/pcode/AS2_zh.properties @@ -20,30 +20,30 @@ ui.swfVersion = \u81eaSWF\u7248\u672c\u4ee5\u6765: #----------------------- Actions action.gotoframe.name = GotoFrame action.gotoframe.code = 0x81 -action.gotoframe.swfVersion = 3 +action.gotoframe.swfVersion = 1 action.gotoframe.shortDescription = \u8f6c\u5230\u5e27 action.gotoframe.operands = frame:UI16 action.geturl.name = GetURL action.geturl.code = 0x83 -action.geturl.swfVersion = 3 +action.geturl.swfVersion = 1 action.geturl.shortDescription = \u83b7\u53d6URL action.geturl.operands = urlString:STRING, targetString:STRING action.nextframe.name = NextFrame action.nextframe.code = 0x04 -action.nextframe.swfVersion = 3 +action.nextframe.swfVersion = 1 action.nextframe.shortDescription = \u8f6c\u5230\u4e0b\u4e00\u5e27 action.prevframe.name = PrevFrame action.prevframe.code = 0x05 -action.prevframe.swfVersion = 3 +action.prevframe.swfVersion = 1 action.prevframe.shortDescription = \u8f6c\u5230\u4e0a\u4e00\u5e27 action.play.name = Play action.play.code = 0x06 -action.play.swfVersion = 3 +action.play.swfVersion = 1 action.play.shortDescription = \u64ad\u653e action.play.description = \u4ece\u5f53\u524d\u5e27\u5f00\u59cb\u64ad\u653e action.stop.name = Stop action.stop.code = 0x07 -action.stop.swfVersion = 3 +action.stop.swfVersion = 1 action.stop.shortDescription = \u505c\u6b62\u64ad\u653e action.stop.description = \u5728\u5f53\u524d\u5e27\u505c\u6b62\u64ad\u653e action.stop.stackBefore = @@ -51,14 +51,14 @@ action.stop.stackAfter = action.stop.operands = action.togglequality.name = ToggleQuality action.togglequality.code = 0x08 -action.togglequality.swfVersion = 3 +action.togglequality.swfVersion = 1 action.togglequality.shortDescription = \u5207\u6362\u8d28\u91cf action.togglequality.description = \u5728\u9ad8\u548c\u4f4e\u4e4b\u95f4\u5207\u6362\u663e\u793a\u8d28\u91cf action.togglequality.stackBefore = action.togglequality.stackAfter = action.stopsounds.name = StopSounds action.stopsounds.code = 0x09 -action.stopsounds.swfVersion = 3 +action.stopsounds.swfVersion = 2 action.stopsounds.shortDescription = \u505c\u6b62\u58f0\u97f3 action.stopsounds.description = \u505c\u6b62\u64ad\u653e\u6240\u6709\u58f0\u97f3 action.waitforframe.name = WaitForFrame