bump to v2.1.3

diff --git a/ChangeLog b/ChangeLog
index ab93e67103474a54af6068a0c39bfca0a31119a4..d1d42d6fd4522e13570cfe70d42b82c6fb8fb0c8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,31 @@
+libcec (2.1.3-1) unstable; urgency=low
+
+  * changed / added:
+    * ask users to send an email when receiving an unhandled vendor command
+    * toshiba: map top menu and dvd menu buttons. closes #148
+    * LibCecSharp: sync alert types
+    * LibCecSharp: added CurrentVersion to the version enum
+    * CecSharpClient: use CurrentVersion instead of a hardcoded version
+    * CecTray: power management
+    * CecTray: split up asyncform
+    * CecTray: try/catch xml exceptions when reading the xml config. bugzid:
+      2082
+    * CecTray: use CurrentVersion instead of a hardcoded version
+    * CecTray: display a warning if we can't poll the TV
+    * CecTray: display alerts from libCEC
+    * CecTray: don't use lazy loading for the main controller, but pass the
+      instance. bugzid: 2082
+    * windows: converted to vs2012
+  * fixed:
+    * toshiba: toshiba handler wasn't initialised, and toshiba uses more than
+      one vendor id
+    * libCEC marked itself as inactive source when the stream path changed to
+      a device with a different physical address. bugzid: 2157
+    * TDA995x: report proper firmware revision
+    * windows: fix resource files and backwards compat dll names
+
+ -- Pulse-Eight Packaging <packaging@pulse-eight.com>  Fri, 10 May 2013 16:47:00 +0100
+
 libcec (2.1.1-1) unstable; urgency=low
 
   * changed / added:

diff --git a/debian/changelog b/debian/changelog
index ab93e67103474a54af6068a0c39bfca0a31119a4..d1d42d6fd4522e13570cfe70d42b82c6fb8fb0c8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,31 @@
+libcec (2.1.3-1) unstable; urgency=low
+
+  * changed / added:
+    * ask users to send an email when receiving an unhandled vendor command
+    * toshiba: map top menu and dvd menu buttons. closes #148
+    * LibCecSharp: sync alert types
+    * LibCecSharp: added CurrentVersion to the version enum
+    * CecSharpClient: use CurrentVersion instead of a hardcoded version
+    * CecTray: power management
+    * CecTray: split up asyncform
+    * CecTray: try/catch xml exceptions when reading the xml config. bugzid:
+      2082
+    * CecTray: use CurrentVersion instead of a hardcoded version
+    * CecTray: display a warning if we can't poll the TV
+    * CecTray: display alerts from libCEC
+    * CecTray: don't use lazy loading for the main controller, but pass the
+      instance. bugzid: 2082
+    * windows: converted to vs2012
+  * fixed:
+    * toshiba: toshiba handler wasn't initialised, and toshiba uses more than
+      one vendor id
+    * libCEC marked itself as inactive source when the stream path changed to
+      a device with a different physical address. bugzid: 2157
+    * TDA995x: report proper firmware revision
+    * windows: fix resource files and backwards compat dll names
+
+ -- Pulse-Eight Packaging <packaging@pulse-eight.com>  Fri, 10 May 2013 16:47:00 +0100
+
 libcec (2.1.1-1) unstable; urgency=low
 
   * changed / added:

diff --git a/include/cectypes.h b/include/cectypes.h
index 82bf6478cdf232b47e7da078a6dd1d0908437947..01adebee49e856d20da9a882aa978d6e8799fc8a 100644 (file)
--- a/include/cectypes.h
+++ b/include/cectypes.h
@@ -1418,7 +1418,9 @@ typedef enum cec_client_version
   CEC_CLIENT_VERSION_2_0_5   = 0x2005,
   CEC_CLIENT_VERSION_2_1_0   = 0x2100,
   CEC_CLIENT_VERSION_2_1_1   = 0x2101,
-  CEC_CLIENT_VERSION_CURRENT = 0x2101
+  CEC_CLIENT_VERSION_2_1_2   = 0x2102,
+  CEC_CLIENT_VERSION_2_1_3   = 0x2103,
+  CEC_CLIENT_VERSION_CURRENT = 0x2103
 } cec_client_version;
 
 typedef enum cec_server_version
@@ -1448,7 +1450,9 @@ typedef enum cec_server_version
   CEC_SERVER_VERSION_2_0_5   = 0x2005,
   CEC_SERVER_VERSION_2_1_0   = 0x2100,
   CEC_SERVER_VERSION_2_1_1   = 0x2101,
