bumped version and updated changelog

diff --git a/ChangeLog b/ChangeLog
index ccb10d2260ee9077ea1df76bb94783544b90d558..983d0060874144630a92c40773ef24ccc03e2ffe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+libcec (2.0.2-2) unstable; urgency=medium
+
+  * fixed:
+    * updating the device status after a poll was broken and could reset the
+      status of devices that were marked as handled by libCEC to 'not
+      present'
+    * don't keep spamming the bus with a vendor command when an active source
+      switch is pending for panasonic, but only send it when needed
+    * reset CVLCommandHandler::m_bCapabilitiesSent when the TV goes to standby
+
+ -- Pulse-Eight Packaging <packaging@pulse-eight.com>  Mon, 15 Oct 2012 13:52:00 +0100
+
 libcec (2.0.2-1) unstable; urgency=low
 
   * changed/added:

diff --git a/debian/changelog b/debian/changelog
index ccb10d2260ee9077ea1df76bb94783544b90d558..983d0060874144630a92c40773ef24ccc03e2ffe 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+libcec (2.0.2-2) unstable; urgency=medium
+
+  * fixed:
+    * updating the device status after a poll was broken and could reset the
+      status of devices that were marked as handled by libCEC to 'not
+      present'
+    * don't keep spamming the bus with a vendor command when an active source
+      switch is pending for panasonic, but only send it when needed
+    * reset CVLCommandHandler::m_bCapabilitiesSent when the TV goes to standby
+
+ -- Pulse-Eight Packaging <packaging@pulse-eight.com>  Mon, 15 Oct 2012 13:52:00 +0100
+
 libcec (2.0.2-1) unstable; urgency=low
 
   * changed/added:

diff --git a/include/cec.h b/include/cec.h
index d10f4339ff6b775372154abcda37b2226b6602f3..ba12a879c66b61e5db6153a8f8f4d8cea7f33562 100644 (file)
--- a/include/cec.h
+++ b/include/cec.h
@@ -36,7 +36,7 @@
 
 #include "cectypes.h"
 
-#define LIBCEC_VERSION_CURRENT CEC_SERVER_VERSION_2_0_1
+#define LIBCEC_VERSION_CURRENT CEC_SERVER_VERSION_2_0_2
 
 namespace CEC
 {

diff --git a/include/cectypes.h b/include/cectypes.h
index f68007b507e4477619c5d8e2f7346e343b4c887d..6b7f73cbaa149a81549fd8b8be3330d7994d808f 100644 (file)
--- a/include/cectypes.h
+++ b/include/cectypes.h
@@ -1375,6 +1375,7 @@ typedef enum cec_client_version
   CEC_CLIENT_VERSION_1_99_0  = 0x1990,
   CEC_CLIENT_VERSION_2_0_0   = 0x2000,
   CEC_CLIENT_VERSION_2_0_1   = 0x2001,
+  CEC_CLIENT_VERSION_2_0_2   = 0x2002,
 } cec_client_version;
 
 typedef enum cec_server_version
@@ -1398,6 +1399,7 @@ typedef enum cec_server_version
   CEC_SERVER_VERSION_1_99_0  = 0x1990,
   CEC_SERVER_VERSION_2_0_0   = 0x2000,
   CEC_SERVER_VERSION_2_0_1   = 0x2001,
+  CEC_SERVER_VERSION_2_0_2   = 0x2002,
 } cec_server_version;
 
 struct libcec_configuration

diff --git a/project/cec-config.rc b/project/cec-config.rc
index bc1299da66e7e33e3d1a4130ad1735bddef5d756..7a9da22b6c09b69028e223b21d4a2bc581028c0a 100644 (file)
Binary files a/project/cec-config.rc and b/project/cec-config.rc differ

diff --git a/project/libCEC.nsi b/project/libCEC.nsi
index 514840673440a763c065970fdffd0cfabef1b1ce..5860b2e22203f16a84603b88a74e0122ba93765a 100644 (file)
--- a/project/libCEC.nsi
+++ b/project/libCEC.nsi
@@ -7,7 +7,7 @@
 !include "LogicLib.nsh"
 !include "x64.nsh"
 
-Name "Pulse-Eight libCEC version 2.0.0"
+Name "Pulse-Eight libCEC version 2.0.2"
 OutFile "..\build\libCEC-installer.exe"
 
 XPStyle on

