mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 18:31:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: e17d63131e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-01-17 (Tue, 17 Jan 2012)



------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2012-01-17 21:03:01 +00:00
parent 0aae609c85
commit 9a2735c61e
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,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

4
src/driver/rcinput.h
View File

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