X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2Fadapter%2FAdapterCommunication.cpp;h=ff69a7f4a73f2aeb6a10cf43bb9a888e21190330;hb=ba65909d0a9c43a1bac71c6182c53f202285cec5;hp=2bbcb0153ba0ec798fe76ff7ee0786abb3760f58;hpb=102120cb9d6b3c723ed44b22ae1c97cb160e0bcc;p=deb_libcec.git diff --git a/src/lib/adapter/AdapterCommunication.cpp b/src/lib/adapter/AdapterCommunication.cpp index 2bbcb01..ff69a7f 100644 --- a/src/lib/adapter/AdapterCommunication.cpp +++ b/src/lib/adapter/AdapterCommunication.cpp @@ -34,7 +34,8 @@ #include "AdapterMessage.h" #include "../CECProcessor.h" -#include "../platform/serialport/serialport.h" +#include "../platform/sockets/serialport.h" +#include "../platform/util/timeutils.h" #include "../LibCEC.h" using namespace std; @@ -234,9 +235,11 @@ bool CAdapterCommunication::Read(CCECAdapterMessage &msg, uint32_t iTimeout) return bGotFullMessage; } -std::string CAdapterCommunication::GetError(void) const +CStdString CAdapterCommunication::GetError(void) const { - return m_port->GetError(); + CStdString strError; + strError = m_port->GetError(); + return strError; } bool CAdapterCommunication::StartBootloader(void)