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

Switchover remote control standard / neo1

Browse Source 
- Disabled volume level L/R if volume bar is displayed and
 VirtZap active.


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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5ba54e826d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2011-10-24 (Mon, 24 Oct 2011)

Origin message was:
------------------
Switchover remote control standard / neo1

- Disabled volume level L/R if volume bar is displayed and
 VirtZap active.


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


------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2011-10-23 22:16:30 +00:00
parent 858c58ce82
commit 812dd15757
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/neutrino.cpp
View File

@@ -3416,7 +3416,10 @@ printf("CNeutrinoApp::setVolume dx %d dy %d\n", dx, dy);
do {
if (msg <= CRCInput::RC_MaxRC) {
if ((msg == CRCInput::RC_plus) || (msg == CRCInput::RC_right)) {
if ((msg == CRCInput::RC_plus) ||
((g_settings.remote_control_hardware == CKeybindSetup::REMOTECONTROL_NEO1) &&
(g_RemoteControl->subChannels.size() < 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
@@ -3425,7 +3428,10 @@ printf("CNeutrinoApp::setVolume dx %d dy %d\n", dx, dy);
AudioMute( false, true);
}
}
else if ((msg == CRCInput::RC_minus) || (msg == CRCInput::RC_left)) {
else if ((msg == CRCInput::RC_minus) ||
((g_settings.remote_control_hardware == CKeybindSetup::REMOTECONTROL_NEO1) &&
(g_RemoteControl->subChannels.size() < 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))