-  CEC_SERVER_VERSION_CURRENT = 0x2101
+  CEC_SERVER_VERSION_2_1_2   = 0x2102,
+  CEC_SERVER_VERSION_2_1_3   = 0x2103,
+  CEC_SERVER_VERSION_CURRENT = 0x2103
 } cec_server_version;
 
 struct libcec_configuration

diff --git a/project/LibCecSharp/LibCecSharp.rc b/project/LibCecSharp/LibCecSharp.rc
index a5f6f8cbb2cc107322347e43a59e0a041f98e65e..81ae7b48c7953e8300a20633b9ef48091b048e39 100644 (file)
Binary files a/project/LibCecSharp/LibCecSharp.rc and b/project/LibCecSharp/LibCecSharp.rc differ

diff --git a/project/libCEC.nsi b/project/libCEC.nsi
index 36ade3b420eeb452b80dcb91398bd3335df57346..a539dc7bc4898b1884b3b3ad8b2362875aa906ad 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.1"
+Name "Pulse-Eight libCEC"
 OutFile "..\build\libCEC-installer.exe"
 
 XPStyle on

diff --git a/project/libcec/libcec.rc b/project/libcec/libcec.rc
index f73618f9a602f4436b2b446451ab48dd76223261..dd5aea5f2eba5e4eb92b4fbf31b6c0cb7a13027b 100644 (file)
Binary files a/project/libcec/libcec.rc and b/project/libcec/libcec.rc differ

diff --git a/project/testclient/testclient.rc b/project/testclient/testclient.rc
index ae1bb7673c526c67a1a9c892f2e1d2c4061080ba..5be543716e369255152c5004e85f15ffad62da76 100644 (file)
Binary files a/project/testclient/testclient.rc and b/project/testclient/testclient.rc differ

diff --git a/src/CecSharpTester/Properties/AssemblyInfo.cs b/src/CecSharpTester/Properties/AssemblyInfo.cs
index c955c60ed057882b8316b2338e511f2cdd10388b..de041e6f5f6c16cd7874d0c0106bd0cca67c6728 100644 (file)
--- a/src/CecSharpTester/Properties/AssemblyInfo.cs
+++ b/src/CecSharpTester/Properties/AssemblyInfo.cs
@@ -8,9 +8,9 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTitle("CecSharpClient")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Pulse-Eight Ltd.")]
+[assembly: AssemblyCompany("Pulse-Eight Limited")]
 [assembly: AssemblyProduct("CecSharpClient")]
-[assembly: AssemblyCopyright("Copyright (c) Pulse-Eight Ltd. 2011-2013")]
+[assembly: AssemblyCopyright("Copyright (c) Pulse-Eight Limited 2011-2013")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -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.1.0")]
-[assembly: AssemblyFileVersion("2.1.1.0")]
+[assembly: AssemblyVersion("2.1.3.0")]
+[assembly: AssemblyFileVersion("2.1.3.0")]

diff --git a/src/LibCecSharp/AssemblyInfo.cpp b/src/LibCecSharp/AssemblyInfo.cpp
index 8bf6de300f7313060d13e9e9b3b8e1fea5563fa0..50e65ec37773effd7fedadd6062a34184c31aced 100644 (file)
--- a/src/LibCecSharp/AssemblyInfo.cpp
+++ b/src/LibCecSharp/AssemblyInfo.cpp
@@ -7,13 +7,13 @@ using namespace System::Security::Permissions;
 [assembly:AssemblyTitleAttribute("LibCecSharp")];
 [assembly:AssemblyDescriptionAttribute("")];
 [assembly:AssemblyConfigurationAttribute("")];
-[assembly:AssemblyCompanyAttribute("Pulse-Eight Ltd.")];
+[assembly:AssemblyCompanyAttribute("Pulse-Eight Limited")];
 [assembly:AssemblyProductAttribute("LibCecSharp")];
-[assembly:AssemblyCopyrightAttribute("Copyright (c) Pulse-Eight Ltd. 2011-2013")];
+[assembly:AssemblyCopyrightAttribute("Copyright (c) Pulse-Eight Limited 2011-2013")];
 [assembly:AssemblyTrademarkAttribute("")];
 [assembly:AssemblyCultureAttribute("")];
 
-[assembly:AssemblyVersionAttribute("2.1.1.0")];
+[assembly:AssemblyVersionAttribute("2.1.3.0")];
 
 [assembly:ComVisible(false)];
 [assembly:CLSCompliantAttribute(true)];

diff --git a/src/LibCecSharp/CecSharpTypes.h b/src/LibCecSharp/CecSharpTypes.h
index 8a7410ea954403bf43214a3375881dbb8516181f..89c9d3bd49eb2257a899176b8c85421fc35fac8b 100644 (file)
--- a/src/LibCecSharp/CecSharpTypes.h
+++ b/src/LibCecSharp/CecSharpTypes.h
@@ -1217,9 +1217,17 @@ namespace CecSharp
     /// </summary>
     Version2_1_1   = 0x2101,
     /// <summary>
+    /// v2.1.2
+    /// </summary>
+    Version2_1_2   = 0x2102,
+    /// <summary>
+    /// v2.1.3
+    /// </summary>
+    Version2_1_3   = 0x2103,
+    /// <summary>
     /// The current version
     /// </summary>
-    CurrentVersion = 0x2101
+    CurrentVersion = 0x2103
   };
 
   /// <summary>
