src/driver/rcinput.cpp: change ifdefs for headers and set_rc_hw

Origin commit data
------------------
Branch: ni/coolstream
Commit: 6380763209
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-11 (Fri, 11 Jan 2013)


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

------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2013-01-11 14:04:07 +04:00
parent 71e3bde334
commit b6e23fe1e3
2 changed files with 5 additions and 2 deletions

View File

@@ -1574,7 +1574,7 @@ void CRCInput::play_click()
} }
#ifdef HAVE_COOLSTREAM_CS_IR_GENERIC_H #ifdef IOC_IR_SET_PRI_PROTOCOL
// hint: ir_protocol_t and other useful things are defined in cs_ir_generic.h // hint: ir_protocol_t and other useful things are defined in cs_ir_generic.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)
{ {

View File

@@ -41,6 +41,9 @@
#ifdef HAVE_COOLSTREAM_CS_IR_GENERIC_H #ifdef HAVE_COOLSTREAM_CS_IR_GENERIC_H
#include <coolstream/cs_ir_generic.h> #include <coolstream/cs_ir_generic.h>
#endif #endif
#ifdef HAVE_COOLSTREAM_NEVIS_IR_H
#include <nevis_ir.h>
#endif
#ifndef KEY_OK #ifndef KEY_OK
#define KEY_OK 0x160 #define KEY_OK 0x160
@@ -152,7 +155,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();
#ifdef HAVE_COOLSTREAM_CS_IR_GENERIC_H #ifdef IOC_IR_SET_PRI_PROTOCOL
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: