diff --git a/GrooveGator/.settings/org.eclipse.jdt.core.prefs b/GrooveGator/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..bbcbc93
--- /dev/null
+++ b/GrooveGator/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,5 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/GrooveGator/.settings/org.eclipse.m2e.core.prefs b/GrooveGator/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..14b697b
--- /dev/null
+++ b/GrooveGator/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/GrooveGator/pom.xml b/GrooveGator/pom.xml
index 733f13a..7eef40e 100644
--- a/GrooveGator/pom.xml
+++ b/GrooveGator/pom.xml
@@ -2,7 +2,7 @@
4.0.0
GrooveGator
0.0.3-SNAPSHOT
- Groove Gator
+ GrooveGator
An Open Source Java Grooveshark Downloader
src
@@ -23,34 +23,35 @@
1.7
-
- maven-assembly-plugin
-
-
-
- com.josephliccini.groovegator.GrooveGator
-
-
-
- jar-with-dependencies
-
-
-
-
- make-assembly
- package
-
- single
-
-
-
-
-
-
+
+ maven-assembly-plugin
+
+
+
+ com.josephliccini.groovegator.GrooveGator
+
+
+
+ jar-with-dependencies
+
+
+
+
+ make-assembly
+ package
+
+ single
+
+
+
+
+
+
http://www.github.com/josephliccini/groovegator
- 6/1/14
+ 2014
Joseph Liccini
+ www.github.com/josephliccini
@@ -73,6 +74,11 @@
GrooveAPI
1.0
+
+ javazoom
+ jlayer
+ 1.0.1
+
GrooveGator
\ No newline at end of file
diff --git a/GrooveGator/src/com/josephliccini/groovegator/GrooveGator.java b/GrooveGator/src/com/josephliccini/groovegator/GrooveGator.java
index 71b3f9d..b69ba48 100644
--- a/GrooveGator/src/com/josephliccini/groovegator/GrooveGator.java
+++ b/GrooveGator/src/com/josephliccini/groovegator/GrooveGator.java
@@ -12,14 +12,9 @@
import java.nio.channels.Channels;
import java.nio.channels.ReadableByteChannel;
import java.util.Vector;
-import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.prefs.Preferences;
-import javafx.embed.swing.JFXPanel;
-import javafx.scene.media.Media;
-import javafx.scene.media.MediaPlayer;
-
import javax.swing.BorderFactory;
import javax.swing.ImageIcon;
import javax.swing.JButton;
@@ -47,6 +42,8 @@
import javax.swing.table.DefaultTableModel;
import javax.swing.table.TableColumn;
+import javazoom.jl.decoder.JavaLayerException;
+import javazoom.jl.player.advanced.AdvancedPlayer;
import net.miginfocom.swing.MigLayout;
import com.scilor.grooveshark.API.Base.GroovesharkAudioStream;
@@ -69,7 +66,6 @@ public class GrooveGator extends JFrame
private static AtomicInteger percentageDivisor;
private String version = "v0.3";
final URL beep = getClass().getResource("/beep.mp3");
- MediaPlayer mediaPlayer;
private static AtomicInteger displayPercentage;
JTabbedPane tabbedPane;
@@ -128,21 +124,13 @@ public class GrooveGator extends JFrame
public static void main(String[] args)
{
- final CountDownLatch latch = new CountDownLatch(1);
SwingUtilities.invokeLater(new Runnable()
{
public void run()
{
- new JFXPanel();
- latch.countDown();
createAndShowGUI();
}
});
- try {
- latch.await();
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
}
private static void createAndShowGUI()
@@ -165,7 +153,6 @@ private static void createAndShowGUI()
public GrooveGator(String s)
{
super(s);
- mediaPlayer = new MediaPlayer(new Media(beep.toString()));
prefs = Preferences.userRoot().node(this.getClass().getName());
tabbedPane = new JTabbedPane();
@@ -415,6 +402,7 @@ public boolean isCellEditable(int rowIndex, int colIndex)
};
+
for(int i = 0; i < 5; ++i)
{
TableColumn column = table.getColumnModel().getColumn(i);
@@ -488,9 +476,19 @@ private void playlistToSearch(int playlistId)
private void beep()
{
- mediaPlayer.play();
- mediaPlayer.seek(mediaPlayer.getStartTime());
- //mediaPlayer.pause();
+ SwingUtilities.invokeLater( new Runnable()
+ {
+ public void run()
+ {
+ AdvancedPlayer player;
+ try {
+ player = new AdvancedPlayer(beep.openStream());
+ player.play();
+ } catch (JavaLayerException | IOException e) {
+ e.printStackTrace();
+ }
+ }
+ });
}
private class ConfigureSettingsMenuItemListener implements ActionListener