cec: updated changelog and bumped version numbers for 1.6.1

diff --git a/debian/changelog b/debian/changelog
index d3b160e802b425813b64e25a0c2d3b1c6913fde1..a04a10017101f46687a3d310d26b261e7aa3a7dd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+libcec (1.6-2) unstable; urgency=low
+
+  * fixed:
+    * fixed typo in CUSBCECAdapterCommands::RequestSettings() that prevented
+      the settings from being read. the settings were still written, but never
+      read when bGetSettingsFromROM = 1.
+
+ -- Pulse-Eight Packaging <packaging@pulse-eight.com>  Wed, 18 Apr 2012 11:30:00 +0100
+
 libcec (1.6-1) unstable; urgency=medium
 
   * changed/added:

diff --git a/include/cectypes.h b/include/cectypes.h
index 28c8d923b487d906d4cead98591f34c7443795a4..1fd6dfd300e5fee62846edc496a55445bc617b40 100644 (file)
--- a/include/cectypes.h
+++ b/include/cectypes.h
@@ -90,7 +90,7 @@ namespace CEC {
 
 #define CEC_MIN_LIB_VERSION          1
 #define CEC_LIB_VERSION_MAJOR        1
-#define CEC_LIB_VERSION_MINOR        5
+#define CEC_LIB_VERSION_MINOR        6
 
 typedef enum cec_abort_reason
 {
@@ -994,7 +994,8 @@ typedef enum cec_client_version
   CEC_CLIENT_VERSION_1_5_1   = 0x1501,
   CEC_CLIENT_VERSION_1_5_2   = 0x1502,
   CEC_CLIENT_VERSION_1_5_3   = 0x1503,
-  CEC_CLIENT_VERSION_1_6_0   = 0x1600
+  CEC_CLIENT_VERSION_1_6_0   = 0x1600,
+  CEC_CLIENT_VERSION_1_6_1   = 0x1601
 } cec_client_version;
 
 typedef enum cec_server_version
@@ -1004,7 +1005,8 @@ typedef enum cec_server_version
   CEC_SERVER_VERSION_1_5_1   = 0x1501,
   CEC_SERVER_VERSION_1_5_2   = 0x1502,
   CEC_SERVER_VERSION_1_5_3   = 0x1503,
-  CEC_SERVER_VERSION_1_6_0   = 0x1600
+  CEC_SERVER_VERSION_1_6_0   = 0x1600,
+  CEC_SERVER_VERSION_1_6_1   = 0x1601
 } cec_server_version;
 
 typedef struct libcec_configuration

diff --git a/project/cec-config.rc b/project/cec-config.rc
index cc3fb1333f8b18d5d2ade9a6e46fad6e45f4aca7..0b0f33b5c99e21b386b95a62572ae7c6a3db2bb7 100644 (file)
Binary files a/project/cec-config.rc and b/project/cec-config.rc differ

diff --git a/project/libcec.rc b/project/libcec.rc
index c51d36b6dff587a1c3101fbd754523cb221e6536..6c5f6ee36fabe5b78c9d1558fb714a9a1fa422ae 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 d4bfa3b625bbc8a883001b6e3d17bfb326b0b5af..b8821e380cbed6042133fdaf9436b3a5b25ca458 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 442c282afacedfd0843193d97499780e2a843400..216382377e59744f2239769c4ea20ffeb9e21fc2 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.Version1_5_0;
+      Config.ClientVersion = CecClientVersion.Version1_6_1;
       Config.SetCallbacks(this);
       LogLevel = (int)CecLogLevel.All;
 

diff --git a/src/CecSharpTester/Properties/AssemblyInfo.cs b/src/CecSharpTester/Properties/AssemblyInfo.cs
index bc1156738cfa00eb79db2a2a6cbc630eda50b504..439ae4c9035c48b6d6111095d96fe872b146d79f 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("1.6.0.0")]
-[assembly: AssemblyFileVersion("1.6.0.0")]
+[assembly: AssemblyVersion("1.6.1.0")]
+[assembly: AssemblyFileVersion("1.6.1.0")]

diff --git a/src/LibCecSharp/AssemblyInfo.cpp b/src/LibCecSharp/AssemblyInfo.cpp
index d70e9d0f4605ad924be62a01973569b633a39005..6af994786c8168a7e872f773a3f25f3445c28542 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("1.6.0.0")];
+[assembly:AssemblyVersionAttribute("1.6.1.0")];
 
 [assembly:ComVisible(false)];
 [assembly:CLSCompliantAttribute(true)];

diff --git a/src/LibCecSharp/CecSharpTypes.h b/src/LibCecSharp/CecSharpTypes.h
index cc888c79ad320646b1bb9139b3d6803736d62bdf..d6189257294772358f14a75b3fbdb11b8adc22c5 100644 (file)
--- a/src/LibCecSharp/CecSharpTypes.h
+++ b/src/LibCecSharp/CecSharpTypes.h
@@ -350,20 +350,22 @@ namespace CecSharp
        {
                VersionPre1_5 = 0,
                Version1_5_0  = 0x1500,
-    Version1_5_1  = 0x1501,
-    Version1_5_2  = 0x1502,
-    Version1_5_3  = 0x1503,
-    Version1_6_0  = 0x1600
+               Version1_5_1  = 0x1501,
+               Version1_5_2  = 0x1502,
+               Version1_5_3  = 0x1503,
+               Version1_6_0  = 0x1600,
+               Version1_6_1  = 0x1601
        };
 
