From 46b07752b9b69760c76cc6d35cf3bf1d4b55aed7 Mon Sep 17 00:00:00 2001
From: focus <focus@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: Wed, 18 Jan 2012 08:58:13 +0000
Subject: [PATCH] Revert rev.2066 changes. Peace please.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2067 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 3689699e1..76bdd0645 100644
--- a/src/driver/rcinput.cpp
+++ b/src/driver/rcinput.cpp
@@ -1529,11 +1529,7 @@ void CRCInput::play_click()
 }
 
 
-#ifdef HAVE_TRIPLEDRAGON
-void CRCInput::set_rc_hw(void)
-{
-}
-#else
+#ifdef HAVE_COOLSTREAM_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)
 {
@@ -1596,4 +1592,8 @@ 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 5a6355303..981a878bf 100644
--- a/src/driver/rcinput.h
+++ b/src/driver/rcinput.h
@@ -38,7 +38,7 @@
 #include <sys/types.h>
 #include <string>
 #include <vector>
-#ifndef HAVE_TRIPLEDRAGON
+#ifdef HAVE_COOLSTREAM_NEVIS_IR_H
 #include <coolstream/nevis_ir.h>
 #endif
 
@@ -152,7 +152,7 @@ class CRCInput
 		int translate(int code, int num);
 		void calculateMaxFd(void);
 		int checkTimers();
-#ifndef HAVE_TRIPLEDRAGON
+#ifdef HAVE_COOLSTREAM_NEVIS_IR_H
 		void set_rc_hw(ir_protocol_t ir_protocol, unsigned int ir_address);
 #endif
 	public: