win32: fix accidental rename and compiler warnings

diff --git a/src/LibCecSharp/LibCecSharp.cpp b/src/LibCecSharp/LibCecSharp.cpp
index 707248a920a3e1464ee22ec6d679b93c979463c1..03c0009cea20e7bc51dd1d26449eb1ffac5417dd 100644 (file)
--- 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 618cd9aeca6585f6995492c6a54acd2ad7ae9a4e..52023e53f56cbae9e735314eb2883fba376cd90c 100644 (file)
--- 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 dd9aec148051005bac7bb73138e7894476dcaa04..6e4b92f866874f3913acf285ee7365c9dbd943e2 100644 (file)
--- 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 */