-  public enum class CecServerVersion
+       public enum class CecServerVersion
        {
                VersionPre1_5 = 0,
                Version1_5_0  = 0x1500,
-    Version1_5_1  = 0x1501,
-    Version1_5_2  = 0x1502,
-    Version1_5_3  = 0x1503,
-    Version1_6_0  = 0x1600
+               Version1_5_1  = 0x1501,
+               Version1_5_2  = 0x1502,
+               Version1_5_3  = 0x1503,
+               Version1_6_0  = 0x1600,
+               Version1_6_1  = 0x1601
        };
 
        public ref class CecAdapter

diff --git a/src/cec-config-gui/Properties/AssemblyInfo.cs b/src/cec-config-gui/Properties/AssemblyInfo.cs
index 829c8473b63d44d104c8472facda462faad6d3ac..26a9fb3b0bffd8bba4c0e3500e473eef5c9d10ef 100644 (file)
--- a/src/cec-config-gui/Properties/AssemblyInfo.cs
+++ b/src/cec-config-gui/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("1.6.0.0")]
-[assembly: AssemblyFileVersion("1.6.0.0")]
+[assembly: AssemblyVersion("1.6.1.0")]
+[assembly: AssemblyFileVersion("1.6.1.0")]

diff --git a/src/lib/CECProcessor.cpp b/src/lib/CECProcessor.cpp
index c7d586e79cce42ab39e061a69b419ebbf786d3f6..cf42233f5f878adc44176424cab48511ed230833 100644 (file)
--- a/src/lib/CECProcessor.cpp
+++ b/src/lib/CECProcessor.cpp
@@ -59,7 +59,7 @@ CCECProcessor::CCECProcessor(CLibCEC *controller, libcec_configuration *configur
 {
   CreateBusDevices();
   m_configuration.Clear();
-  m_configuration.serverVersion = CEC_SERVER_VERSION_1_6_0;
+  m_configuration.serverVersion = CEC_SERVER_VERSION_1_6_1;
   SetConfiguration(configuration);
 
   if (m_configuration.tvVendor != CEC_VENDOR_UNKNOWN)
@@ -77,7 +77,7 @@ CCECProcessor::CCECProcessor(CLibCEC *controller, const char *strDeviceName, con
     m_iLastTransmission(0)
 {
   m_configuration.Clear();
-  m_configuration.serverVersion    = CEC_SERVER_VERSION_1_6_0;
+  m_configuration.serverVersion    = CEC_SERVER_VERSION_1_6_1;
 
   // client version < 1.5.0
   m_configuration.clientVersion    = (uint32_t)CEC_CLIENT_VERSION_PRE_1_5;
@@ -1414,6 +1414,8 @@ const char *CCECProcessor::ToString(const cec_client_version version)
     return "1.5.3";
   case CEC_CLIENT_VERSION_1_6_0:
     return "1.6.0";
+  case CEC_CLIENT_VERSION_1_6_1:
+    return "1.6.1";
   default:
     return "Unknown";
   }
@@ -1435,6 +1437,8 @@ const char *CCECProcessor::ToString(const cec_server_version version)
     return "1.5.3";
   case CEC_SERVER_VERSION_1_6_0:
     return "1.6.0";
+  case CEC_SERVER_VERSION_1_6_1:
+    return "1.6.1";
   default:
     return "Unknown";
   }

diff --git a/src/lib/LibCEC.cpp b/src/lib/LibCEC.cpp
index 3230e684d9779aaa21e068932b9fb2be0ec0d274..20c670d3a6c028f020f80d055804076f8f4c1d3e 100644 (file)
--- a/src/lib/LibCEC.cpp
+++ b/src/lib/LibCEC.cpp
@@ -60,7 +60,7 @@ CLibCEC::CLibCEC(libcec_configuration *configuration) :
     m_callbacks(configuration->callbacks),
     m_cbParam(configuration->callbackParam)
 {
-  configuration->serverVersion = CEC_SERVER_VERSION_1_6_0;
+  configuration->serverVersion = CEC_SERVER_VERSION_1_6_1;
   m_cec = new CCECProcessor(this, configuration);
 }
 

diff --git a/src/testclient/main.cpp b/src/testclient/main.cpp
index c47017d328b661d978cc359c767dbb84fbff92c1..0e7387487564a4779cd58cd4444f39f5a0befdeb 100644 (file)
--- a/src/testclient/main.cpp
+++ b/src/testclient/main.cpp
@@ -1068,7 +1068,7 @@ int main (int argc, char *argv[])
   g_config.Clear();
   snprintf(g_config.strDeviceName, 13, "CECTester");
   g_config.callbackParam       = NULL;
-  g_config.clientVersion       = CEC_CLIENT_VERSION_1_6_0;
+  g_config.clientVersion       = CEC_CLIENT_VERSION_1_6_1;
   g_callbacks.CBCecLogMessage  = &CecLogMessage;
   g_callbacks.CBCecKeyPress    = &CecKeyPress;
   g_callbacks.CBCecCommand     = &CecCommand;