seife:The svn is coolstream svn and not the other way

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2066 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
satbaby
2012-01-17 21:03:01 +00:00
parent 163052cd39
commit e17d63131e
2 changed files with 7 additions and 7 deletions

View File

@@ -1529,7 +1529,11 @@ void CRCInput::play_click()
} }
#ifdef HAVE_COOLSTREAM_NEVIS_IR_H #ifdef HAVE_TRIPLEDRAGON
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)
{ {
@@ -1592,8 +1596,4 @@ 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

View File

@@ -38,7 +38,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <string> #include <string>
#include <vector> #include <vector>
#ifdef HAVE_COOLSTREAM_NEVIS_IR_H #ifndef HAVE_TRIPLEDRAGON
#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();
#ifdef HAVE_COOLSTREAM_NEVIS_IR_H #ifndef HAVE_TRIPLEDRAGON
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: