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

Switchover remote control standard / neo1

Browse Source 
- Redundant code removed, THX dbt for the tip.
- Bug in "remote control neo1" left / right keys fixed.


git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1781 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: b265df5204
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2011-10-28 (Fri, 28 Oct 2011)
This commit is contained in:
Michael Liebmann
2011-10-28 21:26:54 +00:00
parent 62d07bad1b
commit 80ec67aef5
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/infoviewer.cpp
View File

@@ -48,6 +48,7 @@
#include <neutrino.h>
#include <gui/infoviewer.h>
#include <gui/keybind_setup.h>
#include <gui/bouquetlist.h>
#include <gui/widget/icons.h>
#include <gui/widget/hintbox.h>
@@ -903,7 +904,8 @@ void CInfoViewer::loop(int fadeValue, bool show_dot ,bool fadeIn)
showIcon_16_9();
showIcon_Resolution();
} else if ( g_settings.virtual_zap_mode && ((msg == CRCInput::RC_right) || msg == CRCInput::RC_left )) {
} else if ((g_settings.remote_control_hardware != CKeybindSetup::REMOTECONTROL_NEO1) &&
( g_settings.virtual_zap_mode && ((msg == CRCInput::RC_right) || msg == CRCInput::RC_left ))) {
virtual_zap_mode = true;
res = messages_return::cancel_all;
hideIt = true;

24
src/neutrino.cpp
View File

@@ -3417,27 +3417,25 @@ printf("CNeutrinoApp::setVolume dx %d dy %d\n", dx, dy);
uint64_t timeoutEnd;
do {
if (msg <= CRCInput::RC_MaxRC) {
if ((msg == CRCInput::RC_plus) ||
((g_settings.remote_control_hardware == CKeybindSetup::REMOTECONTROL_NEO1) &&
(g_RemoteControl->subChannels.size() < 1) &&
(msg == CRCInput::RC_right))) {
if (msg <= CRCInput::RC_MaxRC)
{
int sub_chan_keybind = 0;
if (g_settings.remote_control_hardware == CKeybindSetup::REMOTECONTROL_NEO1 && g_RemoteControl->subChannels.size() < 1)
sub_chan_keybind = 1;
if ((msg == CRCInput::RC_plus) || (sub_chan_keybind == 1 && (msg == CRCInput::RC_right))) {
if (g_settings.current_volume < 100 - g_settings.current_volume_step)
g_settings.current_volume += g_settings.current_volume_step;
else
g_settings.current_volume = 100;
if(current_muted){
if(current_muted)
AudioMute( false, true);
}
}
else if ((msg == CRCInput::RC_minus) ||
((g_settings.remote_control_hardware == CKeybindSetup::REMOTECONTROL_NEO1) &&
(g_RemoteControl->subChannels.size() < 1) &&
(msg == CRCInput::RC_left))) {
else if ((msg == CRCInput::RC_minus) || (sub_chan_keybind == 1 && (msg == CRCInput::RC_left))) {
if (g_settings.current_volume > g_settings.current_volume_step)
g_settings.current_volume -= g_settings.current_volume_step;
else if ((g_settings.show_mute_icon == 1) && (g_settings.current_volume = 1))
{
else if ((g_settings.show_mute_icon == 1) && (g_settings.current_volume = 1)) {
(g_settings.current_volume = 1);
AudioMute( true, true);
g_settings.current_volume = 0;