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

fix conflicts

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: d39b174c75
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-03-20 (Tue, 20 Mar 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2012-03-20 11:07:28 +04:00
parent f7d6d1efc9 fe432d2c0c
commit 8b4daf875c
25 changed files with 821 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/gui/scan.cpp
View File

@@ -43,6 +43,7 @@
#include <driver/rcinput.h>
#include <driver/screen_max.h>
#include <driver/record.h>
#include <driver/volume.h>
#include <gui/color.h>
@@ -434,7 +435,7 @@ int CScanTs::handleMsg(neutrino_msg_t msg, neutrino_msg_data_t data)
case CRCInput::RC_minus:
case CRCInput::RC_left:
case CRCInput::RC_right:
CNeutrinoApp::getInstance()->setVolume(msg, true, true);
CVolume::getInstance()->setVolume(msg, true, true);
break;
default:
if ((msg >= CRCInput::RC_WithData) && (msg < CRCInput::RC_WithData + 0x10000000))