Implement music on Swing GUI

15 files changed, 96 insertions, 9 deletions

diff --git a/.classpath b/.classpath
index e0c30ac..90df3ec 100644
--- a/.classpath
+++ b/.classpath
@@ -7,5 +7,9 @@
         <classpathentry kind="lib" path="lib/guava-16.0.1.jar"/>
         <classpathentry kind="lib" path="lib/guava-gwt-16.0.1.jar"/>
         <classpathentry kind="lib" path="lib/lombok.jar"/>
+        <classpathentry kind="lib" path="lib/easyogg.jar"/>
+        <classpathentry kind="lib" path="lib/jogg-0.0.7.jar"/>
+        <classpathentry kind="lib" path="lib/jorbis-0.0.15.jar"/>
+        <classpathentry kind="lib" path="lib/startup2.jar"/>
         <classpathentry kind="output" path="war/WEB-INF/classes"/>
 </classpath>
diff --git a/build.xml b/build.xml
index fe7a851..1f76860 100644
--- a/build.xml
+++ b/build.xml
@@ -22,6 +22,10 @@
                 <copy todir="war/WEB-INF/lib" file="lib/guava-16.0.1.jar" />
                 <copy todir="war/WEB-INF/lib" file="lib/guava-gwt-16.0.1.jar" />
                 <copy todir="war/WEB-INF/lib" file="lib/lombok.jar" />
+                <copy todir="war/WEB-INF/lib" file="lib/easyogg.jar" />
+                <copy todir="war/WEB-INF/lib" file="lib/jogg-0.0.7.jar" />
+                <copy todir="war/WEB-INF/lib" file="lib/jorbis-0.0.15.jar" />
+                <copy todir="war/WEB-INF/lib" file="lib/startup2.jar" />
         </target>
 
         <target name="javac" depends="libs" description="Compile java source to bytecode">
diff --git a/lib/easyogg.jar b/lib/easyogg.jar
new file mode 100644
index 0000000..bf70633
--- /dev/null
+++ b/lib/easyogg.jar
diff --git a/lib/jogg-0.0.7.jar b/lib/jogg-0.0.7.jar
new file mode 100644
index 0000000..1cbd1ad
--- /dev/null
+++ b/lib/jogg-0.0.7.jar
diff --git a/lib/jorbis-0.0.15.jar b/lib/jorbis-0.0.15.jar
new file mode 100644
index 0000000..4cf51f9
--- /dev/null
+++ b/lib/jorbis-0.0.15.jar
diff --git a/lib/startup2.jar b/lib/startup2.jar
new file mode 100644
index 0000000..697ed76
--- /dev/null
+++ b/lib/startup2.jar
diff --git a/res/res/snd/END.ogg b/res/res/snd/END.ogg
new file mode 100644
index 0000000..db2b370
--- /dev/null
+++ b/res/res/snd/END.ogg
diff --git a/res/res/snd/FEED_ATHANASE.ogg b/res/res/snd/FEED_ATHANASE.ogg
new file mode 100644
index 0000000..94e8668
--- /dev/null
+++ b/res/res/snd/FEED_ATHANASE.ogg
diff --git a/res/res/snd/FIND_CONSOLE.ogg b/res/res/snd/FIND_CONSOLE.ogg
new file mode 100644
index 0000000..39aee7e
--- /dev/null
+++ b/res/res/snd/FIND_CONSOLE.ogg
diff --git a/res/res/snd/FIND_DISK.ogg b/res/res/snd/FIND_DISK.ogg
new file mode 100644
index 0000000..b852de2
--- /dev/null
+++ b/res/res/snd/FIND_DISK.ogg
diff --git a/res/res/snd/INSTALL_CONSOLE.ogg b/res/res/snd/INSTALL_CONSOLE.ogg
new file mode 100644
index 0000000..fe7a296
--- /dev/null
+++ b/res/res/snd/INSTALL_CONSOLE.ogg
diff --git a/res/res/snd/INTRO.ogg b/res/res/snd/INTRO.ogg
new file mode 100644
index 0000000..da90187
--- /dev/null
+++ b/res/res/snd/INTRO.ogg
diff --git a/res/res/snd/RUN_CONSOLE.ogg b/res/res/snd/RUN_CONSOLE.ogg
new file mode 100644
index 0000000..8c43dd1
--- /dev/null
+++ b/res/res/snd/RUN_CONSOLE.ogg
diff --git a/res/res/snd/WHAT_HAPPENED.ogg b/res/res/snd/WHAT_HAPPENED.ogg
new file mode 100644
index 0000000..0aac689
--- /dev/null
+++ b/res/res/snd/WHAT_HAPPENED.ogg
diff --git a/src/esieequest/view/app/UserInterface.java b/src/esieequest/view/app/UserInterface.java
index facc706..ed8e78f 100644
--- a/src/esieequest/view/app/UserInterface.java
+++ b/src/esieequest/view/app/UserInterface.java
@@ -12,9 +12,12 @@ import java.awt.event.FocusEvent;
 import java.awt.event.FocusListener;
 import java.awt.event.KeyEvent;
 import java.awt.image.BufferedImage;
