X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2FLibCECC.cpp;h=4c7276a0fe5d8c28c4861ced3c1c6ad56f653b56;hb=2b32d0ab4a65fd7ac86072285e87972e1131b98a;hp=7f2475b5eb38118b28090f79b516f4b2e1c3284d;hpb=93f86187ea362ab62f9e0f93b77fb3bcc29166ab;p=deb_libcec.git

diff --git a/src/lib/LibCECC.cpp b/src/lib/LibCECC.cpp
index 7f2475b..4c7276a 100644
--- a/src/lib/LibCECC.cpp
+++ b/src/lib/LibCECC.cpp
@@ -41,7 +41,7 @@ using namespace std;
 //@{
 ICECAdapter *cec_parser;
 
-bool cec_init(const char *strDeviceName, cec_logical_address iLogicalAddress /* = CECDEVICE_PLAYBACKDEVICE1 */, int iPhysicalAddress /* = CEC_DEFAULT_PHYSICAL_ADDRESS */)
+bool cec_init(const char *strDeviceName, cec_logical_address iLogicalAddress /* = CECDEVICE_PLAYBACKDEVICE1 */, uint8_t iPhysicalAddress /* = CEC_DEFAULT_PHYSICAL_ADDRESS */)
 {
   cec_parser = (ICECAdapter *) CECCreate(strDeviceName, iLogicalAddress, iPhysicalAddress);
   return (cec_parser != NULL);
@@ -50,11 +50,11 @@ bool cec_init(const char *strDeviceName, cec_logical_address iLogicalAddress /*
 void cec_destroy(void)
 {
   cec_close();
-  delete cec_parser;
+  CECDestroy(cec_parser);
   cec_parser = NULL;
 }
 
-bool cec_open(const char *strPort, int iTimeout)
+bool cec_open(const char *strPort, uint32_t iTimeout)
 {
   if (cec_parser)
     return cec_parser->Open(strPort, iTimeout);
@@ -67,10 +67,10 @@ void cec_close(void)
     cec_parser->Close();
 }
 
-int cec_find_adapters(vector<cec_adapter> &deviceList, const char *strDevicePath /* = NULL */)
+int8_t cec_find_adapters(cec_adapter *deviceList, uint8_t iBufSize, const char *strDevicePath /* = NULL */)
 {
   if (cec_parser)
-    return cec_parser->FindAdapters(deviceList, strDevicePath);
+    return cec_parser->FindAdapters(deviceList, iBufSize, strDevicePath);
   return -1;
 }
 
@@ -88,14 +88,14 @@ bool cec_start_bootloader(void)
   return false;
 }
 
-int cec_get_min_version(void)
+int8_t cec_get_min_version(void)
 {
   if (cec_parser)
     return cec_parser->GetMinVersion();
   return -1;
 }
 
-int cec_get_lib_version(void)
+int8_t cec_get_lib_version(void)
 {
   if (cec_parser)
     return cec_parser->GetLibVersion();