cec: set lib interface version back to 1.0 and rename GetLibVersion() to GetLibVersio...

diff --git a/include/cec.h b/include/cec.h
index 5ef202635c97b6ef179c60e8674f77448d18912b..58ea58f2a2b723de6e1f45150888760893fe42dd 100644 (file)
--- a/include/cec.h
+++ b/include/cec.h
@@ -71,17 +71,17 @@ namespace CEC
     //@}
 
     /*!
-     * @see cec_get_min_version
+     * @see cec_get_min_lib_version
      */
-    virtual int8_t GetMinVersion(void) = 0;
+    virtual int8_t GetMinLibVersion(void) = 0;
 
     /*!
-     * @see cec_get_lib_version
+     * @see cec_get_lib_version_major
      */
-    virtual int8_t GetLibVersion(void) = 0;
+    virtual int8_t GetLibVersionMajor(void) = 0;
 
     /*!
-     * @see cec_get_lib_version
+     * @see cec_get_lib_version_minor
      */
     virtual int8_t GetLibVersionMinor(void) = 0;
 

diff --git a/include/cecc.h b/include/cecc.h
index 8ca688c3f2efd951474bc4927a254c11ed712977..e1c2942d877ef9b2d678270ebd2066daf4dc8295 100644 (file)
--- a/include/cecc.h
+++ b/include/cecc.h
@@ -98,12 +98,12 @@ extern DECLSPEC int cec_start_bootloader(void);
 /*!
  * @return Get the minimal version of libcec that this version of libcec can interface with.
  */
-extern DECLSPEC int8_t cec_get_min_version(void);
+extern DECLSPEC int8_t cec_get_min_lib_version(void);
 
 /*!
- * @return Get the version of libcec.
+ * @return Get the major version of libcec.
  */
-extern DECLSPEC int8_t cec_get_lib_version(void);
+extern DECLSPEC int8_t cec_get_lib_version_major(void);
 
 /*!
  * @return Get the minor version of libcec.

diff --git a/include/cectypes.h b/include/cectypes.h
index 188e7de8df1402a121df919e9d7c16bca6e34c27..a347f1bcf71758615005a3c3ae861d17b2e83ffe 100644 (file)
--- a/include/cectypes.h
+++ b/include/cectypes.h
@@ -740,9 +740,9 @@ typedef struct cec_vendor
 #define ESCOFFSET                    3
 #define CEC_BUTTON_TIMEOUT           500
 
-#define CEC_MIN_VERSION              8
-#define CEC_LIB_VERSION              8
-#define CEC_LIB_VERSION_MINOR        1
+#define CEC_MIN_LIB_VERSION          1
+#define CEC_LIB_VERSION_MAJOR        1
+#define CEC_LIB_VERSION_MINOR        0
 
 #ifdef __cplusplus
 };

diff --git a/src/lib/LibCEC.h b/src/lib/LibCEC.h
index 1997039f375e3d26e092b7bf7bd4bb0881c532dc..5d11f1191059d05d4a1c493d5c53f68e1b106c33 100644 (file)
--- a/src/lib/LibCEC.h
+++ b/src/lib/LibCEC.h
@@ -56,8 +56,8 @@ namespace CEC
       virtual bool PingAdapter(void);
       virtual bool StartBootloader(void);
 
-      virtual int8_t GetMinVersion(void) { return CEC_MIN_VERSION; };
-      virtual int8_t GetLibVersion(void) { return CEC_LIB_VERSION; };
+      virtual int8_t GetMinLibVersion(void) { return CEC_MIN_LIB_VERSION; };
+      virtual int8_t GetLibVersionMajor(void) { return CEC_LIB_VERSION_MAJOR; };
       virtual int8_t GetLibVersionMinor(void) { return CEC_LIB_VERSION_MINOR; };
 
       virtual bool GetNextLogMessage(cec_log_message *message);

diff --git a/src/lib/LibCECC.cpp b/src/lib/LibCECC.cpp
index b792044cdf0cd15ed1aab6d831ae6a1ac6a77e86..a3be5f3bea89df0498af40851132a293f4ce6040 100644 (file)
--- a/src/lib/LibCECC.cpp
+++ b/src/lib/LibCECC.cpp
@@ -92,14 +92,14 @@ int cec_start_bootloader(void)
 int8_t cec_get_min_version(void)
 {
   if (cec_parser)
-    return cec_parser->GetMinVersion();
+    return cec_parser->GetMinLibVersion();
   return -1;
 }
 
-int8_t cec_get_lib_version(void)
+int8_t cec_get_lib_version_major(void)
 {
   if (cec_parser)
-    return cec_parser->GetLibVersion();
+    return cec_parser->GetLibVersionMajor();
   return -1;
 }
 

diff --git a/src/testclient/main.cpp b/src/testclient/main.cpp
index b57491a0207f620c4f1957a78ec9a802cb010170..8efffedc4165c47fa01c7d57a747a76cdad765ad 100644 (file)
--- a/src/testclient/main.cpp
+++ b/src/testclient/main.cpp
@@ -44,7 +44,7 @@
 using namespace CEC;
 using namespace std;
 
-#define CEC_TEST_CLIENT_VERSION 8
+#define CEC_TEST_CLIENT_VERSION 1
 
 #include <cecloader.h>
 
@@ -245,7 +245,7 @@ void show_console_help(void)
 int main (int argc, char *argv[])
 {
   ICECAdapter *parser = LoadLibCec("CECTester");
-  if (!parser || parser->GetMinVersion() > CEC_TEST_CLIENT_VERSION)
+  if (!parser || parser->GetMinLibVersion() > CEC_TEST_CLIENT_VERSION)
   {
 #ifdef __WINDOWS__
     cout << "Cannot load libcec.dll" << endl;
@@ -255,7 +255,7 @@ int main (int argc, char *argv[])
     return 1;
   }
   CStdString strLog;
-  strLog.Format("CEC Parser created - libcec version %d.%d", parser->GetLibVersion(), parser->GetLibVersionMinor());
+  strLog.Format("CEC Parser created - libcec version %d.%d", parser->GetLibVersionMajor(), parser->GetLibVersionMinor());
   cout << strLog.c_str() << endl;
 
   //make stdin non-blocking