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

Revert rev.2066 changes. Peace please.

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 46b07752b9
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-01-18 (Wed, 18 Jan 2012)



------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2012-01-18 08:58:13 +00:00
parent 9a2735c61e
commit 0b235ca9c9
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/driver/rcinput.cpp
View File

@@ -1529,11 +1529,7 @@ void CRCInput::play_click()
} }
#ifdef HAVE_TRIPLEDRAGON #ifdef HAVE_COOLSTREAM_NEVIS_IR_H
void CRCInput::set_rc_hw(void)
{
}
#else
// hint: ir_protocol_t and other useful things are defined in nevis_ir.h // hint: ir_protocol_t and other useful things are defined in nevis_ir.h
void CRCInput::set_rc_hw(ir_protocol_t ir_protocol, unsigned int ir_address) void CRCInput::set_rc_hw(ir_protocol_t ir_protocol, unsigned int ir_address)
{ {
@@ -1596,4 +1592,8 @@ void CRCInput::set_rc_hw(void)
set_rc_hw(ir_protocol, ir_address); set_rc_hw(ir_protocol, ir_address);
} }
#else
void CRCInput::set_rc_hw(void)
{
}
#endif #endif

4
src/driver/rcinput.h
View File

@@ -38,7 +38,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <string> #include <string>
#include <vector> #include <vector>
#ifndef HAVE_TRIPLEDRAGON #ifdef HAVE_COOLSTREAM_NEVIS_IR_H
#include <coolstream/nevis_ir.h> #include <coolstream/nevis_ir.h>
#endif #endif
@@ -152,7 +152,7 @@ class CRCInput
int translate(int code, int num); int translate(int code, int num);
void calculateMaxFd(void); void calculateMaxFd(void);
int checkTimers(); int checkTimers();
#ifndef HAVE_TRIPLEDRAGON #ifdef HAVE_COOLSTREAM_NEVIS_IR_H
void set_rc_hw(ir_protocol_t ir_protocol, unsigned int ir_address); void set_rc_hw(ir_protocol_t ir_protocol, unsigned int ir_address);
#endif #endif
public: public: