version bump to prepare for release 2.1.1

diff --git a/ChangeLog b/ChangeLog
index 79f81e6ca0b906712b87d39086b7d1fb5cba1739..1bdf5a7430b67d760b5b435b96922d2f6e33a960 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,30 @@
-libcec (2.1.0-1) unstable; urgency=low
+libcec (2.1.1-1) unstable; urgency=low
+
+  * changed / added:
+    * send an alert when the TV does not respond to polls
+  * fixed:
+    * LG didn't switch sources after the TV powered up
+       * always poll a device when the status is unknown, and don't try to
+         determine whether it needs to be polled by checking the status of other
+         devices
+       * don't mark a device as inactive when receiving a routing change message,
+         only when another device was made acive. fixes the issue that rc
+         passthrough doesn't work when a tv sends a quick routing change to
+         another port before requesting the active source when coming out of
+         standby
+    * LibCecSharp: fixed 14 char long OSD name (wasn't \0 terminated)
+       * LibCecSharp: fixed return value of GetActiveDevices(). issue #131
+       * cec-tray: fixed index out of range exception in CECSettingNumeric.cs.
+         bugzid: 2082
+       * cec-tray: ensure that the tray app only initialises once. bugzid: 2082
+       * rpi: don't set the physical address to 1.0.0.0 when receiving
+         VC_HDMI_UNPLUGGED. it may wake up device when they were just sent to
+         standby. issue #142
+       * osx: use the correct dylib name in cecloader.h, used by cec-client
+
+ -- Pulse-Eight Packaging <packaging@pulse-eight.com>  Fri, 8 Mar 2013 17:21:00 +0100
+ 
+ libcec (2.1.0-1) unstable; urgency=low
 
   * changed / added:
     * added vendor id for Denon

diff --git a/debian/changelog b/debian/changelog
index 79f81e6ca0b906712b87d39086b7d1fb5cba1739..1bdf5a7430b67d760b5b435b96922d2f6e33a960 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,30 @@
-libcec (2.1.0-1) unstable; urgency=low
+libcec (2.1.1-1) unstable; urgency=low
+
+  * changed / added:
+    * send an alert when the TV does not respond to polls
+  * fixed:
+    * LG didn't switch sources after the TV powered up
+       * always poll a device when the status is unknown, and don't try to
+         determine whether it needs to be polled by checking the status of other
+         devices
+       * don't mark a device as inactive when receiving a routing change message,
+         only when another device was made acive. fixes the issue that rc
+         passthrough doesn't work when a tv sends a quick routing change to
+         another port before requesting the active source when coming out of
+         standby
+    * LibCecSharp: fixed 14 char long OSD name (wasn't \0 terminated)
+       * LibCecSharp: fixed return value of GetActiveDevices(). issue #131
+       * cec-tray: fixed index out of range exception in CECSettingNumeric.cs.
+         bugzid: 2082
+       * cec-tray: ensure that the tray app only initialises once. bugzid: 2082
+       * rpi: don't set the physical address to 1.0.0.0 when receiving
+         VC_HDMI_UNPLUGGED. it may wake up device when they were just sent to
+         standby. issue #142
+       * osx: use the correct dylib name in cecloader.h, used by cec-client
+
+ -- Pulse-Eight Packaging <packaging@pulse-eight.com>  Fri, 8 Mar 2013 17:21:00 +0100
+ 
+ libcec (2.1.0-1) unstable; urgency=low
 
   * changed / added:
     * added vendor id for Denon

diff --git a/include/cectypes.h b/include/cectypes.h
index 1e2c7dbe2154444d27328a0b5121d99df78d1df4..e8670f8e7df2fa1c900e8f378f929b68533076a2 100644 (file)
--- a/include/cectypes.h
+++ b/include/cectypes.h
@@ -1406,7 +1406,8 @@ typedef enum cec_client_version
   CEC_CLIENT_VERSION_2_0_4   = 0x2004,
   CEC_CLIENT_VERSION_2_0_5   = 0x2005,
   CEC_CLIENT_VERSION_2_1_0   = 0x2100,
-  CEC_CLIENT_VERSION_CURRENT = 0x2100
+  CEC_CLIENT_VERSION_2_1_1   = 0x2101,
+  CEC_CLIENT_VERSION_CURRENT = 0x2101
 } cec_client_version;
 
 typedef enum cec_server_version
@@ -1435,7 +1436,8 @@ typedef enum cec_server_version
   CEC_SERVER_VERSION_2_0_4   = 0x2004,
   CEC_SERVER_VERSION_2_0_5   = 0x2005,
   CEC_SERVER_VERSION_2_1_0   = 0x2100,
-  CEC_SERVER_VERSION_CURRENT = 0x2100
+  CEC_SERVER_VERSION_2_1_1   = 0x2101,
+  CEC_SERVER_VERSION_CURRENT = 0x2101
 } cec_server_version;
 
 struct libcec_configuration