@@ -1328,9 +1336,17 @@ namespace CecSharp
     /// </summary>
     Version2_1_1   = 0x2101,
     /// <summary>
+    /// v2.1.2
+    /// </summary>
+    Version2_1_2   = 0x2102,
+    /// <summary>
+    /// v2.1.3
+    /// </summary>
+    Version2_1_3   = 0x2103,
+    /// <summary>
     /// The current version
     /// </summary>
-    CurrentVersion = 0x2101
+    CurrentVersion = 0x2103
   };
 
   /// <summary>
@@ -1721,8 +1737,8 @@ namespace CecSharp
       PhysicalAddress     = CEC_DEFAULT_PHYSICAL_ADDRESS;
       BaseDevice          = (CecLogicalAddress)CEC_DEFAULT_BASE_DEVICE;
       HDMIPort            = CEC_DEFAULT_HDMI_PORT;
-      ClientVersion       = CecClientVersion::Version2_1_1;
-      ServerVersion       = CecServerVersion::Version2_1_1;
+      ClientVersion       = CecClientVersion::CurrentVersion;
+      ServerVersion       = CecServerVersion::CurrentVersion;
       TvVendor            = CecVendorId::Unknown;
 
       GetSettingsFromROM  = false;

diff --git a/src/LibCecTray/Properties/AssemblyInfo.cs b/src/LibCecTray/Properties/AssemblyInfo.cs
index 31f6311a2c723dcb17c05ca4794970615dd56a4c..edb540034f22690fb2e35ebb6600ebf457861f11 100644 (file)
--- a/src/LibCecTray/Properties/AssemblyInfo.cs
+++ b/src/LibCecTray/Properties/AssemblyInfo.cs
@@ -7,9 +7,9 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTitle("CECTray")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Pulse-Eight Ltd.")]
+[assembly: AssemblyCompany("Pulse-Eight Limited")]
 [assembly: AssemblyProduct("libCEC Tray")]
-[assembly: AssemblyCopyright("Copyright (c) Pulse-Eight Ltd. 2011-2013")]
+[assembly: AssemblyCopyright("Copyright (c) Pulse-Eight Limited 2011-2013")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -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.1.0")]
-[assembly: AssemblyFileVersion("2.1.1.0")]
+[assembly: AssemblyVersion("2.1.3.0")]
+[assembly: AssemblyFileVersion("2.1.3.0")]

diff --git a/src/lib/CECTypeUtils.h b/src/lib/CECTypeUtils.h
index b5541aa5d9f53b76ae91339882924488e7b2256b..506974b74f58d1172c0d549170f573a10fc91f95 100644 (file)
--- a/src/lib/CECTypeUtils.h
+++ b/src/lib/CECTypeUtils.h
@@ -576,6 +576,10 @@ namespace CEC
         return "2.1.0";
       case CEC_CLIENT_VERSION_2_1_1:
         return "2.1.1";
+      case CEC_CLIENT_VERSION_2_1_2:
+        return "2.1.2";
+      case CEC_CLIENT_VERSION_2_1_3:
+        return "2.1.3";
       default:
         return "Unknown";
       }
@@ -635,6 +639,10 @@ namespace CEC
         return "2.1.0";
       case CEC_SERVER_VERSION_2_1_1:
         return "2.1.1";
+      case CEC_SERVER_VERSION_2_1_2:
+        return "2.1.2";
+      case CEC_SERVER_VERSION_2_1_3:
+        return "2.1.3";
       default:
         return "Unknown";
       }