diff --git a/.idea/artifacts/build.xml b/.idea/artifacts/build.xml new file mode 100644 index 0000000..766ae9c --- /dev/null +++ b/.idea/artifacts/build.xml @@ -0,0 +1,12 @@ + + + $PROJECT_DIR$/out/artifacts/build + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/org_json_json_20150729.xml b/.idea/libraries/org_json_json_20150729.xml new file mode 100644 index 0000000..3f8fd4c --- /dev/null +++ b/.idea/libraries/org_json_json_20150729.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF new file mode 100644 index 0000000..50f6fa6 --- /dev/null +++ b/META-INF/MANIFEST.MF @@ -0,0 +1,4 @@ +Manifest-Version: 1.0 +Class-Path: io.makerforce.undefined +Main-Class: io.makerforce.undefined.Main + diff --git a/Undefined.iml b/Undefined.iml index d5c0743..a74277b 100644 --- a/Undefined.iml +++ b/Undefined.iml @@ -7,6 +7,6 @@ + - - + \ No newline at end of file diff --git a/src/images/srw.png b/src/images/srw.png deleted file mode 100644 index 9bd13ee..0000000 Binary files a/src/images/srw.png and /dev/null differ diff --git a/src/io/makerforce/undefined/Main.java b/src/io/makerforce/undefined/Main.java index f0028de..19306fa 100644 --- a/src/io/makerforce/undefined/Main.java +++ b/src/io/makerforce/undefined/Main.java @@ -38,7 +38,7 @@ public class Main extends Application { Parent root = null; try { - root = FXMLLoader.load(getClass().getResource("view/interface.fxml")); + root = FXMLLoader.load(getClass().getResource("view/interface-test.fxml")); } catch (IOException e) { e.printStackTrace(); System.exit(284); diff --git a/src/io/makerforce/undefined/model/Playlist.java b/src/io/makerforce/undefined/model/Playlist.java new file mode 100644 index 0000000..0c091b7 --- /dev/null +++ b/src/io/makerforce/undefined/model/Playlist.java @@ -0,0 +1,4 @@ +package io.makerforce.undefined.model; + +public class Playlist { +} diff --git a/src/io/makerforce/undefined/model/Track.java b/src/io/makerforce/undefined/model/Track.java new file mode 100644 index 0000000..7cf0870 --- /dev/null +++ b/src/io/makerforce/undefined/model/Track.java @@ -0,0 +1,34 @@ +package io.makerforce.undefined.model; + +import org.json.JSONObject; + +import java.net.MalformedURLException; +import java.net.URL; +import java.util.Spliterator; +import java.util.Spliterators; +import java.util.stream.StreamSupport; + +public class Track { + + private URL file; + private URL picture; + private String artist; + private String album; + private String year; + private int trackNumber; // track.no OR number + private int totalTracks; + private String[] genre; + + public Track(JSONObject track) throws MalformedURLException { + file = new URL(track.getString("file")); + picture = new URL(track.getString("picture")); + artist = track.getString("artist"); + album = track.getString("album"); + year = track.getString("year"); + trackNumber = track.getInt("number"); // track.getJSONObject("track").getInt("no"); + totalTracks = track.getJSONObject("track").getInt("of"); + genre = (String[]) StreamSupport.stream(Spliterators.spliteratorUnknownSize(track.getJSONArray("genre").iterator(), Spliterator.ORDERED), false).toArray(); + } + +} + diff --git a/src/io/makerforce/undefined/view/InterfaceController.java b/src/io/makerforce/undefined/view/InterfaceController.java index 56f411c..53b0146 100644 --- a/src/io/makerforce/undefined/view/InterfaceController.java +++ b/src/io/makerforce/undefined/view/InterfaceController.java @@ -76,7 +76,7 @@ public class InterfaceController { public InterfaceController() { - player = new MediaPlayer(new Media("http://ambrose.makerforce.io/audio.mp3")); + player = new MediaPlayer(new Media("http://ambrose.makerforce.io:8080/tracks/Alan%20Walker/Fade/Fade.mp3")); } @@ -101,6 +101,10 @@ public class InterfaceController { player.muteProperty().bind(muteToggle.selectedProperty()); player.volumeProperty().bind(volumeSlider.valueProperty()); + // Temporary stuff + + currentImage.setImage(new Image("http://ambrose.makerforce.io:8080/art/Alan%20Walker/Fade/1")); + // Player events // Playback status diff --git a/src/io/makerforce/undefined/view/interface.fxml b/src/io/makerforce/undefined/view/interface.fxml index b755337..fb12cc6 100644 --- a/src/io/makerforce/undefined/view/interface.fxml +++ b/src/io/makerforce/undefined/view/interface.fxml @@ -72,10 +72,11 @@ - @@ -133,12 +134,12 @@ - diff --git a/src/io/makerforce/undefined/view/splash.fxml b/src/io/makerforce/undefined/view/splash.fxml index 22cd13e..0d5ed8e 100644 --- a/src/io/makerforce/undefined/view/splash.fxml +++ b/src/io/makerforce/undefined/view/splash.fxml @@ -2,23 +2,26 @@ - + -