diff --git a/project/libCEC.nsi b/project/libCEC.nsi
index 3a34ab4ee35a15a48256fa0eb04fb8f11781948f..a7516d669721ef9ff478421db375a59afad05425 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.1.0"
+Name "Pulse-Eight libCEC version 2.1.1"
 OutFile "..\build\libCEC-installer.exe"
 
 XPStyle on

diff --git a/project/libcec.rc b/project/libcec.rc
index 3b766b503d42d16e5a53191062990107b65b9f6a..0f65c996e1e71a34e343e11233905d17a9ca1645 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 161e867088f8e8109cff9b74662049a9dba3832a..20d3b9090f22fbf33a9b10ac4c9f43c79ffc89fb 100644 (file)
Binary files a/project/testclient.rc and b/project/testclient.rc differ

diff --git a/src/CecSharpTester/Properties/AssemblyInfo.cs b/src/CecSharpTester/Properties/AssemblyInfo.cs
index f76423a2dd14664a8c6f8f398ed873d5a489b475..c955c60ed057882b8316b2338e511f2cdd10388b 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.1.0.0")]
-[assembly: AssemblyFileVersion("2.1.0.0")]
+[assembly: AssemblyVersion("2.1.1.0")]
+[assembly: AssemblyFileVersion("2.1.1.0")]

diff --git a/src/LibCecSharp/AssemblyInfo.cpp b/src/LibCecSharp/AssemblyInfo.cpp
index 441eca8592a42dccd326e2fb045730d1962e27d9..8bf6de300f7313060d13e9e9b3b8e1fea5563fa0 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.1.0.0")];
+[assembly:AssemblyVersionAttribute("2.1.1.0")];
 
 [assembly:ComVisible(false)];
 [assembly:CLSCompliantAttribute(true)];

diff --git a/src/LibCecSharp/CecSharpTypes.h b/src/LibCecSharp/CecSharpTypes.h
index c7636a1551bf2cc0696a66c0c942b482673c7319..ac2b93b91f95cbb945c3633a991a1151415cbbaf 100644 (file)
--- a/src/LibCecSharp/CecSharpTypes.h
+++ b/src/LibCecSharp/CecSharpTypes.h
@@ -1191,7 +1191,11 @@ namespace CecSharp
     /// <summary>
     /// v2.1.0
     /// </summary>
-    Version2_1_0   = 0x2100
+    Version2_1_0   = 0x2100,
+    /// <summary>
+    /// v2.1.1
+    /// </summary>
+    Version2_1_1   = 0x2101
   };
 
   /// <summary>
@@ -1294,7 +1298,11 @@ namespace CecSharp
     /// <summary>
     /// v2.1.0
     /// </summary>
-    Version2_1_0   = 0x2100
+    Version2_1_0   = 0x2100,
+    /// <summary>
+    /// v2.1.1
+    /// </summary>
+    Version2_1_1   = 0x2101
   };
 
   /// <summary>
