Changeset 120

Timestamp:

03/03/07 17:04:47 (2 years ago)

Author:

bfitzpa2

Message:

Fixed music repeating infinitely bug.

Files:

• dmp/trunk/gwt-windows-1.3.3/src/DMP/client/DMPWebsite.java (modified) (2 diffs)
• dmp/trunk/gwt-windows-1.3.3/src/DMP/server/MusicServImpl.java (modified) (2 diffs)

dmp/trunk/gwt-windows-1.3.3/src/DMP/client/DMPWebsite.java

@@ -159 +159 @@
-                                }
-                                HTML flash = new HTML("<object width=\"200\" height=\"25\">" +
-
-
+
+
+
+
-                                                "</embed></object>");
-
-
+
-                                currentMusicDuration = Double.valueOf((String)song.get("duration")).intValue();
-                                if(firstSong)
@@ -207 +208 @@
-                        System.out.println("Playing next song.");
-                        playNextSong();
+                        if(currentMusicDuration == 0)
+                        {
+                                return;
+                        }
-                        this.schedule(currentMusicDuration);
-                }

dmp/trunk/gwt-windows-1.3.3/src/DMP/server/MusicServImpl.java

@@ -10 +10 @@
-import java.util.Vector;
-import java.util.LinkedList;
+import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.zip.DataFormatException;
@@ -245 +246 @@
-                {
-                        musicMov.add(soundGenerator.streamBlock(i, samplesPerBlock));
+                        if(i == numberOfBlocks - 1) // adds a stop action to the last frame of the movie
+                        {
+                                ArrayList<FSAction> actions = new ArrayList<FSAction>();
+                                actions.add(new FSAction(FSAction.Stop));
+                                FSDoAction action = new FSDoAction(actions);
+                                musicMov.add(action);
+                        }
-                        musicMov.add(new FSShowFrame());
-                }
-
+
-                try
-                {