public/openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[sonos] Ignore TRANSITIONING device state when updating channels (#13241)

Browse Source 
* [sonos] Ignore TRANSITIONING device state when updating channels
* Remove TRANSITIONING state option

Signed-off-by: Laurent Garnier <lg.hc@free.fr>
This commit is contained in:
lolodomo
2022-08-11 08:21:39 +02:00
committed by GitHub
parent 92d6f1c6e9
commit 4eb74c45f1
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
bundles/org.openhab.binding.sonos/src/main/java/org/openhab/binding/sonos/internal/handler/ZonePlayerHandler.java
View File

@@ -100,6 +100,7 @@ public class ZonePlayerHandler extends BaseThingHandler implements UpnpIOPartici
private static final String STATE_PLAYING = "PLAYING"; private static final String STATE_PLAYING = "PLAYING";
private static final String STATE_PAUSED_PLAYBACK = "PAUSED_PLAYBACK"; private static final String STATE_PAUSED_PLAYBACK = "PAUSED_PLAYBACK";
private static final String STATE_STOPPED = "STOPPED"; private static final String STATE_STOPPED = "STOPPED";
private static final String STATE_TRANSITIONING = "TRANSITIONING";
private static final String LINEINCONNECTED = "LineInConnected"; private static final String LINEINCONNECTED = "LineInConnected";
private static final String TOSLINEINCONNECTED = "TOSLinkConnected"; private static final String TOSLINEINCONNECTED = "TOSLinkConnected";
@@ -761,7 +762,8 @@ public class ZonePlayerHandler extends BaseThingHandler implements UpnpIOPartici
case STATE: case STATE:
value = getTransportState(); value = getTransportState();
if (value != null) { if (value != null) {
newState = new StringType(value); // Ignoring state TRANSITIONING
newState = STATE_TRANSITIONING.equals(value) ? null : new StringType(value);
} }
break; break;
case CONTROL: case CONTROL:
@@ -772,12 +774,15 @@ public class ZonePlayerHandler extends BaseThingHandler implements UpnpIOPartici
newState = PlayPauseType.PAUSE; newState = PlayPauseType.PAUSE;
} else if (STATE_PAUSED_PLAYBACK.equals(value)) { } else if (STATE_PAUSED_PLAYBACK.equals(value)) {
newState = PlayPauseType.PAUSE; newState = PlayPauseType.PAUSE;
} else if (STATE_TRANSITIONING.equals(value)) {
// Ignoring state TRANSITIONING
newState = null;
} }
break; break;
case STOP: case STOP:
value = getTransportState(); value = getTransportState();
if (value != null) { if (value != null) {
newState = OnOffType.from(STATE_STOPPED.equals(value)); newState = STATE_TRANSITIONING.equals(value) ? null : OnOffType.from(STATE_STOPPED.equals(value));
} }
break; break;
case SHUFFLE: case SHUFFLE:

1
bundles/org.openhab.binding.sonos/src/main/resources/OH-INF/i18n/sonos.properties
View File

@@ -167,7 +167,6 @@ channel-type.sonos.state.description = The State channel contains state of the S
channel-type.sonos.state.state.option.STOPPED = Stopped channel-type.sonos.state.state.option.STOPPED = Stopped
channel-type.sonos.state.state.option.PLAYING = Playing channel-type.sonos.state.state.option.PLAYING = Playing
channel-type.sonos.state.state.option.PAUSED_PLAYBACK = Paused channel-type.sonos.state.state.option.PAUSED_PLAYBACK = Paused
channel-type.sonos.state.state.option.TRANSITIONING = Transitioning
channel-type.sonos.stop.label = Stop channel-type.sonos.stop.label = Stop
channel-type.sonos.stop.description = Stop the Sonos device. ON if the player is stopped. channel-type.sonos.stop.description = Stop the Sonos device. ON if the player is stopped.
channel-type.sonos.subwoofer.label = Subwoofer channel-type.sonos.subwoofer.label = Subwoofer

1
bundles/org.openhab.binding.sonos/src/main/resources/OH-INF/thing/channels.xml
View File

@@ -279,7 +279,6 @@
<option value="STOPPED">Stopped</option> <option value="STOPPED">Stopped</option>
<option value="PLAYING">Playing</option> <option value="PLAYING">Playing</option>
<option value="PAUSED_PLAYBACK">Paused</option> <option value="PAUSED_PLAYBACK">Paused</option>
<option value="TRANSITIONING">Transitioning</option>
</options> </options>
</state> </state>
</channel-type> </channel-type>