diff --git a/project/libcec.rc b/project/libcec.rc
index 2f85a67abc451b26408f9ce922ce4dbbf160af07..b925f41863ef6df3b77fdee35a383ed680d5422c 100644 (file)
Binary files a/project/libcec.rc and b/project/libcec.rc differ

diff --git a/project/testclient.rc b/project/testclient.rc
index 1d6382b69816b2092cbb7248fbed00136a96c25c..abb8ee4b4e592f709bed20989f032dc76a324f85 100644 (file)
Binary files a/project/testclient.rc and b/project/testclient.rc differ

diff --git a/src/CecSharpTester/CecSharpClient.cs b/src/CecSharpTester/CecSharpClient.cs
index 37b04e9cf6c759f58f4b7635de0ea925e541b043..cd9b0e975f5fd9354c63905d3c3c6691eb94c464 100644 (file)
--- a/src/CecSharpTester/CecSharpClient.cs
+++ b/src/CecSharpTester/CecSharpClient.cs
@@ -43,7 +43,7 @@ namespace CecSharpClient
       Config = new LibCECConfiguration();
       Config.DeviceTypes.Types[0] = CecDeviceType.RecordingDevice;
       Config.DeviceName = "CEC Tester";
-      Config.ClientVersion = CecClientVersion.Version2_0_0;
+      Config.ClientVersion = CecClientVersion.Version2_0_2;
       Config.SetCallbacks(this);
       LogLevel = (int)CecLogLevel.All;
 

diff --git a/src/CecSharpTester/Properties/AssemblyInfo.cs b/src/CecSharpTester/Properties/AssemblyInfo.cs
index 799111ddc3ddbad6d642ec9d1ee7a1797bd11fea..23128fc429bbfcb2e0aaed934528faf4e61e7004 100644 (file)
--- a/src/CecSharpTester/Properties/AssemblyInfo.cs
+++ b/src/CecSharpTester/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.1.0")]
-[assembly: AssemblyFileVersion("2.0.1.0")]
+[assembly: AssemblyVersion("2.0.2.0")]
+[assembly: AssemblyFileVersion("2.0.2.0")]

diff --git a/src/LibCecSharp/AssemblyInfo.cpp b/src/LibCecSharp/AssemblyInfo.cpp
index bb64ab4413f9244c083a2ba4b9c16a20eeda8a41..fe944b5d7826d71beebdfaf7b7d92cf7d0be4e29 100644 (file)
--- a/src/LibCecSharp/AssemblyInfo.cpp
+++ b/src/LibCecSharp/AssemblyInfo.cpp
@@ -13,7 +13,7 @@ using namespace System::Security::Permissions;
 [assembly:AssemblyTrademarkAttribute("")];
 [assembly:AssemblyCultureAttribute("")];
 
-[assembly:AssemblyVersionAttribute("2.0.1.0")];
+[assembly:AssemblyVersionAttribute("2.0.2.0")];
 
 [assembly:ComVisible(false)];
 [assembly:CLSCompliantAttribute(true)];

diff --git a/src/LibCecSharp/CecSharpTypes.h b/src/LibCecSharp/CecSharpTypes.h
index 908b3fc767633d51389f1fc71cdbee9481c73135..e183be36d5275091347d3f1202fe99face7bf23c 100644 (file)
--- a/src/LibCecSharp/CecSharpTypes.h
+++ b/src/LibCecSharp/CecSharpTypes.h
@@ -1167,7 +1167,11 @@ namespace CecSharp
     /// <summary>
     /// v2.0.1
     /// </summary>
-    Version2_0_1   = 0x2001
+    Version2_0_1   = 0x2001,
+    /// <summary>
+    /// v2.0.2
+    /// </summary>
+    Version2_0_2   = 0x2002
   };
 
   /// <summary>
@@ -1250,7 +1254,11 @@ namespace CecSharp
     /// <summary>
     /// v2.0.1
     /// </summary>
-    Version2_0_1   = 0x2001
+    Version2_0_1   = 0x2001,
+    /// <summary>
+    /// v2.0.2
+    /// </summary>
+    Version2_0_2   = 0x2002
   };
 
   /// <summary>

