From e17d63131efe92314e34bd568717d69c477d12a6 Mon Sep 17 00:00:00 2001 From: satbaby Date: Tue, 17 Jan 2012 21:03:01 +0000 Subject: [PATCH] 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 --- src/driver/rcinput.cpp | 10 +++++----- src/driver/rcinput.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/driver/rcinput.cpp b/src/driver/rcinput.cpp index 76bdd0645..3689699e1 100644 --- a/src/driver/rcinput.cpp +++ b/src/driver/rcinput.cpp @@ -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 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); } -#else -void CRCInput::set_rc_hw(void) -{ -} #endif diff --git a/src/driver/rcinput.h b/src/driver/rcinput.h index 981a878bf..5a6355303 100644 --- a/src/driver/rcinput.h +++ b/src/driver/rcinput.h @@ -38,7 +38,7 @@ #include #include #include -#ifdef HAVE_COOLSTREAM_NEVIS_IR_H +#ifndef HAVE_TRIPLEDRAGON #include #endif @@ -152,7 +152,7 @@ class CRCInput int translate(int code, int num); void calculateMaxFd(void); int checkTimers(); -#ifdef HAVE_COOLSTREAM_NEVIS_IR_H +#ifndef HAVE_TRIPLEDRAGON void set_rc_hw(ir_protocol_t ir_protocol, unsigned int ir_address); #endif public: