cec: fixed abi

[deb_libcec.git] / include / cectypes.h

diff --git a/include/cectypes.h b/include/cectypes.h
index 904db4c59f0dd77c006b8dfe4929ddf61547d054..d70fc81f7f50aa726eed8a916206564c47c067e2 100644 (file)
--- a/include/cectypes.h
+++ b/include/cectypes.h
@@ -1008,7 +1008,7 @@ typedef struct cec_logical_addresses
    */
   void Clear(void)
   {
-    primary = CECDEVICE_UNKNOWN;
+    primary = CECDEVICE_UNREGISTERED;
     for (unsigned int iPtr = 0; iPtr < 16; iPtr++)
       addresses[iPtr] = 0;
   }
@@ -1018,7 +1018,7 @@ typedef struct cec_logical_addresses
    */
   bool IsEmpty(void) const
   {
-    return primary == CECDEVICE_UNKNOWN;
+    return primary == CECDEVICE_UNREGISTERED;
   }
 
   /*!
@@ -1040,7 +1040,7 @@ typedef struct cec_logical_addresses
    */
   void Set(cec_logical_address address)
   {
-    if (primary == CECDEVICE_UNKNOWN)
+    if (primary == CECDEVICE_UNREGISTERED)
       primary = address;
 
     addresses[(int) address] = 1;
@@ -1050,10 +1050,10 @@ typedef struct cec_logical_addresses
    * @brief Mark a logical address as 'unset'
    * @param address The logical address to remove from this list.
    */
-  void Unset(cec_logical_address address)
+  void Unset(const cec_logical_address address)
   {
     if (primary == address)
-      primary = CECDEVICE_UNKNOWN;
+      primary = CECDEVICE_UNREGISTERED;
 
     addresses[(int) address] = 0;
   }
@@ -1103,22 +1103,6 @@ struct libcec_parameter
 {
   libcec_parameter_type paramType; /**< the type of this parameter */
   void*                 paramData; /**< the value of this parameter */
-
-#ifdef __cplusplus
-  libcec_parameter(void)
-  {
-    paramType = CEC_PARAMETER_TYPE_UNKOWN;
-    paramData = NULL;
-  }
-
-  libcec_parameter(const char *strMessage)
-  {
-    paramType = CEC_PARAMETER_TYPE_STRING;
-    paramData = (void*)strMessage;
-  }
-
-  virtual ~libcec_parameter(void) {}
-#endif
 };
 
 struct libcec_configuration;