Implemented first trivial synchronization mechanisms.

Author: eluchsinger

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

@@ -21,7 +21,6 @@ public class StaticFileCacheService implements FileCacheService {
 
     private File rootFile = null;
 
-
     /**
      * Default constructor
      * @throws IOException

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

@@ -9,6 +9,7 @@
 import controllers.networking.streaming.music.callback.OnRename;
 import controllers.networking.streaming.music.callback.OnStop;
 import models.clients.Server;
+import models.networking.dtos.CacheSongCommand;
 import models.networking.dtos.PlayCommand;
 import models.networking.dtos.RenameCommand;
 import models.networking.dtos.StopCommand;
@@ -187,18 +188,25 @@ private void listen() {
                 Object receivedObject;
                 receivedObject = this.objectInputStream.readObject();
 
-                // If it's a play command.
-                if(receivedObject instanceof PlayCommand) {
-                    this.logger.info("Received PlayCommand");
-                    PlayCommand command = (PlayCommand) receivedObject;
+                // If it's a cache song command.
+                if(receivedObject instanceof CacheSongCommand) {
+                    this.logger.info("Received CacheSongCommand");
+                    CacheSongCommand command = (CacheSongCommand) receivedObject;
                     this.cache.writeData(command.data);
                     this.setCurrentServiceStatus(ServiceStatus.READY);
-                    this.onPlayCommandReceived(command.songTitle, command.artist);
                 }
+                // A play command
+                else if(receivedObject instanceof PlayCommand) {
+                    this.logger.info("Received PlayCommand");
+                    PlayCommand command = (PlayCommand) receivedObject;
+                    this.onPlayCommandReceived(command.title, command.artist);
+                }
+                // A stop command
                 else if(receivedObject instanceof StopCommand) {
                     this.logger.info("Received StopCommand");
                     this.onStopCommandReceived();
                 }
+                // A rename command
                 else if(receivedObject instanceof RenameCommand) {
                     this.logger.info("Received RenameCommand");
 

Server/src/main/java/controllers/networking/streaming/music/tcp/TCPMusicStreamController.java

@@ -3,6 +3,7 @@
 import controllers.clients.ClientController;
 import controllers.networking.streaming.music.MusicStreamController;
 import models.networking.clients.NetworkClient;
+import models.networking.dtos.CacheSongCommand;
 import models.networking.dtos.PlayCommand;
 import models.networking.dtos.StopCommand;
 import models.songs.Song;
@@ -52,13 +53,21 @@ public TCPMusicStreamController(ClientController clientController) {
     public void play(Song song) throws IOException {
         byte[] songData = SongUtils.getSongData(song);
 
-        PlayCommand playCommand = new PlayCommand(song.getTitle(), song.getArtist(), songData);
+        CacheSongCommand cacheSongCommand = new CacheSongCommand(songData);
+        PlayCommand playCommand = new PlayCommand(song.getTitle(), song.getArtist());
 
+        // First send the cache song command to make the clients ready.
         for(NetworkClient client : this.clientController.getClients()) {
-            client.send(playCommand);
+            client.send(cacheSongCommand);
         }
 
+        // Then wait for the clients until they all received the song completely.
         this.waitForClientsReceived();
+
+        // Then send all clients the play command.
+        for(NetworkClient client : this.clientController.getClients()) {
+            client.send(playCommand);
+        }
     }
 
     /**
@@ -70,7 +79,6 @@ public void stop() {
         for(NetworkClient client : this.clientController.getClients()) {
             client.send(stopCommand);
         }
-        this.waitForClientsReceived();
     }
 
     /**

Shared/src/main/java/models/networking/dtos/CacheSongCommand.java

@@ -0,0 +1,15 @@
+package models.networking.dtos;
+
+import java.io.Serializable;
+
+/**
+ * Created by Esteban Luchsinger on 08.04.2016.
+ * The cache command tells the client to cache the song. (Not start playing!)
+ */
+public class CacheSongCommand implements Serializable {
+    private static final long serialVersionUID = 2322268523175827924L;
+
+    public byte[] data;
+
+    public CacheSongCommand(byte[] data) { this.data = data; }
+}

Shared/src/main/java/models/networking/dtos/PlayCommand.java

@@ -9,18 +9,11 @@
 public class PlayCommand implements Serializable {
     private static final long serialVersionUID = -3809733967947659045L;
 
-    public String songTitle;
-    public String artist;
-    public byte[] data;
+    public final String title;
+    public final String artist;
 
-    public PlayCommand(byte[] data) { this("", "", data); }
-
-    public PlayCommand(String songTitle, byte[] data) { this(songTitle, "", data); }
-
-    public PlayCommand(String songTitle, String artist, byte[] data) {
-
-        this.songTitle = songTitle;
+    public PlayCommand(String title, String artist) {
+        this.title = title;
         this.artist = artist;
-        this.data = data;
     }
 }