From 8b86fb7afe4d9de820af4f75a3d9faa731497cc4 Mon Sep 17 00:00:00 2001 From: Lars Op den Kamp Date: Tue, 6 Dec 2011 01:35:49 +0100 Subject: [PATCH] win32: fix accidental rename and compiler warnings --- src/LibCecSharp/LibCecSharp.cpp | 8 ++++---- src/lib/CECProcessor.cpp | 2 +- src/lib/implementations/SLCommandHandler.cpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/LibCecSharp/LibCecSharp.cpp b/src/LibCecSharp/LibCecSharp.cpp index 707248a..03c0009 100644 --- a/src/LibCecSharp/LibCecSharp.cpp +++ b/src/LibCecSharp/LibCecSharp.cpp @@ -666,14 +666,14 @@ public: return m_libCec->MuteAudio(wait); } - bool TransmitKeypress(CecLogicalAddress destination, CecUserControlCode key, bool wait) + bool SendKeypress(CecLogicalAddress destination, CecUserControlCode key, bool wait) { - return m_libCec->TransmitKeypress((cec_logical_address)destination, (cec_user_control_code)key, wait); + return m_libCec->SendKeypress((cec_logical_address)destination, (cec_user_control_code)key, wait); } - bool TransmitKeyRelease(CecLogicalAddress destination, bool wait) + bool SendKeyRelease(CecLogicalAddress destination, bool wait) { - return m_libCec->TransmitKeyRelease((cec_logical_address)destination, wait); + return m_libCec->SendKeyRelease((cec_logical_address)destination, wait); } String ^ GetOSDName(CecLogicalAddress logicalAddress) diff --git a/src/lib/CECProcessor.cpp b/src/lib/CECProcessor.cpp index 618cd9a..52023e5 100644 --- a/src/lib/CECProcessor.cpp +++ b/src/lib/CECProcessor.cpp @@ -827,7 +827,7 @@ bool CCECProcessor::ParseMessage(const CCECAdapterMessage &msg) m_currentframe.ack = msg.ack(); m_currentframe.eom = msg.eom(); } - if (m_currentframe.ack == true) + if (m_currentframe.ack == 0x1) { m_lastInitiator = m_currentframe.initiator; m_busDevices[m_lastInitiator]->GetHandler()->HandlePoll(m_currentframe.initiator, m_currentframe.destination); diff --git a/src/lib/implementations/SLCommandHandler.cpp b/src/lib/implementations/SLCommandHandler.cpp index dd9aec1..6e4b92f 100644 --- a/src/lib/implementations/SLCommandHandler.cpp +++ b/src/lib/implementations/SLCommandHandler.cpp @@ -75,7 +75,7 @@ bool CSLCommandHandler::HandleVendorCommand(const cec_command &command) cec_command response; cec_command::Format(response, command.destination, command.initiator, CEC_OPCODE_VENDOR_COMMAND, m_iTransmitTimeout); response.PushBack(SL_COMMAND_CONNECT_ACCEPT); - response.PushBack(m_busDevice->GetProcessor()->GetLogicalAddresses().primary); + response.PushBack((uint8_t)m_busDevice->GetProcessor()->GetLogicalAddresses().primary); Transmit(response); /* set deck status for the playback device */ -- 2.34.1