mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-31 01:11:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

move external volume control to internal volume/mute handler

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
TangoCash
2018-10-19 19:39:36 +02:00
committed by Thilo Graf
parent 2b0b867e2e
commit b35c344c11
3 changed files with 24 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/driver/volume.cpp
View File

@@ -34,6 +34,7 @@
#include <system/debug.h>
/* compat header from zapit/include */
#include <audio.h>
#include <video.h>
#include <system/settings.h>
#include <system/helpers.h>
#include <daemonc/remotecontrol.h>
@@ -113,6 +114,10 @@ void CVolume::setVolume(const neutrino_msg_t key)
neutrino_msg_data_t data = 0;
uint64_t timeoutEnd = 0;
#if HAVE_ARM_HARDWARE
if (g_settings.hdmi_cec_volume)
g_settings.current_volume = hdmi_cec::getInstance()->GetVolume();
#endif
int vol = g_settings.current_volume;
do {
@@ -132,6 +137,15 @@ void CVolume::setVolume(const neutrino_msg_t key)
g_RCInput->getMsg(&tmp, &data, 0);
if (tmp != CRCInput::RC_timeout)
g_RCInput->postMsg(tmp, data);
#if HAVE_ARM_HARDWARE
}
else if (g_settings.hdmi_cec_volume)
{
(dir > 0) ? hdmi_cec::getInstance()->vol_up() : hdmi_cec::getInstance()->vol_down();
do_vol = false;
g_settings.current_volume = hdmi_cec::getInstance()->GetVolume();
printf("Volume: %d\n", g_settings.current_volume);
#endif
} else
do_vol = true;
if (CNeutrinoApp::getInstance()->isMuted() && (dir > 0 || g_settings.current_volume > 0)) {