Added ability to display the song title and artist on the client.

Author: eluchsinger

Client/src/main/java/controllers/networking/streaming/music/TCPMusicStreamingService.java

@@ -132,7 +132,7 @@ private void listen() {
                     PlayCommand command = (PlayCommand) receivedObject;
                     this.cache.writeData(command.data);
                     this.setCurrentServiceStatus(ServiceStatus.READY);
-                    this.onPlayCommandReceived();
+                    this.onPlayCommandReceived(command.songTitle, command.artist);
                 }
                 else if(receivedObject instanceof StopCommand) {
                     System.out.println("Received StopCommand");
@@ -314,8 +314,8 @@ private void onServiceStatusChanged() {
         }
     }
 
-    private void onPlayCommandReceived() {
-        this.playCommandListeners.forEach(OnPlay::play);
+    private void onPlayCommandReceived(String songTitle, String artist) {
+        this.playCommandListeners.forEach(onPlay -> onPlay.play(songTitle, artist));
     }
 
     private void onStopCommandReceived() {

Client/src/main/java/controllers/networking/streaming/music/callback/OnPlay.java

@@ -1,10 +1,12 @@
 package controllers.networking.streaming.music.callback;
 
+import models.networking.dtos.PlayCommand;
+
 /**
  * Created by Esteban Luchsinger on 17.03.2016.
  * Tells that the song should be played.
  */
 @FunctionalInterface
 public interface OnPlay {
-    void play();
+    void play(String songTitle, String artist);
 }

Client/src/main/java/viewmodels/ClientWindowViewModel.java

@@ -28,9 +28,11 @@ public class ClientWindowViewModel {
 
     @FXML
     private Label labelStatus;
-
     @FXML
-    private StackedAreaChart<Number, Number> statisticsChart;
+    private Label labelSongTitle;
+    @FXML
+    private Label labelArtist;
+
     private Stage stage;
 
     private MediaPlayer mediaPlayer;
@@ -50,7 +52,6 @@ public ClientWindowViewModel() throws IOException {
     protected void initialize() throws IOException {
         this.initializeStreamingService();
         this.initializeDiscoveryService();
-        this.initializeStatistics();
     }
 
     /**
@@ -74,6 +75,9 @@ public void setStage(Stage stage) {
         }
     }
 
+    /**
+     * Starts playing the song in the cache.
+     */
     private void startPlaying() {
         this.stopPlaying();
 
@@ -84,11 +88,17 @@ private void startPlaying() {
         System.out.println("Playing!");
     }
 
+    /**
+     * Stops playing.
+     */
     private void stopPlaying() {
 
         if(this.mediaPlayer != null){
             this.mediaPlayer.stop();
             this.mediaPlayer = null;
+            this.labelSongTitle.setText("");
+            this.labelArtist.setText("");
+            this.labelStatus.setText("STOPPED");
             System.out.println("Stopped!");
         }
     }
@@ -98,16 +108,19 @@ private void initializeStreamingService() {
 
         System.out.print("Starting Streaming Service... ");
 
-        this.musicStreamingService.addServiceStatusChangedListener(newStatus -> {
-            System.out.println("New Status: " + newStatus.name());
-            Platform.runLater(() -> {
-                this.labelStatus.setText(newStatus.name());
-                this.lastStatus = newStatus;
-            });
-        });
+        // Handle onStatusChanged
+        this.musicStreamingService.addServiceStatusChangedListener(newStatus -> System.out.println("New Status: " + newStatus.name()));
+
+        // Handle onPlay message.
+        this.musicStreamingService.addOnPlayListener((songTitle, artist) -> Platform.runLater(() -> {
+            this.labelSongTitle.setText(songTitle);
+            this.labelArtist.setText(artist);
+            this.labelStatus.setText("PLAYING");
+            this.startPlaying();
+        }));
 
-        this.musicStreamingService.addOnPlayListener(this::startPlaying);
-        this.musicStreamingService.addOnStopListener(this::stopPlaying);
+        // Handle onStop
+        this.musicStreamingService.addOnStopListener(() -> Platform.runLater(this::stopPlaying));
 
         System.out.println("Check!");
     }
@@ -127,29 +140,5 @@ private void initializeDiscoveryService() {
         System.out.println("Check!");
     }
 
-    private void initializeStatistics() {
-
-        // IF UDP: Use packets for statistics (0-100%).
-        if(this.musicStreamingService instanceof UDPMusicStreamingService) {
-            System.out.println("Statistics Mode: UDP");
-            NumberAxis axis = ((NumberAxis)this.statisticsChart.getYAxis());
-            axis.setAutoRanging(false);
-            axis.setUpperBound(100);
-            axis.setTickUnit(20);
-
-            axis.setLabel("Empfangene Packete (%)");
-        }
-
-        // IF TCP: Use bytes for statistics (0-x%) --> Open upper-bound.
-        if(this.musicStreamingService instanceof TCPMusicStreamingService) {
-            System.out.println("Statistics Mode: TCP");
-
-            this.statisticsChart.getYAxis().setLabel("Empfangene Bytes (Total)");
-        }
-
-        this.statisticsChart.setData(NetworkStatisticsController.getInstance().getStatisticsList());
-
-    }
-
     //endregion
 }

Client/src/main/resources/views/ClientWindow.fxml

@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.scene.chart.NumberAxis?>
-<?import javafx.scene.chart.StackedAreaChart?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.layout.BorderPane?>
 <?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
 <BorderPane minHeight="400.0" minWidth="600.0" xmlns="http://javafx.com/javafx/null" xmlns:fx="http://javafx.com/fxml/1" fx:controller="viewmodels.ClientWindowViewModel">
@@ -27,14 +26,20 @@
             </HBox>
          </top>
          <center>
-            <StackedAreaChart fx:id="statisticsChart" title="Streaming Statistik" visible="false" BorderPane.alignment="CENTER">
-              <xAxis>
-                <NumberAxis label="Zeit (Sekunden)" side="BOTTOM" />
-              </xAxis>
-              <yAxis>
-                <NumberAxis lowerBound="0" side="LEFT" />
-              </yAxis>
-            </StackedAreaChart>
+            <VBox alignment="CENTER" prefHeight="200.0" prefWidth="100.0" BorderPane.alignment="CENTER">
+               <children>
+                  <Label fx:id="labelSongTitle" alignment="CENTER">
+                     <font>
+                        <Font name="Calibri" size="42.0" />
+                     </font>
+                  </Label>
+                  <Label fx:id="labelArtist" alignment="CENTER">
+                     <font>
+                        <Font name="Calibri" size="42.0" />
+                     </font>
+                  </Label>
+               </children>
+            </VBox>
          </center>
       </BorderPane>
    </center>

Server/src/main/java/controllers/networking/discovery/DiscoveryService.java

@@ -221,15 +221,6 @@ private void discover() {
 
 
                 this.checkExpiredClients();
-//                KeepAliveTask keepAliveTask = new KeepAliveTask(Clients.getInstance().getClients(), CLIENT_TIMEOUT, LocalDateTime.now());
-//                keepAliveTask.run();
-//                List<Client> expiredClients = keepAliveTask.get();
-//
-//                if(expiredClients.size() > 0) {
-//                    System.out.println(expiredClients.size() + " expired clients...");
-//                    this.expiredClient(expiredClients);
-//                }
-
             }
             catch(NullPointerException nullPointerException){
                 Logger.getLogger(this.getClass().getName())

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

@@ -70,11 +70,14 @@ public void play(Song song) {
         try {
             byte[] data = this.getSongData(song);
 
+            String songTitle = song.getTitle();
+            String artist = song.getArtist();
+
             // Sync connections list for the iteration.
             synchronized (this.connections) {
                 for(NetworkClient client: this.connections) {
                     client.getOutputStream()
-                            .writeObject(new PlayCommand(data));
+                            .writeObject(new PlayCommand(songTitle, artist, data));
                 }
             }
         }

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

@@ -236,13 +236,12 @@ private void initializeDiscoveryService() {
         });
 
         // Expired clients
-        this.discoveryService.addClientExpiredListener(client -> {
-            Platform.runLater(() -> {
+        this.discoveryService.addClientExpiredListener(client ->
+                Platform.runLater(() -> {
                 if(this.clientObservableList.remove(client)) {
                     System.out.println("Expired client (" + client.toString() + ")");
                 }
-            });
-        });
+        }));
 
         System.out.println("Starting discovery Service...");
         this.discoveryService.start();

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

@@ -9,9 +9,20 @@
 public class PlayCommand implements Serializable {
     private static final long serialVersionUID = -3809733967947659045L;
 
+    public String songTitle;
+    public String artist;
     public byte[] data;
 
-    public PlayCommand(byte[] data) {
+
+
+    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;
+        this.artist = artist;
         this.data = data;
     }
 }