mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-09-02 10:21:10 +02:00
- pick mipsbox code from DDT, TangoCash and max10
Conflicts: src/gui/cam_menu.cpp src/gui/update.cpp src/neutrino.cpp Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
@@ -113,7 +113,7 @@ void CVolume::setVolume(const neutrino_msg_t key)
|
||||
|
||||
neutrino_msg_data_t data = 0;
|
||||
uint64_t timeoutEnd = 0;
|
||||
#if HAVE_ARM_HARDWARE
|
||||
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
|
||||
if (g_settings.hdmi_cec_volume)
|
||||
g_settings.current_volume = hdmi_cec::getInstance()->GetVolume();
|
||||
#endif
|
||||
@@ -136,7 +136,7 @@ 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
|
||||
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
|
||||
}
|
||||
else if (g_settings.hdmi_cec_volume)
|
||||
{
|
||||
|
Reference in New Issue
Block a user