X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=include%2FCECExportsCpp.h;h=34905735ea63a3931fde9925cc20bccf564b2f2c;hb=88c05b08388985d752f86ed1451a20e9f4f3e22c;hp=f9fb0ab15e08e525730f182af1a36889e7148f83;hpb=2b4d8297d88c0676392e8b3c9c3e3d7ef3e80408;p=deb_libcec.git

diff --git a/include/CECExportsCpp.h b/include/CECExportsCpp.h
index f9fb0ab..3490573 100644
--- a/include/CECExportsCpp.h
+++ b/include/CECExportsCpp.h
@@ -41,7 +41,7 @@ namespace CEC
     /*!
      * @see cec_open
      */
-    virtual bool Open(const char *strPort, uint64_t iTimeoutMs = 10000) = 0;
+    virtual bool Open(const char *strPort, uint32_t iTimeoutMs = 10000) = 0;
 
     /*!
      * @see cec_close
@@ -51,7 +51,7 @@ namespace CEC
     /*!
      * @see cec_find_adapters
      */
-    virtual int FindAdapters(std::vector<cec_adapter> &deviceList, const char *strDevicePath = NULL) = 0;
+    virtual int8_t FindAdapters(cec_adapter *deviceList, uint8_t iBufSize, const char *strDevicePath = NULL) = 0;
 
     /*!
      * @see cec_ping_adapters
@@ -67,12 +67,12 @@ namespace CEC
     /*!
      * @see cec_get_min_version
      */
-    virtual int GetMinVersion(void) = 0;
+    virtual int8_t GetMinVersion(void) = 0;
 
     /*!
      * @see cec_get_lib_version
      */
-    virtual int GetLibVersion(void) = 0;
+    virtual int8_t GetLibVersion(void) = 0;
 
     /*!
      * @see cec_get_next_log_message
@@ -124,6 +124,8 @@ namespace CEC
 
 extern DECLSPEC void * CECCreate(const char *strDeviceName, CEC::cec_logical_address iLogicalAddress = CEC::CECDEVICE_PLAYBACKDEVICE1, uint16_t iPhysicalAddress = CEC_DEFAULT_PHYSICAL_ADDRESS);
 
+extern DECLSPEC void CECDestroy(CEC::ICECAdapter *instance);
+
 #if !defined(DLL_EXPORT)
 #if defined(_WIN32) || defined(_WIN64)
 #include <windows.h>
@@ -137,7 +139,7 @@ static int g_iLibCECInstanceCount = 0;
  */
 inline CEC::ICECAdapter *LoadLibCec(const char *strName, CEC::cec_logical_address iLogicalAddress = CEC::CECDEVICE_PLAYBACKDEVICE1, uint16_t iPhysicalAddress = CEC_DEFAULT_PHYSICAL_ADDRESS)
 {
-  typedef void* (__cdecl*_CreateLibCec)(const char *, uint8_t, uint8_t);
+  typedef void* (__cdecl*_CreateLibCec)(const char *, uint8_t, uint16_t);
   _CreateLibCec CreateLibCec;
 
   if (!g_libCEC)
@@ -158,7 +160,11 @@ inline CEC::ICECAdapter *LoadLibCec(const char *strName, CEC::cec_logical_addres
  */
 inline void UnloadLibCec(CEC::ICECAdapter *device)
 {
-  delete device;
+  typedef void (__cdecl*_DestroyLibCec)(void * device);
+  _DestroyLibCec DestroyLibCec;
+  DestroyLibCec = (_DestroyLibCec) (GetProcAddress(g_libCEC, "CECDestroy"));
+  if (DestroyLibCec)
+    DestroyLibCec(device);
 
   if (--g_iLibCECInstanceCount == 0)
   {
@@ -184,7 +190,7 @@ inline CEC::ICECAdapter *LoadLibCec(const char *strName, CEC::cec_logical_addres
 inline void UnloadLibCec(CEC::ICECAdapter *device)
 {
   device->Close();
-  delete device;
+  CECDestroy(device);
 };
 #endif