From b53bfc2d959e562ee603cc7d74298d1a42fba57e Mon Sep 17 00:00:00 2001 From: Lars Op den Kamp Date: Sun, 7 Apr 2013 11:40:48 +0200 Subject: [PATCH] bump to v2.1.3 --- ChangeLog | 28 ++++++++++++++++++ debian/changelog | 28 ++++++++++++++++++ include/cectypes.h | 8 +++-- project/LibCecSharp/LibCecSharp.rc | Bin 5148 -> 5148 bytes project/libCEC.nsi | 2 +- project/libcec/libcec.rc | Bin 5170 -> 5170 bytes project/testclient/testclient.rc | Bin 5204 -> 5204 bytes src/CecSharpTester/Properties/AssemblyInfo.cs | 8 ++--- src/LibCecSharp/AssemblyInfo.cpp | 6 ++-- src/LibCecSharp/CecSharpTypes.h | 24 ++++++++++++--- src/LibCecTray/Properties/AssemblyInfo.cs | 8 ++--- src/lib/CECTypeUtils.h | 8 +++++ 12 files changed, 102 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index ab93e67..d1d42d6 100644 --- 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 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 ab93e67..d1d42d6 100644 --- 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 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 82bf647..01adebe 100644 --- 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 GIT binary patch delta 52 zcmbQEF-K#=5mrXy$wyfY8I3o8XZ^^;YRsU=U@$qKOLwyrCm$0tkUM!UyX53BZlTR# H+{ZWotM?A; delta 52 zcmbQEF-K#=5mrXS$wyfY84WjoXZ^^;YRI6+U@$qKOLwyrCm$0tkUM!UyX53BZlTR# H+{ZWos`U=z diff --git a/project/libCEC.nsi b/project/libCEC.nsi index 36ade3b..a539dc7 100644 --- 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 GIT binary patch delta 42 wcmdm_u}NdY5mrXy$wyfY8I3o8XH{hea_qUKCqLj2+w8~rfe|Qb&;6ML05;4G-v9sr delta 42 wcmdm_u}NdY5mrXS$wyfY84WjoXH{hea_qUKCqLj2+w8~rfe|Qb&;6ML05%#8*8l(j diff --git a/project/testclient/testclient.rc b/project/testclient/testclient.rc index ae1bb7673c526c67a1a9c892f2e1d2c4061080ba..5be543716e369255152c5004e85f15ffad62da76 100644 GIT binary patch delta 42 wcmcbjaYbXp5mrXy$wyfY8I3o8XO(9LauT_vCp&P7ZT8@lU;>IJa)0Ik05cd2<^TWy delta 42 wcmcbjaYbXp5mrXS$wyfY84WjoXO(9LauT_vCp&P7ZT8@lU;>IJa)0Ik05WC_-T(jq diff --git a/src/CecSharpTester/Properties/AssemblyInfo.cs b/src/CecSharpTester/Properties/AssemblyInfo.cs index c955c60..de041e6 100644 --- 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 8bf6de3..50e65ec 100644 --- 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 8a7410e..89c9d3b 100644 --- a/src/LibCecSharp/CecSharpTypes.h +++ b/src/LibCecSharp/CecSharpTypes.h @@ -1217,9 +1217,17 @@ namespace CecSharp /// Version2_1_1 = 0x2101, /// + /// v2.1.2 + /// + Version2_1_2 = 0x2102, + /// + /// v2.1.3 + /// + Version2_1_3 = 0x2103, + /// /// The current version /// - CurrentVersion = 0x2101 + CurrentVersion = 0x2103 }; /// @@ -1328,9 +1336,17 @@ namespace CecSharp /// Version2_1_1 = 0x2101, /// + /// v2.1.2 + /// + Version2_1_2 = 0x2102, + /// + /// v2.1.3 + /// + Version2_1_3 = 0x2103, + /// /// The current version /// - CurrentVersion = 0x2101 + CurrentVersion = 0x2103 }; /// @@ -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 31f6311..edb5400 100644 --- 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 b5541aa..506974b 100644 --- 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"; } -- 2.34.1