LegacyConsoleArchive/jpexs-decompiler
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-09-26 22:50:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed: Flash viewer - StartSoundTag loops

Browse Source
This commit is contained in:
Jindra Petřík
2021-03-24 20:36:42 +01:00
parent 74ca1db915
commit efdcb27963
4 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/timeline/Frame.java
+5 -1
View File
@@ -12,7 +12,8 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library.␍ */
* License along with this library.
*/
package com.jpexs.decompiler.flash.timeline;
import com.jpexs.decompiler.flash.SWF;
@@ -24,6 +25,7 @@ import com.jpexs.decompiler.flash.tags.base.Exportable;
import com.jpexs.decompiler.flash.treeitems.TreeItem;
import com.jpexs.decompiler.flash.types.RGB;
import com.jpexs.decompiler.flash.types.RGBA;
import com.jpexs.decompiler.flash.types.SOUNDINFO;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
@@ -47,6 +49,8 @@ public class Frame implements TreeItem, Exportable {
public List<String> soundClasses = new ArrayList<>();
public List<SOUNDINFO> soundInfos = new ArrayList<>();
public List<DoActionTag> actions = new ArrayList<>();
public List<ASMSourceContainer> actionContainers = new ArrayList<>();
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/timeline/Timeline.java
+8 -2
View File
@@ -54,6 +54,7 @@ import com.jpexs.decompiler.flash.types.CXFORMWITHALPHA;
import com.jpexs.decompiler.flash.types.ColorTransform;
import com.jpexs.decompiler.flash.types.MATRIX;
import com.jpexs.decompiler.flash.types.RECT;
import com.jpexs.decompiler.flash.types.SOUNDINFO;
import com.jpexs.decompiler.flash.types.filters.BlendComposite;
import com.jpexs.decompiler.flash.types.filters.FILTER;
import com.jpexs.helpers.Helper;
@@ -289,9 +290,13 @@ public class Timeline {
} else if (t instanceof StartSoundTag) {
newFrameNeeded = true;
frame.sounds.add(((StartSoundTag) t).soundId);
frame.soundClasses.add(null);
frame.soundInfos.add(((StartSoundTag) t).soundInfo);
} else if (t instanceof StartSound2Tag) {
newFrameNeeded = true;
frame.sounds.add(-1);
frame.soundClasses.add(((StartSound2Tag) t).soundClassName);
frame.soundInfos.add(((StartSoundTag) t).soundInfo);
} else if (t instanceof SetBackgroundColorTag) {
newFrameNeeded = true;
frame.backgroundColor = ((SetBackgroundColorTag) t).backgroundColor;
@@ -1178,10 +1183,11 @@ public class Timeline {
FrameExporter.framesToHtmlCanvas(result, unitDivisor, this, frames, 0, null, 0, displayRect, null, null);
}
public void getSounds(int frame, int time, ButtonTag mouseOverButton, int mouseButton, List<Integer> sounds, List<String> soundClasses) {
public void getSounds(int frame, int time, ButtonTag mouseOverButton, int mouseButton, List<Integer> sounds, List<String> soundClasses, List<SOUNDINFO> soundInfos) {
Frame fr = getFrame(frame);
sounds.addAll(fr.sounds);
soundClasses.addAll(fr.soundClasses);
soundInfos.addAll(fr.soundInfos);
for (int d = maxDepth; d >= 0; d--) {
DepthState ds = fr.layers.get(d);
if (ds != null) {
@@ -1202,7 +1208,7 @@ public class Timeline {
}
}
}
((Timelined) c).getTimeline().getSounds(dframe, time, mouseOverButton, mouseButton, sounds, soundClasses);
((Timelined) c).getTimeline().getSounds(dframe, time, mouseOverButton, mouseButton, sounds, soundClasses, soundInfos);
}
}
}