Changeset 163

Timestamp:

03/09/07 00:59:44 (2 years ago)

Author:

bfitzpa2

Message:

Neatened the code and added some (nonfunctional) buttons to the flash movie.

Files:

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

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

@@ -23 +23 @@
-        DeckPanel flashPanel;
-        
-        int currentMusicDuration = 0;
-        Date currentSongStart = null;
-        String testString = "This is a test.";
+        boolean nowPlaying = false;
-        
-        public void onClick(Widget w)
@@ -43 +42 @@
-                        musicServ.addSongToPlaying(song, new AsyncCallback(){
-                                public void onSuccess(Object result)  {
-currentMusicDuration == 0
+!nowPlaying
-                                        {
-                                                playNextSong();
@@ -106 +105 @@
-                // the panel containing the flash movie and html navigation links
-                flashPanel = new DeckPanel();
-                Hyperlink nextSongLink = new Hyperlink("Next Song",false,"");
-                nextSongLink.addClickListener(new ClickListener(){
-                        public void onClick(Widget w)
-                        {
-                                playNextSong();
-                        }
-                });
-                flashPanel.add(nextSongLink);
-                GWT.log(nextSongLink.getElement().toString(), null);
-                SimplePanel placeholder = new SimplePanel();
+                SimplePanel placeholder2 = new SimplePanel();
+                flashPanel.add(placeholder2);
-                flashPanel.add(placeholder); // add a blank panel as a placeholder
-                flashPanel.showWidget(flashPanel.getWidgetIndex(placeholder));
@@ -160 +152 @@
-                };
-                refreshTimer.scheduleRepeating(30000);
-                
-                Timer testPlay = new Timer() {
-                        public void run()
-                        {
-                                playNextSong();
-                        }
-                };
-        }
-        
@@ -172 +157 @@
-        {
-                GWT.log("playNextSong in DMPWebsite", null);
-                final boolean firstSong = (currentMusicDuration == 0);
-                musicServ.getNextSong(new AsyncCallback(){
-                        public void onSuccess(Object result)
-                        {
-                                HashMap song = (HashMap) result;
-
-
-
+
-                                {
-currentMusicDuration = 0
+nowPlaying = false
-                                        Label noSongsLeft = new Label("Click a song to play it.");
-clear(
+remove(flashPanel.getVisibleWidget()
-                                        flashPanel.add(noSongsLeft);
+                                        flashPanel.showWidget(flashPanel.getWidgetIndex(noSongsLeft));
-                                        return;
-                                }
-Widget lastFlash = flashPanel.getWidget(flashPanel.getVisibleWidget()
-lastFlash
-
+String path = (String) song.get("path"
+flashPanel.getVisibleWidget()
+1
-                                                "<param name=\"movie\" value=\"" + path + "\"><PARAM NAME=loop VALUE=\"false\">" + 
-                                                "<PARAM NAME=menu VALUE=\"true\">" +
-                                                "<embed src=\"" + path + 
-
+1
-                                                "</embed></object>");
-                                flashPanel.add(flash);
-                                flashPanel.showWidget(flashPanel.getWidgetIndex(flash)); // make sure we're showing the movie
-
-
-
-
-
-
+
-                                playing.removeSong(song.get("id"));
-                        }
@@ -211 +189 @@
-                                flashPanel.clear();
-                                flashPanel.add(error);
+                                flashPanel.showWidget(flashPanel.getWidgetIndex(error));
-                        }
-                });
@@ -234 +213 @@
-        }
-        
-        private class NextSongTimer extends Timer
-        {
-                public void run()
-                {
-                        System.out.println("Playing next song.");
-                        playNextSong();
-                        if(currentMusicDuration == 0)
-                        {
-                                return;
-                        }
-                        this.schedule(currentMusicDuration);
-                }
-        }
-        
-        /**
-         * Javascript initialization method.

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

@@ -38 +38 @@
-                Vector song = new Vector();
-                song.add(2);
-                serv.testFlashCreation();
-                //System.out.println(serv.getSongsFromCollection());
-        }
@@ -53 +52 @@
-                if(song == null)
-                {
-                        song = new HashMap();
-                        song.put("duration",0);
-                        return song;
-                }
@@ -92 +89 @@
-                        flashFileHandles.remove(song);
-                }
-        }
-        
-        /** Old method, kept for reference.
-         * Makes a flash file from the input song.
-         * @param song the song to make the flash file from
-         */
-        public void makeFlash2(Vector song)
-        {
-                Integer songID = Integer.parseInt(song.get(0).toString());
-                String songURLString = client.getSongURL(songID.intValue());
-                URL songURL;
-                InputStream music;
-                try {
-                        songURL = new URL(songURLString);
-                } catch (MalformedURLException e) {
-                        e.printStackTrace();
-                        return;
-                }
-                try {
-                        music = songURL.openStream();
-                } catch (IOException e) {
-                        e.printStackTrace();
-                        return;
-                }
-                byte[] musicBytes = new byte[5000000];
-                try {
-                        music.read(musicBytes);
-                } catch (IOException e) {
-                        e.printStackTrace();
-                        return;
-                }
-                //makeFlash2(musicBytes,song);
-        }
-        
@@ -190 +155 @@
-        
-        /**
-         * Testing method.
-         */
-        public void testFlashCreation()
-        {
-                File testMusic = new File("C:\\Dransik\\elves.mp3");
-                FileInputStream music;
-                byte[] musicBytes = new byte[new Long(testMusic.length()).intValue()];
-                try {
-                        music = new FileInputStream(testMusic);
-                        music.read(musicBytes);
-                } catch (FileNotFoundException e) {
-                        e.printStackTrace();
-                        return;
-                } catch (IOException e) {
-                        e.printStackTrace();
-                        return;
-                }
-                //System.out.println(makeFlash(musicBytes));
-        }
-        
-        /**
-         * Creates a barebones flash file containing the specified sound file.
-         * @param inputFileName the sound file name
@@ -219 +163 @@
-        {
-                int framesPerSecond = 12;
-
-
-
+
+
-
-                // make the sound
@@ -242 +185 @@
-                }
-                
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                
-                int samplesPerBlock;
@@ -313 +237 @@
-                                ArrayList<FSActionObject> actions = new ArrayList<FSActionObject>();
-                                actions.add(new FSAction(FSAction.Stop));
-xtSongAction
+w FSGetUrl("javascript:nextSong()")
-                                FSDoAction action = new FSDoAction(actions);
-                                musicMov.add(action);
@@ -335 +259 @@
-                }
-        }
+        
+        public boolean makeButton(HashMap<Integer,String> buttonParts, ArrayList<FSActionObject> actions, int xPos, int yPos, int layer, FSMovie movie)
+        {
+//               make the next button
+                FSImageConstructor imageMaker = new FSImageConstructor();
+                FSDefineObject hover;
+                FSDefineObject noHover;
+                FSDefineObject pressed;
+                try {
+                        imageMaker.setImageFromFile(buttonParts.get(FSButton.Over));
+                        hover = imageMaker.defineImage(movie.newIdentifier());
+                        imageMaker.setImageFromFile(buttonParts.get(FSButton.Up));
+                        noHover = imageMaker.defineImage(movie.newIdentifier());
+                        imageMaker.setImageFromFile(buttonParts.get(FSButton.Down));
+                        pressed = imageMaker.defineImage(movie.newIdentifier());
+                } catch (IOException e2) {
+                        e2.printStackTrace();
+                        return false;
+                } catch (DataFormatException e2) {
+                        e2.printStackTrace();
+                        return false;
+                }
+                FSDefineShape3 nextNoHoverShape = imageMaker.defineEnclosingShape(movie.newIdentifier(),
+                                noHover.getIdentifier(), 0, 0, null);
+                FSDefineShape3 nextHoverShape = imageMaker.defineEnclosingShape(movie.newIdentifier(),
+                                hover.getIdentifier(), 0, 0, null);
+                FSDefineShape3 nextPressedShape = imageMaker.defineEnclosingShape(movie.newIdentifier(),
+                                pressed.getIdentifier(), 0, 0, null);
+
+                // make the buttons
+                ArrayList<FSButton> fsButtonParts = new ArrayList<FSButton>();
+                fsButtonParts.add(new FSButton(FSButton.Up, nextNoHoverShape.getIdentifier(), 1));
+                fsButtonParts.add(new FSButton(FSButton.Over, nextHoverShape.getIdentifier(), 2));
+                fsButtonParts.add(new FSButton(FSButton.Down, nextPressedShape.getIdentifier(), 3));
+                fsButtonParts.add(new FSButton(FSButton.Active, nextNoHoverShape.getIdentifier(),4));
+                
+                // define the button and add it to the movie
+                FSDefineButton button = new FSDefineButton(movie.newIdentifier(), 
+                                fsButtonParts, actions);
+                button.setButtonRecords(fsButtonParts);
+                movie.add(hover);
+                movie.add(noHover);
+                movie.add(pressed);
+                movie.add(nextNoHoverShape);
+                movie.add(nextHoverShape);
+                movie.add(nextPressedShape);
+                movie.add(button);
+                movie.add(new FSPlaceObject(button.getIdentifier(), layer, xPos, yPos));
+                
+                return true;
+        }
-}