Use MusicPlaybackState instead SpeakerPlaybackState

dvdgeisler · Nov 28, 2022 · 3baf1e3 · 3baf1e3
1 parent fcd7105
commit 3baf1e3
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 28 deletions.
diff --git a/...gera-client-api/src/main/java/de/dvdgeisler/iot/dirigera/client/api/SpeakerDeviceApi.java b/...gera-client-api/src/main/java/de/dvdgeisler/iot/dirigera/client/api/SpeakerDeviceApi.java
@@ -3,11 +3,12 @@
 import de.dvdgeisler.iot.dirigera.client.api.http.ClientApi;
 import de.dvdgeisler.iot.dirigera.client.api.model.device.Device;
 import de.dvdgeisler.iot.dirigera.client.api.model.device.speaker.*;
+import de.dvdgeisler.iot.dirigera.client.api.model.music.MusicPlaybackState;
 import reactor.core.publisher.Mono;
 
 import java.util.Optional;
 
-import static de.dvdgeisler.iot.dirigera.client.api.model.device.speaker.SpeakerPlaybackState.*;
+import static de.dvdgeisler.iot.dirigera.client.api.model.music.MusicPlaybackState.*;
 
 @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
 public class SpeakerDeviceApi extends DefaultDeviceApi<
@@ -44,7 +45,7 @@ public Mono<SpeakerDevice> setVolume(final SpeakerDevice device, final Integer v
                 .flatMap(d -> this.setStateAttribute(d, createStateAttribute(Optional.empty(), Optional.of(volume), Optional.empty())));
     }
 
-    public Mono<SpeakerDevice> setPlayback(final SpeakerDevice device, final SpeakerPlaybackState playbackState) {
+    public Mono<SpeakerDevice> setPlayback(final SpeakerDevice device, final MusicPlaybackState playbackState) {
         return this.assertCapability(device, "playback")
                 .flatMap(d -> this.setStateAttribute(d, createStateAttribute(Optional.empty(), Optional.empty(), Optional.of(playbackState))));
     }
@@ -65,7 +66,7 @@ public Mono<SpeakerDevice> previous(final SpeakerDevice device) {
         return this.setPlayback(device, PREVIOUS);
     }
 
-    private SpeakerStateAttributes createStateAttribute(final Optional<Boolean> isMuted, final Optional<Integer> volume, final Optional<SpeakerPlaybackState> playback) {
+    private SpeakerStateAttributes createStateAttribute(final Optional<Boolean> isMuted, final Optional<Integer> volume, final Optional<MusicPlaybackState> playback) {
         final SpeakerStateAttributes attributes = new SpeakerStateAttributes();
 
         isMuted.ifPresent(b -> attributes.isMuted = b);

diff --git a/...java/de/dvdgeisler/iot/dirigera/client/api/model/device/speaker/SpeakerPlaybackState.java b/...java/de/dvdgeisler/iot/dirigera/client/api/model/device/speaker/SpeakerPlaybackState.java
diff --git a/...va/de/dvdgeisler/iot/dirigera/client/api/model/device/speaker/SpeakerStateAttributes.java b/...va/de/dvdgeisler/iot/dirigera/client/api/model/device/speaker/SpeakerStateAttributes.java
@@ -2,11 +2,13 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import de.dvdgeisler.iot.dirigera.client.api.model.device.DeviceStateAttributes;
+import de.dvdgeisler.iot.dirigera.client.api.model.music.MusicPlaybackState;
+
 import java.time.LocalDateTime;
 
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class SpeakerStateAttributes extends DeviceStateAttributes {
-  public SpeakerPlaybackState playback;
+  public MusicPlaybackState playback;
   public LocalDateTime playbackLastChangedTimestamp;
   public SpeakerAudioAttributes playbackAudio;
   public SpeakerPlaybackPosition playbackPosition;

diff --git a/...i/src/main/java/de/dvdgeisler/iot/dirigera/client/api/model/music/MusicPlaybackState.java b/...i/src/main/java/de/dvdgeisler/iot/dirigera/client/api/model/music/MusicPlaybackState.java
@@ -3,16 +3,16 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 public enum MusicPlaybackState {
-    @JsonProperty("idle")
+    @JsonProperty("playbackIdle")
     IDLE,
-    @JsonProperty("playing")
+    @JsonProperty("playbackPlaying")
     PLAYING,
-    @JsonProperty("paused")
+    @JsonProperty("playbackPaused")
     PAUSED,
-    @JsonProperty("next")
+    @JsonProperty("playbackNext")
     NEXT,
-    @JsonProperty("previous")
+    @JsonProperty("playbackPrevious")
     PREVIOUS,
-    @JsonProperty("buffering")
+    @JsonProperty("playbackBuffering")
     BUFFERING
 }