OpenHAB
/
openhab-core
mirror of https://github.com/openhab/openhab-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

{voice] say: log something when the audio sink cannot be found (#1018) 

Signed-off-by: Laurent Garnier <lg.hc@free.fr>
pull/1023/head
lolodomo 2019-09-02 17:13:33 +02:00 committed by Kai Kreuzer
parent 4ccaa8b38e
commit f2d69139e1
1 changed files with 43 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/internal/VoiceManagerImpl.java
View File

@ -206,54 +206,53 @@ public class VoiceManagerImpl implements VoiceManager, ConfigOptionProvider {
}
Set<AudioFormat> audioFormats = tts.getSupportedFormats();
AudioSink sink = audioManager.getSink(sinkId);
if (sink == null) {
throw new TTSException("Unable to find the audio sink " + sinkId);
}
if (sink != null) {
AudioFormat audioFormat = getBestMatch(audioFormats, sink.getSupportedFormats());
if (audioFormat != null) {
AudioStream audioStream = tts.synthesize(text, voice, audioFormat);
AudioFormat audioFormat = getBestMatch(audioFormats, sink.getSupportedFormats());
if (audioFormat == null) {
throw new TTSException("No compatible audio format found for TTS '" + tts.getId() + "' and sink '"
+ sink.getId() + "'");
}
if (sink.getSupportedStreams().stream().anyMatch(clazz -> clazz.isInstance(audioStream))) {
PercentType oldVolume = null;
try {
// get current volume
oldVolume = audioManager.getVolume(sinkId);
} catch (IOException e) {
logger.debug("An exception occurred while getting the volume of sink '{}' : {}",
sink.getId(), e.getMessage(), e);
}
// set notification sound volume
if (volume != null) {
try {
audioManager.setVolume(volume, sinkId);
} catch (IOException e) {
logger.debug("An exception occurred while setting the volume of sink '{}' : {}",
sink.getId(), e.getMessage(), e);
}
}
try {
sink.process(audioStream);
} catch (UnsupportedAudioFormatException | UnsupportedAudioStreamException e) {
logger.warn("Error saying '{}': {}", text, e.getMessage(), e);
} finally {
if (volume != null && oldVolume != null) {
// restore volume only if it was set before
try {
audioManager.setVolume(oldVolume, sinkId);
} catch (IOException e) {
logger.debug("An exception occurred while setting the volume of sink '{}' : {}",
sink.getId(), e.getMessage(), e);
}
}
}
} else {
logger.warn("Failed playing audio stream '{}' as audio sink doesn't support it.", audioStream);
}
} else {
logger.warn("No compatible audio format found for TTS '{}' and sink '{}'", tts.getId(),
sink.getId());
AudioStream audioStream = tts.synthesize(text, voice, audioFormat);
if (!sink.getSupportedStreams().stream().anyMatch(clazz -> clazz.isInstance(audioStream))) {
throw new TTSException(
"Failed playing audio stream '" + audioStream + "' as audio sink doesn't support it");
}
PercentType oldVolume = null;
try {
// get current volume
oldVolume = audioManager.getVolume(sinkId);
} catch (IOException e) {
logger.debug("An exception occurred while getting the volume of sink '{}' : {}", sink.getId(),
e.getMessage(), e);
}
// set notification sound volume
if (volume != null) {
try {
audioManager.setVolume(volume, sinkId);
} catch (IOException e) {
logger.debug("An exception occurred while setting the volume of sink '{}' : {}", sink.getId(),
e.getMessage(), e);
}
}
} catch (TTSException e) {
try {
sink.process(audioStream);
} finally {
if (volume != null && oldVolume != null) {
// restore volume only if it was set before
try {
audioManager.setVolume(oldVolume, sinkId);
} catch (IOException e) {
logger.debug("An exception occurred while setting the volume of sink '{}' : {}", sink.getId(),
e.getMessage(), e);
}
}
}
} catch (TTSException | UnsupportedAudioFormatException | UnsupportedAudioStreamException e) {
logger.warn("Error saying '{}': {}", text, e.getMessage(), e);
}
}