@@ -1685,8 +1693,8 @@ namespace CecSharp
       PhysicalAddress     = CEC_DEFAULT_PHYSICAL_ADDRESS;
       BaseDevice          = (CecLogicalAddress)CEC_DEFAULT_BASE_DEVICE;
       HDMIPort            = CEC_DEFAULT_HDMI_PORT;
-      ClientVersion       = CecClientVersion::Version2_1_0;
-      ServerVersion       = CecServerVersion::Version2_1_0;
+      ClientVersion       = CecClientVersion::Version2_1_1;
+      ServerVersion       = CecServerVersion::Version2_1_1;
       TvVendor            = CecVendorId::Unknown;
 
       GetSettingsFromROM  = false;

diff --git a/src/LibCecTray/Properties/AssemblyInfo.cs b/src/LibCecTray/Properties/AssemblyInfo.cs
index 10d7be7cfd5677c316b209868c7afe4051a64f90..31f6311a2c723dcb17c05ca4794970615dd56a4c 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.1.0.0")]
-[assembly: AssemblyFileVersion("2.1.0.0")]
+[assembly: AssemblyVersion("2.1.1.0")]
+[assembly: AssemblyFileVersion("2.1.1.0")]

diff --git a/src/LibCecTray/Properties/Resources.Designer.cs b/src/LibCecTray/Properties/Resources.Designer.cs
index 0285bd39a57a66261f755804a74171e4ae367b23..1f62e34a18705a61edf4478322c00491d717feb0 100644 (file)
--- a/src/LibCecTray/Properties/Resources.Designer.cs
+++ b/src/LibCecTray/Properties/Resources.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.5448
+//     Runtime Version:2.0.50727.5466
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -304,7 +304,7 @@ namespace LibCECTray.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Pulse-Eight USB-CEC Adapter - libCECTray BETA3.
+        ///   Looks up a localized string similar to Pulse-Eight USB-CEC Adapter - libCECTray.
         /// </summary>
         internal static string app_name {
             get {

diff --git a/src/LibCecTray/Properties/Resources.resx b/src/LibCecTray/Properties/Resources.resx
index 14f481e8d75ede866490a9901b4b73ee6f2ca8dc..8cf1fae8f719dfc00c9420e8a056edebd90bc006 100644 (file)
--- a/src/LibCecTray/Properties/Resources.resx
+++ b/src/LibCecTray/Properties/Resources.resx
@@ -121,7 +121,7 @@
     <value>Could not detect to any CEC adapter. Please check your configuration. Do you want to try again?</value>
   </data>
   <data name="app_name" xml:space="preserve">
-    <value>Pulse-Eight USB-CEC Adapter - libCECTray BETA3</value>
+    <value>Pulse-Eight USB-CEC Adapter - libCECTray</value>
   </data>
   <data name="device_type_changed" xml:space="preserve">
     <value>You have changed the device type. Persist the configuration, and restart the application to use the new setting.</value>

diff --git a/src/lib/CECTypeUtils.h b/src/lib/CECTypeUtils.h
index 065d6849f605f0e8d5587abf1ce52b5058762e2a..4b406f12edf271a641f01f1d9d7855688191932d 100644 (file)
--- a/src/lib/CECTypeUtils.h
+++ b/src/lib/CECTypeUtils.h
@@ -571,6 +571,8 @@ namespace CEC
         return "2.0.5";
       case CEC_CLIENT_VERSION_2_1_0:
         return "2.1.0";
+      case CEC_CLIENT_VERSION_2_1_1:
+        return "2.1.1";
       default:
         return "Unknown";
       }
@@ -628,6 +630,8 @@ namespace CEC
         return "2.0.5";
       case CEC_SERVER_VERSION_2_1_0:
         return "2.1.0";
+      case CEC_SERVER_VERSION_2_1_1:
+        return "2.1.1";
       default:
         return "Unknown";
       }