mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-09-02 10:21:10 +02:00
Merge branch 'check/next-cc'
Compiles on most platforms, starts. Not really tested.
This commit is contained in:
@@ -126,11 +126,6 @@ void CVolume::setVolume(const neutrino_msg_t key)
|
||||
hideVolscale();
|
||||
if (do_vol) {
|
||||
CAudioMute::getInstance()->AudioMute(false, true);
|
||||
if (mode == CNeutrinoApp::mode_audio) {
|
||||
CAudioPlayerGui *cap = CMediaPlayerMenu::getInstance()->getPlayerInstance();
|
||||
if (cap != NULL)
|
||||
cap->refreshMuteIcon();
|
||||
}
|
||||
setVolume(msg);
|
||||
return;
|
||||
}
|
||||
@@ -148,11 +143,6 @@ void CVolume::setVolume(const neutrino_msg_t key)
|
||||
if (g_settings.show_mute_icon) {
|
||||
hideVolscale();
|
||||
CAudioMute::getInstance()->AudioMute(true, true);
|
||||
if (mode == CNeutrinoApp::mode_audio) {
|
||||
CAudioPlayerGui *cap = CMediaPlayerMenu::getInstance()->getPlayerInstance();
|
||||
if (cap != NULL)
|
||||
cap->refreshMuteIcon();
|
||||
}
|
||||
setVolume(msg);
|
||||
return;
|
||||
}
|
||||
|
Reference in New Issue
Block a user