diff --git a/app/build.gradle b/app/build.gradle index 810bd8d..991b02b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -34,7 +34,7 @@ dependencies { implementation 'org.nanohttpd:nanohttpd:2.2.0' implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0' implementation 'androidx.preference:preference:1.1.1' - implementation 'com.github.vmichalak:sonos-controller:v.0.1' + implementation 'com.github.bartlomiej-pluta:sonos-controller:master' implementation 'com.google.dagger:dagger-android:2.15' implementation 'com.google.dagger:dagger-android-support:2.15' kapt 'com.google.dagger:dagger-android-processor:2.15' diff --git a/app/src/main/java/io/bartek/ttsserver/core/sonos/worker/SonosWorker.kt b/app/src/main/java/io/bartek/ttsserver/core/sonos/worker/SonosWorker.kt index 8ceabeb..8a808d2 100644 --- a/app/src/main/java/io/bartek/ttsserver/core/sonos/worker/SonosWorker.kt +++ b/app/src/main/java/io/bartek/ttsserver/core/sonos/worker/SonosWorker.kt @@ -1,12 +1,10 @@ package io.bartek.ttsserver.core.sonos.worker -import com.vmichalak.sonoscontroller.SonosDevice import com.vmichalak.sonoscontroller.SonosDiscovery -import com.vmichalak.sonoscontroller.model.PlayState -import io.bartek.ttsserver.service.foreground.ForegroundService -import io.bartek.ttsserver.service.state.ServiceState import io.bartek.ttsserver.core.tts.engine.TTSEngine import io.bartek.ttsserver.core.web.dto.SonosDTO +import io.bartek.ttsserver.service.foreground.ForegroundService +import io.bartek.ttsserver.service.state.ServiceState import java.util.concurrent.BlockingQueue class SonosWorker( @@ -29,21 +27,6 @@ class SonosWorker( val file = tts.createTTSFile(data.text, data.language) val filename = file.name val url = "http://$host:$port/sonos/$filename" - it.announce(url, data.volume) + it.clip(url, data.volume, "") } - - private fun SonosDevice.announce(url: String, volume: Int) { - val currentPlayState = this.playState - val currentVolume = this.volume - - this.stop() - this.volume = volume - this.clip(url, "") - - this.volume = currentVolume - when(currentPlayState) { - PlayState.PLAYING -> this.play() - else -> this.stop() - } - } } \ No newline at end of file