Merge pull request #123 from kgoderis/sonos

Fix bugs in playLineIn()
openhab · Feb 7, 2015 · 0795c8d · 0795c8d
2 parents 21c6ea6 + b490af2
commit 0795c8d
Showing 1 changed file with 14 additions and 14 deletions.
diff --git a/...nhab.binding.sonos/src/main/java/org/openhab/binding/sonos/handler/ZonePlayerHandler.java b/...nhab.binding.sonos/src/main/java/org/openhab/binding/sonos/handler/ZonePlayerHandler.java
@@ -1241,25 +1241,25 @@ public void playLineIn(Command command) {
 		if (command != null && command instanceof StringType) {
 
 			String remotePlayerName = command.toString();
-
-			Thing coordinatorThing = thingRegistry.get(new ThingUID(
-					ZONEPLAYER_THING_TYPE_UID, getCoordinator()));
-			ZonePlayerHandler coordinatorHandler = (ZonePlayerHandler) coordinatorThing
-					.getHandler();
+			String coordinatorUDN = getCoordinator();
+			ZonePlayerHandler coordinatorHandler = getHandlerByName(coordinatorUDN);
 			ZonePlayerHandler remoteHandler = getHandlerByName(remotePlayerName);
 
-			// stop whatever is currently playing
-			coordinatorHandler.stop();
+			if(coordinatorHandler!=null && remoteHandler!=null) {
 
-			// set the URI
-			coordinatorHandler.setCurrentURI("x-rincon-stream:"
-					+ remoteHandler.getConfig().get(UDN), "");
+				// stop whatever is currently playing
+				coordinatorHandler.stop();
 
-			// take the system off mute
-			coordinatorHandler.setMute(OnOffType.OFF);
+				// set the URI
+				coordinatorHandler.setCurrentURI("x-rincon-stream:"
+						+ remoteHandler.getConfig().get(UDN), "");
 
-			// start jammin'
-			coordinatorHandler.play();
+				// take the system off mute
+				coordinatorHandler.setMute(OnOffType.OFF);
+
+				// start jammin'
+				coordinatorHandler.play();
+			}
 		}
 	}