cec: added GetLibVersionMinor()/cec_get_lib_version_minor() and set the minor version...

diff --git a/include/cec.h b/include/cec.h
index 1701df786c16fe7489e356cf76e3ed157ded3f32..5ef202635c97b6ef179c60e8674f77448d18912b 100644 (file)
--- a/include/cec.h
+++ b/include/cec.h
@@ -80,6 +80,11 @@ namespace CEC
      */
     virtual int8_t GetLibVersion(void) = 0;
 
+    /*!
+     * @see cec_get_lib_version
+     */
+    virtual int8_t GetLibVersionMinor(void) = 0;
+
     /*!
      * @see cec_get_next_log_message
      */

diff --git a/include/cecc.h b/include/cecc.h
index bec392030e6cd67bce5443ed4f7aa3540efdcac7..8ca688c3f2efd951474bc4927a254c11ed712977 100644 (file)
--- a/include/cecc.h
+++ b/include/cecc.h
@@ -105,6 +105,11 @@ extern DECLSPEC int8_t cec_get_min_version(void);
  */
 extern DECLSPEC int8_t cec_get_lib_version(void);
 
+/*!
+ * @return Get the minor version of libcec.
+ */
+extern DECLSPEC int8_t cec_get_lib_version_minor(void);
+
 /*!
  * @brief Power on the connected CEC capable devices.
  * @param address The logical address to power on.

diff --git a/include/cectypes.h b/include/cectypes.h
index 5f2edc2f59a604eb01bf9065945bb1be350be150..188e7de8df1402a121df919e9d7c16bca6e34c27 100644 (file)
--- a/include/cectypes.h
+++ b/include/cectypes.h
@@ -738,9 +738,11 @@ typedef struct cec_vendor
 #define MSGEND                       0xFE
 #define MSGESC                       0xFD
 #define ESCOFFSET                    3
+#define CEC_BUTTON_TIMEOUT           500
+
 #define CEC_MIN_VERSION              8
 #define CEC_LIB_VERSION              8
-#define CEC_BUTTON_TIMEOUT           500
+#define CEC_LIB_VERSION_MINOR        1
 
 #ifdef __cplusplus
 };

diff --git a/src/lib/LibCEC.cpp b/src/lib/LibCEC.cpp
index 13e1c117b6658fff466f3e56a6bac1e6f7b7b7ac..0efef00b2bb1ea4ef30b67845b0d7c8e7b9f5596 100644 (file)
--- a/src/lib/LibCEC.cpp
+++ b/src/lib/LibCEC.cpp
@@ -127,16 +127,6 @@ bool CLibCEC::StartBootloader(void)
   return m_comm ? m_comm->StartBootloader() : false;
 }
 
-int8_t CLibCEC::GetMinVersion(void)
-{
-  return CEC_MIN_VERSION;
-}
-
-int8_t CLibCEC::GetLibVersion(void)
-{
-  return CEC_LIB_VERSION;
-}
-
 bool CLibCEC::GetNextLogMessage(cec_log_message *message)
 {
   return (m_logBuffer.Pop(*message));

diff --git a/src/lib/LibCEC.h b/src/lib/LibCEC.h
index 391148dadbf110bfb93c993ff6e9b187bf3062f1..203facb43c15c9ec73a19c41a037160e606a9ce4 100644 (file)
--- a/src/lib/LibCEC.h
+++ b/src/lib/LibCEC.h
@@ -56,8 +56,9 @@ namespace CEC
       virtual bool PingAdapter(void);
       virtual bool StartBootloader(void);
 
-      virtual int8_t GetMinVersion(void);
-      virtual int8_t GetLibVersion(void);
+      virtual int8_t GetMinVersion(void) { return CEC_MIN_VERSION; };
+      virtual int8_t GetLibVersion(void) { return CEC_LIB_VERSION; };
+      virtual int8_t GetLibVersionMinor(void) { return CEC_LIB_VERSION_MINOR; };
 
       virtual bool GetNextLogMessage(cec_log_message *message);
       virtual bool GetNextKeypress(cec_keypress *key);

diff --git a/src/lib/LibCECC.cpp b/src/lib/LibCECC.cpp
index 28a268b3879532f263c55095da3f3efae6553b18..b792044cdf0cd15ed1aab6d831ae6a1ac6a77e86 100644 (file)
--- a/src/lib/LibCECC.cpp
+++ b/src/lib/LibCECC.cpp
@@ -103,6 +103,13 @@ int8_t cec_get_lib_version(void)
   return -1;
 }
 
+int8_t cec_get_lib_version_minor(void)
+{
+  if (cec_parser)
+    return cec_parser->GetLibVersionMinor();
+  return -1;
+}
+
 int cec_get_next_log_message(cec_log_message *message)
 {
   if (cec_parser)

diff --git a/src/testclient/main.cpp b/src/testclient/main.cpp
index d30d982053673bfa341b07688c00973d2f5425a1..b57491a0207f620c4f1957a78ec9a802cb010170 100644 (file)
--- a/src/testclient/main.cpp
+++ b/src/testclient/main.cpp
@@ -255,7 +255,7 @@ int main (int argc, char *argv[])
     return 1;
   }
   CStdString strLog;
-  strLog.Format("CEC Parser created - libcec version %d", parser->GetLibVersion());
+  strLog.Format("CEC Parser created - libcec version %d.%d", parser->GetLibVersion(), parser->GetLibVersionMinor());
   cout << strLog.c_str() << endl;
 
   //make stdin non-blocking