Media Player Enhancements finished.

Author: eluchsinger

.idea/inspectionProfiles/Project_Default.xml

@@ -24,6 +24,10 @@ public class StaticFileCacheService implements FileCacheService {
 
     private File rootFile = null;
 
+    /**
+     * Workaround: This field marks the cache as "USED".
+     * This is a workaround for the MediaPlayer to detect, if the song was already played.
+     */
     private final AtomicBoolean cacheWasUsed = new AtomicBoolean();
 
     /**

Client/src/main/java/controllers/io/cache/file/StaticFileCacheService.java

@@ -0,0 +1,41 @@
+package controllers.media;
+
+import controllers.io.cache.CacheService;
+import models.songs.Song;
+
+/**
+ * <pre>
+ * Created by Esteban Luchsinger on 24.04.2016.
+ * This <code>MediaPlayer</code> uses a cache as a source for the Media.
+ * </pre>
+ */
+public class CachedMediaPlayer {
+
+    private final CacheService cacheService;
+
+    public CachedMediaPlayer(CacheService cacheService) {
+        this.cacheService = cacheService;
+    }
+
+    /**
+     * Plays a song.
+     * If this song is already cached, it plays it from the cache.
+     * If the song is not yet cached, it will cache it first.
+     * @param song
+     */
+    public void play(Song song) {
+
+    }
+
+    /**
+     * Pauses the current MediaPlayer from playing a song.
+     */
+    public void pause() {
+
+    }
+
+    public void stop() {
+
+    }
+
+}

Client/src/main/java/controllers/media/CachedMediaPlayer.java

@@ -202,7 +202,6 @@ else if(receivedObject instanceof PlayCommand) {
                 }
                 else if(receivedObject instanceof PauseCommand) {
                     this.logger.info("Received PauseCommand");
-                    PauseCommand command = (PauseCommand) receivedObject;
                     this.onPauseCommandReceived();
                 }
                 // A stop command

Client/src/main/java/controllers/networking/streaming/music/tcp/TCPMusicStreamingController.java

@@ -13,13 +13,6 @@
  */
 public interface MediaPlayer<T> {
 
-//    /**
-//     * Plays a track and tries to resume it, if desired.
-//     * @param track Track to play.
-//     * @param tryResume Set this true, if the track should be resumed (only if possible).
-//     */
-//    void play(T track, boolean tryResume);
-
     /**
      * Plays a track.
      * @param track The track to play.

Server/src/main/java/controllers/media/MediaPlayer.java

@@ -1,8 +1,9 @@
 package controllers.media.music;
 
+import controllers.media.MediaPlayer;
 import javafx.beans.property.*;
 import javafx.util.Duration;
-import viewmodels.songs.PlayableSong;
+import models.songs.PlayableSong;
 
 import java.util.List;
 
@@ -12,7 +13,7 @@
  * This is a base class for an audio player. It provides the needed properties.
  * </pre>
  */
-public abstract class BaseAudioPlayer implements controllers.media.MediaPlayer<PlayableSong> {
+public abstract class BaseAudioPlayer implements MediaPlayer<PlayableSong> {
 
     private BooleanProperty isPlaying;
     private ObjectProperty<Duration> currentMediaTime;

Server/src/main/java/controllers/media/music/BaseAudioPlayer.java

@@ -5,10 +5,10 @@
 import javafx.collections.ObservableList;
 import javafx.scene.media.Media;
 import javafx.scene.media.MediaPlayer;
+import models.songs.PlayableSong;
 import models.songs.Song;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import viewmodels.songs.PlayableSong;
 
 import java.io.File;
 import java.io.IOException;

Server/src/main/java/controllers/media/music/NetworkAudioPlayer.java

@@ -25,12 +25,12 @@
 import models.networking.clients.NetworkClient;
 import models.networking.dtos.RenameCommand;
 import models.songs.Mp3Song;
+import models.songs.PlayableMp3Song;
+import models.songs.PlayableSong;
 import models.songs.Song;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import utils.DurationStringConverter;
-import viewmodels.songs.PlayableMp3Song;
-import viewmodels.songs.PlayableSong;
 
 import java.io.Closeable;
 import java.io.File;

Server/src/main/java/viewmodels/MainWindowViewModel.java

@@ -1,7 +1,7 @@
 package viewmodels;
 
 import javafx.scene.control.TableRow;
-import viewmodels.songs.PlayableSong;
+import models.songs.PlayableSong;
 
 /**
  * <pre>

Server/src/main/java/viewmodels/SongTableRow.java

@@ -1,10 +1,9 @@
-package viewmodels.songs;
+package models.songs;
 
 import com.mpatric.mp3agic.InvalidDataException;
 import com.mpatric.mp3agic.UnsupportedTagException;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
-import models.songs.Mp3Song;
 
 import java.io.IOException;