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

[voice ]Only call getVolume when necessary (#3280) 

Signed-off-by: Jimmy Tanagra <jcode@tanagra.id.au>
pull/3284/head
jimtng 2022-12-29 21:19:45 +10:00 committed by GitHub
parent a3dc57784a
commit ab96a6ba55
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/internal/AudioManagerImpl.java
View File

@ -123,17 +123,18 @@ public class AudioManagerImpl implements AudioManager, ConfigOptionProvider {
AudioSink sink = getSink(sinkId); AudioSink sink = getSink(sinkId);
if (sink != null) { if (sink != null) {
PercentType oldVolume = null; PercentType oldVolume = null;
try {
// get current volume
oldVolume = 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 // set notification sound volume
if (volume != null) { if (volume != null) {
try { try {
setVolume(volume, sinkId); // get current volume
oldVolume = sink.getVolume();
} catch (IOException e) {
logger.debug("An exception occurred while getting the volume of sink '{}' : {}", sink.getId(),
e.getMessage(), e);
}
try {
sink.setVolume(volume);
} catch (IOException e) { } catch (IOException e) {
logger.debug("An exception occurred while setting the volume of sink '{}' : {}", sink.getId(), logger.debug("An exception occurred while setting the volume of sink '{}' : {}", sink.getId(),
e.getMessage(), e); e.getMessage(), e);
@ -147,7 +148,7 @@ public class AudioManagerImpl implements AudioManager, ConfigOptionProvider {
if (volume != null && oldVolume != null) { if (volume != null && oldVolume != null) {
// restore volume only if it was set before // restore volume only if it was set before
try { try {
setVolume(oldVolume, sinkId); sink.setVolume(oldVolume);
} catch (IOException e) { } catch (IOException e) {
logger.debug("An exception occurred while setting the volume of sink '{}' : {}", sink.getId(), logger.debug("An exception occurred while setting the volume of sink '{}' : {}", sink.getId(),
e.getMessage(), e); e.getMessage(), e);

19
bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/internal/VoiceManagerImpl.java
View File

@ -255,17 +255,18 @@ public class VoiceManagerImpl implements VoiceManager, ConfigOptionProvider, Dia
} }
PercentType oldVolume = null; 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 // set notification sound volume
if (volume != null) { if (volume != null) {
try { try {
audioManager.setVolume(volume, sinkId); // get current volume
oldVolume = sink.getVolume();
} catch (IOException e) {
logger.debug("An exception occurred while getting the volume of sink '{}' : {}", sink.getId(),
e.getMessage(), e);
}
try {
sink.setVolume(volume);
} catch (IOException e) { } catch (IOException e) {
logger.debug("An exception occurred while setting the volume of sink '{}' : {}", sink.getId(), logger.debug("An exception occurred while setting the volume of sink '{}' : {}", sink.getId(),
e.getMessage(), e); e.getMessage(), e);
@ -277,7 +278,7 @@ public class VoiceManagerImpl implements VoiceManager, ConfigOptionProvider, Dia
if (volume != null && oldVolume != null) { if (volume != null && oldVolume != null) {
// restore volume only if it was set before // restore volume only if it was set before
try { try {
audioManager.setVolume(oldVolume, sinkId); sink.setVolume(oldVolume);
} catch (IOException e) { } catch (IOException e) {
logger.debug("An exception occurred while setting the volume of sink '{}' : {}", sink.getId(), logger.debug("An exception occurred while setting the volume of sink '{}' : {}", sink.getId(),
e.getMessage(), e); e.getMessage(), e);