diff --git a/src/LibCecTray/Properties/AssemblyInfo.cs b/src/LibCecTray/Properties/AssemblyInfo.cs
index 80c33c6276723cfd9e361f1ad3a2f7f3b70e54d4..aad28dde6e8a8a833de0ede860435fd8c2043356 100644 (file)
--- a/src/LibCecTray/Properties/AssemblyInfo.cs
+++ b/src/LibCecTray/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.1.0")]
-[assembly: AssemblyFileVersion("2.0.1.0")]
+[assembly: AssemblyVersion("2.0.2.0")]
+[assembly: AssemblyFileVersion("2.0.2.0")]

diff --git a/src/LibCecTray/controller/CECController.cs b/src/LibCecTray/controller/CECController.cs
index f81cd94181379d9f1dc9e70edb8648220f91ec4b..ebce4baecc4ce5bc416bd7927eb5f7f459bde275 100644 (file)
--- a/src/LibCecTray/controller/CECController.cs
+++ b/src/LibCecTray/controller/CECController.cs
@@ -438,7 +438,7 @@ namespace LibCECTray.controller
       {
         if (_config == null)
         {
-          _config = new LibCECConfiguration { DeviceName = "CEC Tray", ClientVersion = CecClientVersion.Version2_0_0 };
+          _config = new LibCECConfiguration { DeviceName = "CEC Tray", ClientVersion = CecClientVersion.Version2_0_2 };
           _config.DeviceTypes.Types[0] = CecDeviceType.RecordingDevice;
           _config.SetCallbacks(this);
 

diff --git a/src/cec-config/cec-config.cpp b/src/cec-config/cec-config.cpp
index 380adeee91475a4585a853c17460004130e0abba..a7cae9c3a2c3501e4dd4ea99277bcb1886520db6 100644 (file)
--- a/src/cec-config/cec-config.cpp
+++ b/src/cec-config/cec-config.cpp
@@ -160,7 +160,7 @@ bool OpenConnection(cec_device_type type = CEC_DEVICE_TYPE_RECORDING_DEVICE)
   g_config.Clear();
   snprintf(g_config.strDeviceName, 13, "CEC-config");
   g_config.callbackParam      = NULL;
-  g_config.clientVersion      = (uint32_t)CEC_CLIENT_VERSION_2_0_0;
+  g_config.clientVersion      = (uint32_t)CEC_CLIENT_VERSION_2_0_2;
   g_callbacks.CBCecLogMessage = &CecLogMessage;
   g_callbacks.CBCecKeyPress   = &CecKeyPress;
   g_callbacks.CBCecCommand    = &CecCommand;

diff --git a/src/lib/CECTypeUtils.h b/src/lib/CECTypeUtils.h
index 5d34b466e92580ddfaa85a270792d1abe125edc6..21a651d59fe259fbcabcbb5683aacc3a761143c9 100644 (file)
--- a/src/lib/CECTypeUtils.h
+++ b/src/lib/CECTypeUtils.h
@@ -559,6 +559,8 @@ namespace CEC
         return "2.0.0";
       case CEC_CLIENT_VERSION_2_0_1:
         return "2.0.1";
+      case CEC_CLIENT_VERSION_2_0_2:
+        return "2.0.2";
       default:
         return "Unknown";
       }
@@ -602,10 +604,12 @@ namespace CEC
         return "1.9.0";
       case CEC_SERVER_VERSION_1_99_0:
         return "2.0.0-pre";
-      case CEC_CLIENT_VERSION_2_0_0:
+      case CEC_SERVER_VERSION_2_0_0:
         return "2.0.0";
-      case CEC_CLIENT_VERSION_2_0_1:
+      case CEC_SERVER_VERSION_2_0_1:
         return "2.0.1";
+      case CEC_SERVER_VERSION_2_0_2:
+        return "2.0.2";
       default:
         return "Unknown";
       }

diff --git a/src/testclient/main.cpp b/src/testclient/main.cpp
index 24ddde594eb7b9abd67503c6ee3fd453c65012ed..2050ee91000873ed899cdc16f97e2390aeb50aba 100644 (file)
--- a/src/testclient/main.cpp
+++ b/src/testclient/main.cpp
@@ -48,7 +48,7 @@ using namespace CEC;
 using namespace std;
 using namespace PLATFORM;
 
-#define CEC_CONFIG_VERSION CEC_CLIENT_VERSION_2_0_1;
+#define CEC_CONFIG_VERSION CEC_CLIENT_VERSION_2_0_2;
 
 #include "../../include/cecloader.h"