bartek/android-tts-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace original vmichalak sonos-controller with custom fork

Browse Source 
The custom fork is able to control also the volume
of announcement, which is desired feature.
This commit is contained in:
Bartłomiej Przemysław Pluta
2020-05-16 12:41:34 +02:00
parent 749be67b72
commit 4c549dd0d5
2 changed files with 4 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@@ -34,7 +34,7 @@ dependencies {
implementation 'org.nanohttpd:nanohttpd:2.2.0' implementation 'org.nanohttpd:nanohttpd:2.2.0'
implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0' implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
implementation 'androidx.preference:preference:1.1.1' 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:2.15'
implementation 'com.google.dagger:dagger-android-support:2.15' implementation 'com.google.dagger:dagger-android-support:2.15'
kapt 'com.google.dagger:dagger-android-processor:2.15' kapt 'com.google.dagger:dagger-android-processor:2.15'

23
app/src/main/java/io/bartek/ttsserver/core/sonos/worker/SonosWorker.kt
View File

@@ -1,12 +1,10 @@
package io.bartek.ttsserver.core.sonos.worker package io.bartek.ttsserver.core.sonos.worker
import com.vmichalak.sonoscontroller.SonosDevice
import com.vmichalak.sonoscontroller.SonosDiscovery 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.tts.engine.TTSEngine
import io.bartek.ttsserver.core.web.dto.SonosDTO 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 import java.util.concurrent.BlockingQueue
class SonosWorker( class SonosWorker(
@@ -29,21 +27,6 @@ class SonosWorker(
val file = tts.createTTSFile(data.text, data.language) val file = tts.createTTSFile(data.text, data.language)
val filename = file.name val filename = file.name
val url = "http://$host:$port/sonos/$filename" 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()
}
}
} }