Merge branch 'master' into feature-rp-next

src/main/java/device/CDPlayer.java

@@ -37,10 +37,11 @@ public class CDPlayer implements Device {
     }
 
     @Override
-    public void chooseOption(String opt) {
-
+    public String[] getItemList() {
+        return new String[0];
     }
 
+
     @Override
     public String play() {
         return null;

src/main/java/device/Device.java

@@ -8,8 +8,11 @@ public interface Device {
 	void next();
 	void prev();
 	String getInfoText();
+	//returns an array with Method-Names  to bee listed
 	String[] getOptions();
-	void chooseOption(String opt);
+	//returns an array with contents to bee played
+	String[] getItemList();
+
 	String play();
 
 

src/main/java/device/RadioPlayer.java

@@ -70,10 +70,11 @@ public class RadioPlayer implements Device {
     }
 
     @Override
-    public void chooseOption(String opt) {
-
+    public String[] getItemList() {
+        return new String[0];
     }
 
+
     @Override
     public String play() {
         return null;

src/main/java/device/UsbPlayer.java

@@ -58,10 +58,11 @@ public class UsbPlayer implements Device {
     }
 
     @Override
-    public void chooseOption(String opt) {
-
+    public String[] getItemList() {
+        return new String[0];
     }
 
+
     @Override
     public String play() {
         return null;