+import java.io.IOException;
 import java.net.URL;
 import java.util.HashMap;
 import java.util.Map.Entry;
+import java.util.Timer;
+import java.util.TimerTask;
 
 import javax.swing.AbstractAction;
 import javax.swing.JButton;
@@ -28,6 +31,8 @@ import javax.swing.border.EmptyBorder;
 
 import lombok.Getter;
 
+import org.newdawn.easyogg.OggClip;
+
 import com.wordpress.tipsforjava.swing.StretchIcon;
 
 import esieequest.controller.GameEngine;
@@ -54,7 +59,7 @@ abstract class UserInterface implements Viewable, ActionListener {
         private static final String ILLUSTRATION_DIR = "res/frame/";
         private static final String ILLUSTRATION_EXT = ".html";
 
-        private static final String SOUND_DIR = "res/audio/";
+        private static final String SOUND_DIR = "res/snd/";
         private static final String SOUND_EXT = ".ogg";
 
         private GameEngine gameEngine;
@@ -98,6 +103,12 @@ abstract class UserInterface implements Viewable, ActionListener {
         private JButton leftButton;
         private JButton rightButton;
 
+        private final Timer timer;
+        private TimerTask timerTask;
+
+        private OggClip audio;
+        private boolean muted;
+
         /**
          * The default constructor.
          */
@@ -107,6 +118,8 @@ abstract class UserInterface implements Viewable, ActionListener {
                 this.bindKeys();
                 this.bindFocus();
                 this.setControlsState(false);
+                this.timer = new Timer();
+                this.muted = false;
         }
 
         /**
@@ -310,6 +323,20 @@ abstract class UserInterface implements Viewable, ActionListener {
                         });
                 }
 
+                this.layout.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(
+                                KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), KeyEvent.VK_ESCAPE);
+
+                this.layout.getActionMap().put(KeyEvent.VK_ESCAPE, new AbstractAction() {
+
+                        private static final long serialVersionUID = 1L;
+
+                        @Override
+                        public void actionPerformed(final ActionEvent actionEvent) {
+                                UserInterface.this.skipScene();
+                        }
+
+                });
+
         }
 
         /**
@@ -388,7 +415,7 @@ abstract class UserInterface implements Viewable, ActionListener {
          */
         private void setIllustration(final String imageName) {
                 final URL imageURL = this.getClass().getClassLoader().getResource(
-                                imageName + UserInterface.ILLUSTRATION_EXT);
+                                UserInterface.ILLUSTRATION_DIR + imageName + UserInterface.ILLUSTRATION_EXT);
                 final StretchIcon imageIcon;
                 if (imageURL == null) {
                         imageIcon = new StretchIcon(this.generatePlaceholderImage(imageName), true);
@@ -415,6 +442,14 @@ abstract class UserInterface implements Viewable, ActionListener {
         }
 
         /**
+         * Skips the currently player Scene.
+         */
+        private void skipScene() {
+                this.timerTask.run();
+                this.timerTask.cancel();
+        }
+
+        /**
          * Opens the inventory (switches to the inventory tab).
          */
         private void openInventory() {
@@ -448,16 +483,46 @@ abstract class UserInterface implements Viewable, ActionListener {
          *            the URL of the audio file
          */
         private void playAudio(final String fileName) {
-                // TODO Auto-generated method stub
-                // this.echo(Text.NOT_IMPLEMENTED.toString());
+                if (this.audio != null) {
+                        this.audio.stop();
+                        this.audio.close();
+                }
+
+                try {
+                        this.audio = new OggClip(UserInterface.SOUND_DIR + fileName + UserInterface.SOUND_EXT);
+                        this.setAudioGain();
+                        this.audio.play();
+                } catch (final IOException e) {
+                        e.printStackTrace();
+                }
         }
 
         /**
          * Toggles the sound (music).
          */
         private void toggleAudio() {
-                // TODO Auto-generated method stub
-                this.echo(Text.NOT_IMPLEMENTED.toString());
+                this.muted = !this.muted;
+                this.setAudioGain();
+        }
+
+        /**
+         * Sets the gain.
+         * 
+         * FIXME: PulseAudio does not comply with the JSAPI
+         */