From 7bdfd76c3fd005de0f8ac49e9f3879c018a9e518 Mon Sep 17 00:00:00 2001 From: Lars Op den Kamp Date: Thu, 16 Feb 2012 02:13:40 +0100 Subject: [PATCH] cec: removed unneeded client version from the CCECProcessor constructor --- src/lib/CECProcessor.cpp | 4 ++-- src/lib/CECProcessor.h | 2 +- src/lib/LibCEC.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/CECProcessor.cpp b/src/lib/CECProcessor.cpp index 00d7744..918d4e9 100644 --- a/src/lib/CECProcessor.cpp +++ b/src/lib/CECProcessor.cpp @@ -66,7 +66,7 @@ CCECProcessor::CCECProcessor(CLibCEC *controller, const libcec_configuration *co m_busDevices[CECDEVICE_TV]->ReplaceHandler(false); } -CCECProcessor::CCECProcessor(CLibCEC *controller, const char *strDeviceName, const cec_device_type_list &types, uint16_t iPhysicalAddress, cec_client_version clientVersion) : +CCECProcessor::CCECProcessor(CLibCEC *controller, const char *strDeviceName, const cec_device_type_list &types, uint16_t iPhysicalAddress) : m_bInitialised(false), m_communication(NULL), m_controller(controller), @@ -78,7 +78,7 @@ CCECProcessor::CCECProcessor(CLibCEC *controller, const char *strDeviceName, con m_configuration.Clear(); // client version < 1.5.0 - m_configuration.clientVersion = clientVersion; + m_configuration.clientVersion = CEC_CLIENT_VERSION_PRE_1_5; snprintf(m_configuration.strDeviceName, 13, "%s", strDeviceName); m_configuration.deviceTypes = types; m_configuration.iPhysicalAddress = iPhysicalAddress; diff --git a/src/lib/CECProcessor.h b/src/lib/CECProcessor.h index ea8c03a..2fc12e0 100644 --- a/src/lib/CECProcessor.h +++ b/src/lib/CECProcessor.h @@ -46,7 +46,7 @@ namespace CEC class CCECProcessor : public PLATFORM::CThread, public IAdapterCommunicationCallback { public: - CCECProcessor(CLibCEC *controller, const char *strDeviceName, const cec_device_type_list &types, uint16_t iPhysicalAddress, cec_client_version clientVersion); + CCECProcessor(CLibCEC *controller, const char *strDeviceName, const cec_device_type_list &types, uint16_t iPhysicalAddress); CCECProcessor(CLibCEC *controller, const libcec_configuration *configuration); virtual ~CCECProcessor(void); diff --git a/src/lib/LibCEC.cpp b/src/lib/LibCEC.cpp index 67e8b60..44e368f 100644 --- a/src/lib/LibCEC.cpp +++ b/src/lib/LibCEC.cpp @@ -49,7 +49,7 @@ CLibCEC::CLibCEC(const char *strDeviceName, cec_device_type_list types, uint16_t m_callbacks(NULL), m_cbParam(NULL) { - m_cec = new CCECProcessor(this, strDeviceName, types, iPhysicalAddress, CEC_CLIENT_VERSION_PRE_1_5); + m_cec = new CCECProcessor(this, strDeviceName, types, iPhysicalAddress); } CLibCEC::CLibCEC(const libcec_configuration *configuration) : -- 2.34.1