diff -Nru libcec-2.1.1/ChangeLog libcec-2.1.4/ChangeLog
--- libcec-2.1.1/ChangeLog	2013-03-09 20:14:55.000000000 +0000
+++ libcec-2.1.4/ChangeLog	2013-12-13 18:06:00.000000000 +0000
@@ -1,3 +1,89 @@
+libcec (2.1.4-1) unstable; urgency=low
+
+  * changed / added:
+    * set the vendor id of devices handled by libCEC to our vendor id
+    * added protection against standby without a notification from XBMC and
+      clock changes. issue #186
+    * update system audio mode when audio system devices are activated
+    * added vendor id and name 'Harman/Kardon'
+    * added vendor id and name 'Marantz'
+    * cec-tray: support for away mode
+    * cec-tray: support for screensaver events
+  * fixed:
+    * fixed potential crash when SendCommand returns NULL
+    * fixed crash when CCECProcessor::Transmit was called after
+      CCECProcessor::Close
+    * always call the SourceActivated() callback in
+      CCECBusDevice::MarkAsActiveSource(), even when we were already active,
+      and let clients handle dupes. this prevented the screensaver from
+      being cancelled in XBMC
+    * send our vendor id when the tv sends it's vendor id
+    * transmit our physical address when the TV sends it's physical address
+    * potential deadlock
+    * leak on exit in CWaitForResponse::Clear()
+    * also transmit an active source message as response to a set stream path
+      command when we were already marked as active. bugzid: 3116
+    * only send an active source message when receiving a routing change to an
+      address handled by libCEC. issue #56
+    * HandleVendorRemoteButtonUp -> HandleUserControlRelease for all vendors
+    * silence warning for xx:a0:00:09:b0:00:80:20. bugzid: 2559
+    * fixed comboKeyTimeout=0. closes #168
+    * Panasonic: doesn't request the active source status when powered up, but
+      it does send a vendor command. send an active source message when we're
+      marked as active source after receiving this command. issue #192
+    * possible crash when the tv does not respond to polls and the client isn't
+      registered yet. don't poll the tv in monitoring mode. closes #163
+    * Panasonic: standby command
+    * Panasonic: silence 'unmapped code' warning. bugzid: 2375
+    * LG: clean up and attempt to fix issue #176
+    * LG: newer firmwares don't send a second power status request after it's
+      been requested once and replied with 'standby -> on' like previous
+      versions. send an active source message in an attempt to fix this. issue:
+      #176
+    * Sharp: check whether the 'auto power on' option is disabled and tell the
+      user how to enable it
+    * Samsung: respond to vendor command 0x23 sent by samsung. attempt to fix
+      bugzid: 2164
+    * cec-client: try to reconnect when the connection was lost
+    * cec-tray: crash on load (MissingManifestResourceException)
+    * cec-tray: crash or deadlock on exit
+    * cec-tray: crash when the connection to the adapter was lost
+    * cec-tray: display TV not responding warning on top
+    * windows: build libCEC and cec-client against toolset v100 (VS2010)
+    * FreeBSD: proper the adapter detection. credits @fneufneu
+    * suppress mangling warning. credits @warped-rudi. closes #190
+
+ -- Pulse-Eight Packaging <packaging@pulse-eight.com>  Sat, 13 Dec 2013 16:02:00 +0100
+
+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 (credits: @warped-rudi)
+    * TDA995x: avoid callback when already stopped (credits: @warped-rudi)
+    * windows: fix resource files and backwards compat dll names
+
+ -- Pulse-Eight Packaging <packaging@pulse-eight.com>  Sat, 11 May 2013 10:06:00 +0000
+
 libcec (2.1.1-1) unstable; urgency=low
 
   * changed / added:
diff -Nru libcec-2.1.1/README libcec-2.1.4/README
--- libcec-2.1.1/README	2013-03-09 20:14:55.000000000 +0000
+++ libcec-2.1.4/README	2013-12-13 18:06:00.000000000 +0000
@@ -52,15 +52,16 @@
                               === Windows ===
 ===============================================================================
 
-To compile libCEC on Windows, you'll need Visual C++ 2010 or Visual Studio 2010
-The installer needs the Windows DDK (Driver Development Kit) and Nullsoft's
-NSIS.
+To compile libCEC on Windows, you'll need Visual Studio 2012 and Visual Studio
+or Visual C++ 2008. The latter is needed to build LibCecSharp for .Net
+Framework 2.0.
 
-To compile LibCecSharp on Windows, you'll need Visual C++ 2008 or Visual Studio
-2008, because it is compiled against .NET 2.0.
+The adapter detection code needs the Windows DDK (Driver Development Kit).
+
+To create an installer, you'll need Nullsoft's NSIS.
 
 To compile libCEC, follow these instructions:
-* open /project/libcec.sln with Visual C++ 2010 or Visual Studio 2010.
+* open /project/libcec.sln with Visual Studio 2012.
 * build the project.
 
 To build an installer on Windows:
@@ -68,12 +69,6 @@
 * go to /project and execute create-installer.bat to create the installer.
 * the installer is stored as /build/libCEC-installer.exe
 
-You will need both Visual Studio 2008 and Visual Studio 2010 to build the
-installer from the command line. To build with Visual C++ 2008 and 2010,
-you will need to manually build libcec with Visual C++ 2010 and then
-build LibCecSharp.sln with Visual Studio 2008. See create-installer.bat
-for the required steps.
-
 ===============================================================================
                            === Raspberry Pi ===
 ===============================================================================
diff -Nru libcec-2.1.1/configure libcec-2.1.4/configure
--- libcec-2.1.1/configure	2013-03-09 20:23:00.000000000 +0000
+++ libcec-2.1.4/configure	2013-12-13 18:15:11.000000000 +0000
@@ -17513,7 +17513,7 @@
 LIBS_LIBCEC="$LIBS"
 LIBS="$libs_client"
 
-CXXFLAGS="$CXXFLAGS -fPIC -Wall -Wextra -Wno-missing-field-initializers"
+CXXFLAGS="$CXXFLAGS -fPIC -Wall -Wextra -Wno-missing-field-initializers -Wno-psabi"
 
 if test "x$use_debug" = "xyes"; then
   CXXFLAGS="$CXXFLAGS -g"
diff -Nru libcec-2.1.1/configure.ac libcec-2.1.4/configure.ac
--- libcec-2.1.1/configure.ac	2013-03-09 20:14:55.000000000 +0000
+++ libcec-2.1.4/configure.ac	2013-12-13 18:06:00.000000000 +0000
@@ -342,7 +342,7 @@
 LIBS_LIBCEC="$LIBS"
 LIBS="$libs_client"
 
-CXXFLAGS="$CXXFLAGS -fPIC -Wall -Wextra -Wno-missing-field-initializers"
+CXXFLAGS="$CXXFLAGS -fPIC -Wall -Wextra -Wno-missing-field-initializers -Wno-psabi"
 
 if test "x$use_debug" = "xyes"; then
   CXXFLAGS="$CXXFLAGS -g"
diff -Nru libcec-2.1.1/debian/changelog libcec-2.1.4/debian/changelog
--- libcec-2.1.1/debian/changelog	2013-03-09 20:22:55.000000000 +0000
+++ libcec-2.1.4/debian/changelog	2013-12-13 18:15:06.000000000 +0000
@@ -1,8 +1,94 @@
-libcec (2.1.1-5~precise) precise; urgency=low
+libcec (2.1.4-2~precise) precise; urgency=low
 
   * Build for Ubuntu 'precise'
 
- -- Pulse-Eight Packaging <packaging@pulse-eight.com>  Sat, 09 Mar 2013 21:22:55 +0100
+ -- Pulse-Eight Packaging <packaging@pulse-eight.com>  Fri, 13 Dec 2013 19:15:06 +0100
+
+libcec (2.1.4-1) unstable; urgency=low
+
+  * changed / added:
+    * set the vendor id of devices handled by libCEC to our vendor id
+    * added protection against standby without a notification from XBMC and
+      clock changes. issue #186
+    * update system audio mode when audio system devices are activated
+    * added vendor id and name 'Harman/Kardon'
+    * added vendor id and name 'Marantz'
+    * cec-tray: support for away mode
+    * cec-tray: support for screensaver events
+  * fixed:
+    * fixed potential crash when SendCommand returns NULL
+    * fixed crash when CCECProcessor::Transmit was called after
+      CCECProcessor::Close
+    * always call the SourceActivated() callback in
+      CCECBusDevice::MarkAsActiveSource(), even when we were already active,
+      and let clients handle dupes. this prevented the screensaver from
+      being cancelled in XBMC
+    * send our vendor id when the tv sends it's vendor id
+    * transmit our physical address when the TV sends it's physical address
+    * potential deadlock
+    * leak on exit in CWaitForResponse::Clear()
+    * also transmit an active source message as response to a set stream path
+      command when we were already marked as active. bugzid: 3116
+    * only send an active source message when receiving a routing change to an
+      address handled by libCEC. issue #56
+    * HandleVendorRemoteButtonUp -> HandleUserControlRelease for all vendors
+    * silence warning for xx:a0:00:09:b0:00:80:20. bugzid: 2559
+    * fixed comboKeyTimeout=0. closes #168
+    * Panasonic: doesn't request the active source status when powered up, but
+      it does send a vendor command. send an active source message when we're
+      marked as active source after receiving this command. issue #192
+    * possible crash when the tv does not respond to polls and the client isn't
+      registered yet. don't poll the tv in monitoring mode. closes #163
+    * Panasonic: standby command
+    * Panasonic: silence 'unmapped code' warning. bugzid: 2375
+    * LG: clean up and attempt to fix issue #176
+    * LG: newer firmwares don't send a second power status request after it's
+      been requested once and replied with 'standby -> on' like previous
+      versions. send an active source message in an attempt to fix this. issue:
+      #176
+    * Sharp: check whether the 'auto power on' option is disabled and tell the
+      user how to enable it
+    * Samsung: respond to vendor command 0x23 sent by samsung. attempt to fix
+      bugzid: 2164
+    * cec-client: try to reconnect when the connection was lost
+    * cec-tray: crash on load (MissingManifestResourceException)
+    * cec-tray: crash or deadlock on exit
+    * cec-tray: crash when the connection to the adapter was lost
+    * cec-tray: display TV not responding warning on top
+    * windows: build libCEC and cec-client against toolset v100 (VS2010)
+    * FreeBSD: proper the adapter detection. credits @fneufneu
+    * suppress mangling warning. credits @warped-rudi. closes #190
+
+ -- Pulse-Eight Packaging <packaging@pulse-eight.com>  Sat, 13 Dec 2013 16:02:00 +0100
+
+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 (credits: @warped-rudi)
+    * TDA995x: avoid callback when already stopped (credits: @warped-rudi)
+    * windows: fix resource files and backwards compat dll names
+
+ -- Pulse-Eight Packaging <packaging@pulse-eight.com>  Sat, 11 May 2013 10:06:00 +0000
 
 libcec (2.1.1-1) unstable; urgency=low
 
diff -Nru libcec-2.1.1/include/cectypes.h libcec-2.1.4/include/cectypes.h
--- libcec-2.1.1/include/cectypes.h	2013-03-09 20:14:55.000000000 +0000
+++ libcec-2.1.4/include/cectypes.h	2013-12-13 18:06:00.000000000 +0000
@@ -825,27 +825,31 @@
 
 typedef enum cec_vendor_id
 {
-  CEC_VENDOR_TOSHIBA   = 0x000039,
-  CEC_VENDOR_SAMSUNG   = 0x0000F0,
-  CEC_VENDOR_DENON     = 0x0005CD,
-  CEC_VENDOR_LOEWE     = 0x000982,
-  CEC_VENDOR_ONKYO     = 0x0009B0,
-  CEC_VENDOR_MEDION    = 0x000CB8,
-  CEC_VENDOR_AKAI      = 0x0020C7,
-  CEC_VENDOR_AOC       = 0x002467,
-  CEC_VENDOR_PANASONIC = 0x008045,
-  CEC_VENDOR_PHILIPS   = 0x00903E,
-  CEC_VENDOR_DAEWOO    = 0x009053,
-  CEC_VENDOR_YAMAHA    = 0x00A0DE,
-  CEC_VENDOR_GRUNDIG   = 0x00D0D5,
-  CEC_VENDOR_PIONEER   = 0x00E036,
-  CEC_VENDOR_LG        = 0x00E091,
-  CEC_VENDOR_SHARP     = 0x08001F,
-  CEC_VENDOR_SONY      = 0x080046,
-  CEC_VENDOR_BROADCOM  = 0x18C086,
-  CEC_VENDOR_VIZIO     = 0x6B746D,
-  CEC_VENDOR_BENQ      = 0x8065E9,
-  CEC_VENDOR_UNKNOWN   = 0
+  CEC_VENDOR_TOSHIBA       = 0x000039,
+  CEC_VENDOR_SAMSUNG       = 0x0000F0,
+  CEC_VENDOR_DENON         = 0x0005CD,
+  CEC_VENDOR_MARANTZ       = 0x000678,
+  CEC_VENDOR_LOEWE         = 0x000982,
+  CEC_VENDOR_ONKYO         = 0x0009B0,
+  CEC_VENDOR_MEDION        = 0x000CB8,
+  CEC_VENDOR_TOSHIBA2      = 0x000CE7,
+  CEC_VENDOR_PULSE_EIGHT   = 0x001582,
+  CEC_VENDOR_AKAI          = 0x0020C7,
+  CEC_VENDOR_AOC           = 0x002467,
+  CEC_VENDOR_PANASONIC     = 0x008045,
+  CEC_VENDOR_PHILIPS       = 0x00903E,
+  CEC_VENDOR_DAEWOO        = 0x009053,
+  CEC_VENDOR_YAMAHA        = 0x00A0DE,
+  CEC_VENDOR_GRUNDIG       = 0x00D0D5,
+  CEC_VENDOR_PIONEER       = 0x00E036,
+  CEC_VENDOR_LG            = 0x00E091,
+  CEC_VENDOR_SHARP         = 0x08001F,
+  CEC_VENDOR_SONY          = 0x080046,
+  CEC_VENDOR_BROADCOM      = 0x18C086,
+  CEC_VENDOR_VIZIO         = 0x6B746D,
+  CEC_VENDOR_BENQ          = 0x8065E9,
+  CEC_VENDOR_HARMAN_KARDON = 0x9C645E,
+  CEC_VENDOR_UNKNOWN       = 0
 } cec_vendor_id;
 
 typedef enum cec_adapter_type
@@ -915,6 +919,16 @@
     return *this;
   }
 
+  bool operator ==(const struct cec_datapacket& packet) const
+  {
+    if (size != packet.size)
+      return false;
+    for (uint8_t iPtr = 0; iPtr < size; iPtr++)
+      if (packet.data[iPtr] != data[iPtr])
+        return false;
+    return true;
+  }
+
   bool    IsEmpty(void) const             { return size == 0; }   /**< @return True when this packet is empty, false otherwise. */
   bool    IsFull(void) const              { return size == 100; } /**< @return True when this packet is false, false otherwise. */
 
@@ -1407,7 +1421,10 @@
   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_2_1_4   = 0x2104,
+  CEC_CLIENT_VERSION_CURRENT = 0x2104
 } cec_client_version;
 
 typedef enum cec_server_version
@@ -1437,7 +1454,10 @@
   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_2_1_4   = 0x2104,
+  CEC_SERVER_VERSION_CURRENT = 0x2104
 } cec_server_version;
 
 struct libcec_configuration
diff -Nru libcec-2.1.1/src/CecSharpTester/CecSharpClient.cs libcec-2.1.4/src/CecSharpTester/CecSharpClient.cs
--- libcec-2.1.1/src/CecSharpTester/CecSharpClient.cs	2013-03-09 20:14:55.000000000 +0000
+++ libcec-2.1.4/src/CecSharpTester/CecSharpClient.cs	2013-12-13 18:06:00.000000000 +0000
@@ -43,7 +43,7 @@
       Config = new LibCECConfiguration();
       Config.DeviceTypes.Types[0] = CecDeviceType.RecordingDevice;
       Config.DeviceName = "CEC Tester";
-      Config.ClientVersion = CecClientVersion.Version2_1_0;
+      Config.ClientVersion = CecClientVersion.CurrentVersion;
       Config.SetCallbacks(this);
       LogLevel = (int)CecLogLevel.All;
 
diff -Nru libcec-2.1.1/src/CecSharpTester/CecSharpTester.csproj libcec-2.1.4/src/CecSharpTester/CecSharpTester.csproj
--- libcec-2.1.1/src/CecSharpTester/CecSharpTester.csproj	2013-03-09 20:14:55.000000000 +0000
+++ libcec-2.1.4/src/CecSharpTester/CecSharpTester.csproj	2013-12-13 18:06:00.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -12,17 +12,22 @@
     <AssemblyName>CecSharpTester</AssemblyName>
     <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>3.5</OldToolsVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\..\build\</OutputPath>
+    <OutputPath>..\..\build\x64\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <OutputPath>..\..\build\</OutputPath>
+    <OutputPath>..\..\build\x64\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -51,17 +56,16 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="CecSharpClient.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\project\LibCecSharp.vcproj">
+    <ProjectReference Include="..\..\project\LibCecSharp\LibCecSharp.vcxproj">
       <Project>{E54D4581-CD59-4687-BB10-694B8192EABA}</Project>
       <Name>LibCecSharp</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff -Nru libcec-2.1.1/src/CecSharpTester/Properties/AssemblyInfo.cs libcec-2.1.4/src/CecSharpTester/Properties/AssemblyInfo.cs
--- libcec-2.1.1/src/CecSharpTester/Properties/AssemblyInfo.cs	2013-03-09 20:14:55.000000000 +0000
+++ libcec-2.1.4/src/CecSharpTester/Properties/AssemblyInfo.cs	2013-12-13 18:06:00.000000000 +0000
@@ -8,9 +8,9 @@
 [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 @@
 // 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.4.0")]
+[assembly: AssemblyFileVersion("2.1.4.0")]
diff -Nru libcec-2.1.1/src/LibCecSharp/AssemblyInfo.cpp libcec-2.1.4/src/LibCecSharp/AssemblyInfo.cpp
--- libcec-2.1.1/src/LibCecSharp/AssemblyInfo.cpp	2013-03-09 20:14:55.000000000 +0000
+++ libcec-2.1.4/src/LibCecSharp/AssemblyInfo.cpp	2013-12-13 18:06:00.000000000 +0000
@@ -7,13 +7,13 @@
 [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.4.0")];
 
 [assembly:ComVisible(false)];
 [assembly:CLSCompliantAttribute(true)];
diff -Nru libcec-2.1.1/src/LibCecSharp/CecSharpTypes.h libcec-2.1.4/src/LibCecSharp/CecSharpTypes.h
--- libcec-2.1.1/src/LibCecSharp/CecSharpTypes.h	2013-03-09 20:14:55.000000000 +0000
+++ libcec-2.1.4/src/LibCecSharp/CecSharpTypes.h	2013-12-13 18:06:00.000000000 +0000
@@ -200,7 +200,27 @@
     /// The device needs servicing. This is set when the firmware can be upgraded, or when a problem with the firmware is detected.
     /// The latest firmware flash tool can be downloaded from http://packages.pulse-eight.net/
     /// </summary>
-    ServiceDevice = 1
+    ServiceDevice = 0,
+    /// <summary>
+    /// The connection to the adapter was lost, probably because the device got unplugged.
+    /// </summary>
+    ConnectionLost,
+    /// <summary>
+    /// No permission from the OS to access the adapter.
+    /// </summary>
+    PermissionError,
+    /// <summary>
+    /// The device is being used by another program.
+    /// </summary>
+    PortBusy,
+    /// <summary>
+    /// The physical address that is assigned to the adapter is already being used.
+    /// </summary>
+    PhysicalAddressError,
+    /// <summary>
+    /// The TV does not respond to polls.
+    /// </summary>
+    TVPollFailed
   };
 
   /// <summary>
@@ -764,27 +784,31 @@
   /// </summary>
   public enum class CecVendorId
   {
-    Toshiba   = 0x000039,
-    Samsung   = 0x0000F0,
-    Denon     = 0x0005CD,
-    Loewe     = 0x000982,
-    Onkyo     = 0x0009B0,
-    Medion    = 0x000CB8,
-    Akai      = 0x0020C7,
-    AOC       = 0x002467,
-    Panasonic = 0x008045,
-    Philips   = 0x00903E,
-    Daewoo    = 0x009053,
-    Yamaha    = 0x00A0DE,
-    Grundig   = 0x00D0D5,
-    Pioneer   = 0x00E036,
-    LG        = 0x00E091,
-    Sharp     = 0x08001F,
-    Sony      = 0x080046,
-    Broadcom  = 0x18C086,
-    Vizio     = 0x6B746D,
-    Benq      = 0x8065E9,
-    Unknown   = 0
+    Toshiba      = 0x000039,
+    Samsung      = 0x0000F0,
+    Denon        = 0x0005CD,
+    Marantz      = 0x000678,
+    Loewe        = 0x000982,
+    Onkyo        = 0x0009B0,
+    Medion       = 0x000CB8,
+    Toshiba2     = 0x000CE7,
+    PulseEight   = 0x001582,
+    Akai         = 0x0020C7,
+    AOC          = 0x002467,
+    Panasonic    = 0x008045,
+    Philips      = 0x00903E,
+    Daewoo       = 0x009053,
+    Yamaha       = 0x00A0DE,
+    Grundig      = 0x00D0D5,
+    Pioneer      = 0x00E036,
+    LG           = 0x00E091,
+    Sharp        = 0x08001F,
+    Sony         = 0x080046,
+    Broadcom     = 0x18C086,
+    Vizio        = 0x6B746D,
+    Benq         = 0x8065E9,
+    HarmanKardon = 0x9C645E,
+    Unknown      = 0
   };
 
   /// <summary>
@@ -1195,7 +1219,23 @@
     /// <summary>
     /// v2.1.1
     /// </summary>
-    Version2_1_1   = 0x2101
+    Version2_1_1   = 0x2101,
+    /// <summary>
+    /// v2.1.2
+    /// </summary>
+    Version2_1_2   = 0x2102,
+    /// <summary>
+    /// v2.1.3
+    /// </summary>
+    Version2_1_3   = 0x2103,
+    /// <summary>
+    /// v2.1.4
+    /// </summary>
+    Version2_1_4   = 0x2104,
+	/// <summary>
+    /// The current version
+    /// </summary>
+    CurrentVersion = 0x2104
   };
 
   /// <summary>
@@ -1302,7 +1342,23 @@
     /// <summary>
     /// v2.1.1
     /// </summary>
-    Version2_1_1   = 0x2101
+    Version2_1_1   = 0x2101,
+    /// <summary>
+    /// v2.1.2
+    /// </summary>
+    Version2_1_2   = 0x2102,
+    /// <summary>
+    /// v2.1.3
+    /// </summary>
+    Version2_1_3   = 0x2103,
+	/// <summary>
+    /// v2.1.4
+    /// </summary>
+    Version2_1_4   = 0x2104,
+    /// <summary>
+    /// The current version
+    /// </summary>
+    CurrentVersion = 0x2104
   };
 
   /// <summary>
@@ -1693,8 +1749,8 @@
       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;
@@ -2357,7 +2413,7 @@
         CecParameterType newType = (CecParameterType)data.paramType;
         if (newType == CecParameterType::ParameterTypeString)
         {
-          System::String ^ newData = gcnew System::String((const char *)data.paramData, 0, 128);
+          System::String ^ newData = gcnew System::String(data.paramData ? (const char *)data.paramData : "", 0, 128);
           CecParameter ^ newParam = gcnew CecParameter(newType, newData);
           iReturn = m_callbacks->ReceiveAlert((CecAlert)alert, newParam);
         }
diff -Nru libcec-2.1.1/src/LibCecSharp/resource.h libcec-2.1.4/src/LibCecSharp/resource.h
--- libcec-2.1.1/src/LibCecSharp/resource.h	2013-03-09 20:14:55.000000000 +0000
+++ libcec-2.1.4/src/LibCecSharp/resource.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by app.rc
diff -Nru libcec-2.1.1/src/LibCecTray/LibCECTray.csproj libcec-2.1.4/src/LibCecTray/LibCECTray.csproj
--- libcec-2.1.1/src/LibCecTray/LibCECTray.csproj	2013-03-09 20:14:55.000000000 +0000
+++ libcec-2.1.4/src/LibCecTray/LibCECTray.csproj	2013-12-13 18:06:00.000000000 +0000
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\..\build\</OutputPath>
+    <OutputPath>..\..\build\x64\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <OutputPath>..\..\build\</OutputPath>
+    <OutputPath>..\..\build\x64\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -62,6 +62,11 @@
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
     <ApplicationIcon>..\..\project\favicon.ico</ApplicationIcon>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>3.5</OldToolsVersion>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -73,6 +78,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="controller\Actions.cs" />
+    <Compile Include="controller\actions\ActivateSource.cs" />
     <Compile Include="controller\actions\GetCurrentPhysicalAddress.cs" />
     <Compile Include="controller\actions\UpdateConfiguration.cs" />
     <Compile Include="controller\actions\ConnectToDevice.cs" />
@@ -132,6 +138,7 @@
     <Compile Include="ui\About.Designer.cs">
       <DependentUpon>About.cs</DependentUpon>
     </Compile>
+    <Compile Include="ui\AsyncControls.cs" />
     <Compile Include="ui\AsyncForm.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -152,6 +159,7 @@
     <Compile Include="controller\applications\KeyInput.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ui\IAsyncControls.cs" />
     <EmbeddedResource Include="controller\applications\ApplicationControllerUI.resx">
       <DependentUpon>ApplicationControllerUI.cs</DependentUpon>
       <SubType>Designer</SubType>
@@ -215,7 +223,7 @@
     <Content Include="project\favicon.ico" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\project\LibCecSharp.vcproj">
+    <ProjectReference Include="..\..\project\LibCecSharp\LibCecSharp.vcxproj">
       <Project>{E54D4581-CD59-4687-BB10-694B8192EABA}</Project>
       <Name>LibCecSharp</Name>
     </ProjectReference>
diff -Nru libcec-2.1.1/src/LibCecTray/Program.cs libcec-2.1.4/src/LibCecTray/Program.cs
--- libcec-2.1.1/src/LibCecTray/Program.cs	2013-03-09 20:14:55.000000000 +0000
+++ libcec-2.1.4/src/LibCecTray/Program.cs	2013-12-13 18:06:00.000000000 +0000
@@ -42,7 +42,15 @@
     private static CECTray _instance;
     public static CECTray Instance
     {
-      get { return _instance ?? (_instance = new CECTray()); }
+      get
+      {
+        if (_instance == null)
+        {
+          _instance = new CECTray();
+          _instance.Initialise();
+        }
+        return _instance;
+      }
     }
 
     [STAThread]
diff -Nru libcec-2.1.1/src/LibCecTray/Properties/AssemblyInfo.cs libcec-2.1.4/src/LibCecTray/Properties/AssemblyInfo.cs
--- libcec-2.1.1/src/LibCecTray/Properties/AssemblyInfo.cs	2013-03-09 20:14:55.000000000 +0000
+++ libcec-2.1.4/src/LibCecTray/Properties/AssemblyInfo.cs	2013-12-13 18:06:00.000000000 +0000
@@ -7,9 +7,9 @@
 [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 @@
 // 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.4.0")]
+[assembly: AssemblyFileVersion("2.1.4.0")]
diff -Nru libcec-2.1.1/src/LibCecTray/Properties/Resources.Designer.cs libcec-2.1.4/src/LibCecTray/Properties/Resources.Designer.cs
--- libcec-2.1.1/src/LibCecTray/Properties/Resources.Designer.cs	2013-03-09 20:14:55.000000000 +0000
+++ libcec-2.1.4/src/LibCecTray/Properties/Resources.Designer.cs	2013-12-13 18:06:00.000000000 +0000
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.5466
+//     Runtime Version:4.0.30319.17929
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -19,7 +19,7 @@
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
@@ -295,6 +295,65 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to The connection to the adapter was lost, probably because the device got unplugged..
+        /// </summary>
+        internal static string alert_connection_lost {
+            get {
+                return ResourceManager.GetString("alert_connection_lost", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to No permission from the OS to access the adapter. Please check your permissions..
+        /// </summary>
+        internal static string alert_permission_error {
+            get {
+                return ResourceManager.GetString("alert_permission_error", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The physical address that is assigned to the adapter is already being used. Please check your settings..
+        /// </summary>
+        internal static string alert_physical_address_error {
+            get {
+                return ResourceManager.GetString("alert_physical_address_error", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The device is being used by another program..
+        /// </summary>
+        internal static string alert_port_busy {
+            get {
+                return ResourceManager.GetString("alert_port_busy", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The device needs servicing. Please download and run the latest firmware upgrade from http://packages.pulse-eight.net/.
+        /// </summary>
+        internal static string alert_service_device {
+            get {
+                return ResourceManager.GetString("alert_service_device", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The TV does not respond to CEC polls. This is caused by one of the following:
+        ///a) the TV does not support CEC;
+        ///b) CEC has been disabled in the TV&apos;s settings;
+        ///c) the HDMI cable between the TV and adapter is faulty.
+        ///
+        ///CEC will not work (properly) if the TV does not support CEC, or has CEC disabled in it&apos;s settings..
+        /// </summary>
+        internal static string alert_tv_poll_failed {
+            get {
+                return ResourceManager.GetString("alert_tv_poll_failed", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Send &apos;inactive source&apos; when shutting down the application.
         /// </summary>
         internal static string app_inactive_source {
@@ -403,6 +462,15 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Warning from libCEC.
+        /// </summary>
+        internal static string cec_alert {
+            get {
+                return ResourceManager.GetString("cec_alert", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to cec-log.txt.
         /// </summary>
         internal static string cec_log_filename {
diff -Nru libcec-2.1.1/src/LibCecTray/Properties/Resources.resx libcec-2.1.4/src/LibCecTray/Properties/Resources.resx
--- libcec-2.1.1/src/LibCecTray/Properties/Resources.resx	2013-03-09 20:14:55.000000000 +0000
+++ libcec-2.1.4/src/LibCecTray/Properties/Resources.resx	2013-12-13 18:06:00.000000000 +0000
@@ -594,4 +594,30 @@
   <data name="app_pause_playback_on_deactivate" xml:space="preserve">
     <value>Pause playback when switching to another source</value>
   </data>
+  <data name="alert_connection_lost" xml:space="preserve">
+    <value>The connection to the adapter was lost, probably because the device got unplugged.</value>
+  </data>
+  <data name="alert_permission_error" xml:space="preserve">
+    <value>No permission from the OS to access the adapter. Please check your permissions.</value>
+  </data>
+  <data name="alert_physical_address_error" xml:space="preserve">
+    <value>The physical address that is assigned to the adapter is already being used. Please check your settings.</value>
+  </data>
+  <data name="alert_port_busy" xml:space="preserve">
+    <value>The device is being used by another program.</value>
+  </data>
+  <data name="alert_service_device" xml:space="preserve">
+    <value>The device needs servicing. Please download and run the latest firmware upgrade from http://packages.pulse-eight.net/</value>
+  </data>
+  <data name="alert_tv_poll_failed" xml:space="preserve">
+    <value>The TV does not respond to CEC polls. This is caused by one of the following:
+a) the TV does not support CEC;
+b) CEC has been disabled in the TV's settings;
+c) the HDMI cable between the TV and adapter is faulty.
+
+CEC will not work (properly) if the TV does not support CEC, or has CEC disabled in it's settings.</value>
+  </data>
+  <data name="cec_alert" xml:space="preserve">
+    <value>Warning from libCEC</value>
+  </data>
 </root>
\ No newline at end of file
diff -Nru libcec-2.1.1/src/LibCecTray/controller/Actions.cs libcec-2.1.4/src/LibCecTray/controller/Actions.cs
--- libcec-2.1.1/src/LibCecTray/controller/Actions.cs	2013-03-09 20:14:55.000000000 +0000
+++ libcec-2.1.4/src/LibCecTray/controller/Actions.cs	2013-12-13 18:06:00.000000000 +0000
@@ -94,7 +94,7 @@
           _controller.CheckActiveDevices();
           break;
         case UpdateEventType.ProcessCompleted:
-          if (!(_activeProcess is GetCurrentPhysicalAddress))
+          if (!(_activeProcess is GetCurrentPhysicalAddress) && !SuppressUpdates)
           {
             _activeProcess = new GetCurrentPhysicalAddress(_controller.Lib);
             _activeProcess.EventHandler += ProcessEventHandler;
@@ -123,6 +123,7 @@
 
           break;
         case UpdateEventType.ExitApplication:
+          SuppressUpdates = true;
           _activeProcess = null;
           Application.Exit();
           break;
@@ -207,7 +208,7 @@
     /// Activate the source at the given logical address. 
     /// </summary>
     /// <param name="address">The logical address of the device to activate</param>
-    public void ActivateSource(CecLogicalAddress address)
+    public void SetStreamPath(CecLogicalAddress address)
     {
       if (SuppressUpdates || _activeProcess != null) return;
 
@@ -217,6 +218,16 @@
       (new Thread(_activeProcess.Run)).Start();
     }
 
+    public void ActivateSource()
+    {
+      if (SuppressUpdates || _activeProcess != null) return;
+
+      _controller.SetControlsEnabled(false);
+      _activeProcess = new ActivateSource(_controller.Lib);
+      _activeProcess.EventHandler += ProcessEventHandler;
+      (new Thread(_activeProcess.Run)).Start();
+    }
+
     /// <summary>
     /// Send a standby command to the device at the given logical address
     /// </summary>
diff -Nru libcec-2.1.1/src/LibCecTray/controller/CECController.cs libcec-2.1.4/src/LibCecTray/controller/CECController.cs
--- libcec-2.1.1/src/LibCecTray/controller/CECController.cs	2013-03-09 20:14:55.000000000 +0000
+++ libcec-2.1.4/src/LibCecTray/controller/CECController.cs	2013-12-13 18:06:00.000000000 +0000
@@ -367,6 +367,32 @@
       return 1;
     }
 
+    public override int ReceiveAlert(CecAlert alert, CecParameter data)
+    {
+      switch (alert)
+      {
+        case CecAlert.ServiceDevice:
+          MessageBox.Show(Resources.alert_service_device, Resources.cec_alert, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+          break;
+        case CecAlert.ConnectionLost:
+          MessageBox.Show(Resources.alert_connection_lost, Resources.cec_alert, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+          break;
+        case CecAlert.PermissionError:
+          MessageBox.Show(Resources.alert_permission_error, Resources.cec_alert, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+          break;
+        case CecAlert.PortBusy:
+          MessageBox.Show(Resources.alert_port_busy, Resources.cec_alert, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+          break;
+        case CecAlert.PhysicalAddressError:
+          MessageBox.Show(Resources.alert_physical_address_error, Resources.cec_alert, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+          break;
+        case CecAlert.TVPollFailed:
+          MessageBox.Show(Resources.alert_tv_poll_failed, Resources.cec_alert, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+          break;
+      }
+      return 1;
+    }
+
     public override int ConfigurationChanged(LibCECConfiguration config)
     {
       Settings.PhysicalAddress.Value = Config.PhysicalAddress;
@@ -444,7 +470,7 @@
       {
         if (_config == null)
         {
-          _config = new LibCECConfiguration { DeviceName = "CEC Tray", ClientVersion = CecClientVersion.Version2_1_0 };
+          _config = new LibCECConfiguration { DeviceName = "CEC Tray", ClientVersion = CecClientVersion.CurrentVersion };
           _config.DeviceTypes.Types[0] = CecDeviceType.RecordingDevice;
           _config.SetCallbacks(this);
 
diff -Nru libcec-2.1.1/src/LibCecTray/controller/actions/ActivateSource.cs libcec-2.1.4/src/LibCecTray/controller/actions/ActivateSource.cs
--- libcec-2.1.1/src/LibCecTray/controller/actions/ActivateSource.cs	1970-01-01 00:00:00.000000000 +0000
+++ libcec-2.1.4/src/LibCecTray/controller/actions/ActivateSource.cs	2013-12-13 18:06:00.000000000 +0000
@@ -0,0 +1,56 @@
+/*
+ * This file is part of the libCEC(R) library.
+ *
+ * libCEC(R) is Copyright (C) 2011-2013 Pulse-Eight Limited.  All rights reserved.
+ * libCEC(R) is an original work, containing original code.
+ *
+ * libCEC(R) is a trademark of Pulse-Eight Limited.
+ *
+ * This program is dual-licensed; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ *
+ * Alternatively, you can license this library under a commercial license,
+ * please contact Pulse-Eight Licensing for more information.
+ *
+ * For more information contact:
+ * Pulse-Eight Licensing       <license@pulse-eight.com>
+ *     http://www.pulse-eight.com/
+ *     http://www.pulse-eight.net/
+ */
+
+using CecSharp;
+using LibCECTray.Properties;
+
+namespace LibCECTray.controller.actions
+{
+  class ActivateSource : UpdateProcess
+  {
+    public ActivateSource(LibCecSharp lib)
+    {
+      _lib = lib;
+    }
+
+    public override void Process()
+    {
+      SendEvent(UpdateEventType.StatusText, Resources.action_activating_source);
+      SendEvent(UpdateEventType.ProgressBar, 50);
+
+      var bResult = _lib.SetActiveSource(CecDeviceType.Reserved);
+      SendEvent(UpdateEventType.ProgressBar, 100);
+    }
+
+    private readonly LibCecSharp _lib;
+  }
+}
diff -Nru libcec-2.1.1/src/LibCecTray/controller/actions/ConnectToDevice.cs libcec-2.1.4/src/LibCecTray/controller/actions/ConnectToDevice.cs
--- libcec-2.1.1/src/LibCecTray/controller/actions/ConnectToDevice.cs	2013-03-09 20:14:55.000000000 +0000
+++ libcec-2.1.4/src/LibCecTray/controller/actions/ConnectToDevice.cs	2013-12-13 18:06:00.000000000 +0000
@@ -74,9 +74,12 @@
       SendEvent(UpdateEventType.StatusText, Resources.action_sending_power_on);
       _lib.PowerOnDevices(CecLogicalAddress.Broadcast);
 
-      SendEvent(UpdateEventType.StatusText, Resources.action_detecting_tv_vendor);
-      SendEvent(UpdateEventType.ProgressBar, 30);
-      SendEvent(UpdateEventType.TVVendorId, (int)_lib.GetDeviceVendorId(CecLogicalAddress.Tv));
+      if (_lib.IsActiveDevice(CecLogicalAddress.Tv))
+      {
+        SendEvent(UpdateEventType.StatusText, Resources.action_detecting_tv_vendor);
+        SendEvent(UpdateEventType.ProgressBar, 30);
+        SendEvent(UpdateEventType.TVVendorId, (int)_lib.GetDeviceVendorId(CecLogicalAddress.Tv));
+      }
 
       SendEvent(UpdateEventType.ProgressBar, 50);
       SendEvent(UpdateEventType.StatusText, Resources.action_detecting_avr);
@@ -91,7 +94,7 @@
         SendEvent(UpdateEventType.AVRVendorId, (int)_lib.GetDeviceVendorId(CecLogicalAddress.AudioSystem));
       }
 
-      if (!_lib.GetDevicePowerStatus(CecLogicalAddress.Tv).Equals(CecPowerStatus.On))
+      if (_lib.IsActiveDevice(CecLogicalAddress.Tv)&& !_lib.GetDevicePowerStatus(CecLogicalAddress.Tv).Equals(CecPowerStatus.On))
       {
         SendEvent(UpdateEventType.ProgressBar, 70);
         SendEvent(UpdateEventType.StatusText, Resources.action_activating_source);
@@ -108,6 +111,11 @@
       SendEvent(UpdateEventType.StatusText, Resources.action_polling_active_devices);
       SendEvent(UpdateEventType.PollDevices);
 
+      if (!_lib.IsActiveDevice(CecLogicalAddress.Tv))
+      {
+        MessageBox.Show(Resources.alert_tv_poll_failed, Resources.cec_alert, MessageBoxButtons.OK, MessageBoxIcon.Warning, MessageBoxDefaultButton.Button1, MessageBoxOptions.DefaultDesktopOnly);
+      }
+
       SendEvent(UpdateEventType.ProgressBar, 100);
       SendEvent(UpdateEventType.StatusText, Resources.ready);
     }
diff -Nru libcec-2.1.1/src/LibCecTray/controller/applications/ApplicationController.cs libcec-2.1.4/src/LibCecTray/controller/applications/ApplicationController.cs
--- libcec-2.1.1/src/LibCecTray/controller/applications/ApplicationController.cs	2013-03-09 20:14:55.000000000 +0000
+++ libcec-2.1.4/src/LibCecTray/controller/applications/ApplicationController.cs	2013-12-13 18:06:00.000000000 +0000
@@ -49,9 +49,9 @@
   /// </summary>
   class ApplicationController
   {
-    public ApplicationController(CECSettings settings, string uiName, string processName, string filename, string workingDirectory)
+    public ApplicationController(CECController controller, string uiName, string processName, string filename, string workingDirectory)
     {
-      Settings = settings;
+      Controller = controller;
       UiName = uiName;
       ProcessName = processName;
       ApplicationFilename = filename;
@@ -60,13 +60,13 @@
       IsInternal = false;
     }
 
-    public static ApplicationController FromString(CECSettings settings, string serialisedConfig)
+    public static ApplicationController FromString(CECController controller, CECSettings settings, string serialisedConfig)
     {
       var splitString = serialisedConfig.Split(';');
       if (splitString.Length != 4)
         throw new InvalidDataException("incorrect number of parameters");
 
-      return new ApplicationController(settings, splitString[0], splitString[1], splitString[2], splitString[3]);
+      return new ApplicationController(controller, splitString[0], splitString[1], splitString[2], splitString[3]);
     }
 
     public string AsString()
@@ -383,7 +383,10 @@
       get { return _buttonConfig ?? (_buttonConfig = new CecButtonConfig(this)); }
     }
 
-    public CECSettings Settings;
+    public CECSettings Settings
+    {
+      get { return Controller.Settings; }
+    }
     protected DataGridView CecButtonGridView;
 
     public virtual ApplicationAction DefaultValue(CecKeypress key)
@@ -407,6 +410,8 @@
 
     private bool _applicationRunning;
 
+    protected readonly CECController Controller;
+
     #endregion
   }
 }
diff -Nru libcec-2.1.1/src/LibCecTray/controller/applications/Applications.cs libcec-2.1.4/src/LibCecTray/controller/applications/Applications.cs
--- libcec-2.1.1/src/LibCecTray/controller/applications/Applications.cs	2013-03-09 20:14:55.000000000 +0000
+++ libcec-2.1.4/src/LibCecTray/controller/applications/Applications.cs	2013-12-13 18:06:00.000000000 +0000
@@ -74,7 +74,7 @@
           {
             if (item.Length > 0)
             {
-              var app = ApplicationController.FromString(_controller.Settings, item);
+              var app = ApplicationController.FromString(_controller, _controller.Settings, item);
               if (app != null)
                 _controllers.Add(app.ProcessName, app);
             }
@@ -100,9 +100,9 @@
       get
       {
         var defaultValues = new Dictionary<string, ApplicationController>();
-        WMCController wmcController = new WMCController(_controller.Settings);
+        WMCController wmcController = new WMCController(_controller);
         defaultValues.Add(wmcController.ProcessName, wmcController);
-        XBMCController xbmcController = new XBMCController(_controller.Settings);
+        XBMCController xbmcController = new XBMCController(_controller);
         defaultValues.Add(xbmcController.ProcessName, xbmcController);
 
         return defaultValues;
@@ -122,7 +122,8 @@
     public static void Initialise(CECController controller)
     {
       _controller = controller;
-      _instance = new Applications();
+      if (_instance == null)
+        _instance = new Applications();
       controller.Settings["global_applications"] = _instance;
       controller.Settings.Load(_instance);
 
diff -Nru libcec-2.1.1/src/LibCecTray/controller/applications/ConfigureApplication.cs libcec-2.1.4/src/LibCecTray/controller/applications/ConfigureApplication.cs
--- libcec-2.1.1/src/LibCecTray/controller/applications/ConfigureApplication.cs	2013-03-09 20:14:55.000000000 +0000
+++ libcec-2.1.4/src/LibCecTray/controller/applications/ConfigureApplication.cs	2013-12-13 18:06:00.000000000 +0000
@@ -132,7 +132,7 @@
       }
       else if (_cecController != null)
       {
-        ApplicationController newController = new ApplicationController(_settings, tbUiName.Text, tbProcessName.Text, tbFilename.Text, tbWorkingDir.Text);
+        ApplicationController newController = new ApplicationController(_cecController, tbUiName.Text, tbProcessName.Text, tbFilename.Text, tbWorkingDir.Text);
         if (_cecController.RegisterApplication(newController))
           newController.Settings.Persist();
       }
@@ -145,8 +145,8 @@
       Dispose();
     }
 
-    private ApplicationController _controller;
-    private CECController _cecController;
-    private CECSettings _settings;
+    private readonly ApplicationController _controller;
+    private readonly CECController _cecController;
+    private readonly CECSettings _settings;
   }
 }
diff -Nru libcec-2.1.1/src/LibCecTray/controller/applications/internal/WMCController.cs libcec-2.1.4/src/LibCecTray/controller/applications/internal/WMCController.cs
--- libcec-2.1.1/src/LibCecTray/controller/applications/internal/WMCController.cs	2013-03-09 20:14:55.000000000 +0000
+++ libcec-2.1.4/src/LibCecTray/controller/applications/internal/WMCController.cs	2013-12-13 18:06:00.000000000 +0000
@@ -39,8 +39,8 @@
 {
   internal class WMCController : ApplicationController
   {
-    public WMCController(CECSettings settings) :
-      base(settings,
+    public WMCController(CECController controller) :
+      base(controller,
            Resources.application_windows_media_center,
            "ehshell",
            "ehshell.exe",
diff -Nru libcec-2.1.1/src/LibCecTray/controller/applications/internal/XBMCController.cs libcec-2.1.4/src/LibCecTray/controller/applications/internal/XBMCController.cs
--- libcec-2.1.1/src/LibCecTray/controller/applications/internal/XBMCController.cs	2013-03-09 20:14:55.000000000 +0000
+++ libcec-2.1.4/src/LibCecTray/controller/applications/internal/XBMCController.cs	2013-12-13 18:06:00.000000000 +0000
@@ -44,8 +44,8 @@
 {
 	internal class XBMCController : ApplicationController
 	{
-    public XBMCController(CECSettings settings) :
-      base(settings,
+    public XBMCController(CECController controller) :
+      base(controller,
            Resources.application_xbmc,
            "XBMC",
            "XBMC.exe",
@@ -93,8 +93,13 @@
       if (File.Exists(filename))
       {
         XmlTextReader reader = new XmlTextReader(filename);
-        while (reader.Read())
+        while (true)
         {
+          try
+          {
+            if (!reader.Read())
+              break;
+          } catch (XmlException) {}
           gotConfig = true;
           switch (reader.NodeType)
           {
diff -Nru libcec-2.1.1/src/LibCecTray/ui/AsyncControls.cs libcec-2.1.4/src/LibCecTray/ui/AsyncControls.cs
--- libcec-2.1.1/src/LibCecTray/ui/AsyncControls.cs	1970-01-01 00:00:00.000000000 +0000
+++ libcec-2.1.4/src/LibCecTray/ui/AsyncControls.cs	2013-12-13 18:06:00.000000000 +0000
@@ -0,0 +1,357 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows.Forms;
+using CecSharp;
+using LibCECTray.controller.applications;
+
+namespace LibCECTray.ui
+{
+    /// <summary>
+    /// Utility methods to change GUI content from another thread
+    /// </summary>
+    class AsyncControls
+    {
+        /// <summary>
+        /// Enable or disable a control
+        /// </summary>
+        /// <param name="container">The control that contains the control to change</param>
+        /// <param name="control">The control to change</param>
+        /// <param name="val">True to enable, false to disable</param>
+        public static void SetControlEnabled(Control container, Control control, bool val)
+        {
+            if (container == null || control == null) return;
+            if (container.InvokeRequired)
+            {
+                SetControlEnabledCallback d = SetControlEnabled;
+                try
+                {
+                    container.Invoke(d, new object[] { container, control, val });
+                }
+                catch { }
+            }
+            else
+            {
+                control.Enabled = val;
+            }
+        }
+        private delegate void SetControlEnabledCallback(Control container, Control control, bool val);
+
+        /// <summary>
+        /// Change the text label of a control
+        /// </summary>
+        /// <param name="container">The control that contains the control to change</param>
+        /// <param name="control">The control to change</param>
+        /// <param name="val">The new text</param>
+        public static void SetControlText(Control container, Control control, string val)
+        {
+            if (container == null || control == null) return;
+            if (container.InvokeRequired)
+            {
+                SetControlTextCallback d = SetControlText;
+                try
+                {
+                    container.Invoke(d, new object[] { container, control, val });
+                }
+                catch { }
+            }
+            else
+            {
+                control.Text = val;
+            }
+        }
+        private delegate void SetControlTextCallback(Control container, Control control, string val);
+
+        /// <summary>
+        /// Change the checked status of a checkbox
+        /// </summary>
+        /// <param name="container">The control that contains the control to change</param>
+        /// <param name="control">The control to change</param>
+        /// <param name="val">True to change to checked, false to change to unchecked</param>
+        public static void SetCheckboxChecked(Control container, CheckBox control, bool val)
+        {
+            if (container.InvokeRequired)
+            {
+                SetCheckboxCheckedCallback d = SetCheckboxChecked;
+                try
+                {
+                    container.Invoke(d, new object[] { container, control, val });
+                }
+                catch { }
+            }
+            else
+            {
+                control.Checked = val;
+            }
+        }
+        private delegate void SetCheckboxCheckedCallback(Control container, CheckBox control, bool val);
+
+        /// <summary>
+        /// Change the checked status of an item in a CheckedListBox
+        /// </summary>
+        /// <param name="container">The control that contains the control to change</param>
+        /// <param name="control">The control to change</param>
+        /// <param name="index">The index of the checkbox in the list to change</param>
+        /// <param name="val">True to change to checked, false to change to unchecked</param>
+        public static void SetCheckboxItemChecked(Control container, CheckedListBox control, int index, bool val)
+        {
+            if (container.InvokeRequired)
+            {
+                SetCheckboxItemCheckedCallback d = SetCheckboxItemChecked;
+                try
+                {
+                    container.Invoke(d, new object[] { container, control, index, val });
+                }
+                catch (Exception) { }
+            }
+            else
+            {
+                control.SetItemChecked(index, val);
+            }
+        }
+        private delegate void SetCheckboxItemCheckedCallback(Control container, CheckedListBox control, int index, bool val);
+
+        /// <summary>
+        /// Changes the toolstrip menu text
+        /// </summary>
+        /// <param name="container">The control that contains the control to change</param>
+        /// <param name="item">The toolstrip menu item to change</param>
+        /// <param name="val">The new value</param>
+        public static void SetToolStripMenuText(Control container, ToolStripMenuItem item, string val)
+        {
+            if (container.InvokeRequired)
+            {
+                SetToolStripMenuTextCallback d = SetToolStripMenuText;
+                try
+                {
+                    container.Invoke(d, new object[] { container, item, val });
+                }
+                catch (Exception) { }
+            }
+            else
+            {
+                item.Text = val;
+            }
+        }
+        private delegate void SetToolStripMenuTextCallback(Control container, ToolStripMenuItem item, string val);
+
+        /// <summary>
+        /// Changes the progress value of a progress bar
+        /// </summary>
+        /// <param name="container">The control that contains the control to change</param>
+        /// <param name="control">The control to change</param>
+        /// <param name="val">The new percentage</param>
+        public static void SetProgressValue(Control container, ProgressBar control, int val)
+        {
+            if (container.InvokeRequired)
+            {
+                SetProgressValueCallback d = SetProgressValue;
+                try
+                {
+                    container.Invoke(d, new object[] { container, control, val });
+                }
+                catch (Exception) { }
+            }
+            else
+            {
+                control.Value = val;
+            }
+        }
+        private delegate void SetProgressValueCallback(Control container, ProgressBar control, int val);
+
+        /// <summary>
+        /// Replaces the items of a combobox
+        /// </summary>
+        /// <param name="container">The control that contains the control to change</param>
+        /// <param name="control">The control to change</param>
+        /// <param name="selectedIndex">The new selection index</param>
+        /// <param name="val">The new content</param>
+        public static void SetComboBoxItems(Control container, ComboBox control, int selectedIndex, object[] val)
+        {
+            if (container.InvokeRequired)
+            {
+                SetComboBoxItemsCallback d = SetComboBoxItems;
+                try
+                {
+                    container.Invoke(d, new object[] { container, control, selectedIndex, val });
+                }
+                catch (Exception) { }
+            }
+            else
+            {
+                control.Items.Clear();
+                control.Items.AddRange(val);
+                if (control.Items.Count > 0)
+                    control.SelectedIndex = selectedIndex;
+            }
+        }
+        private delegate void SetComboBoxItemsCallback(Control container, ComboBox control, int selectedIndex, object[] val);
+
+        /// <summary>
+        /// Make a control visible or invisible
+        /// </summary>
+        /// <param name="container">The control that contains the control to change</param>
+        /// <param name="control">The control to change</param>
+        /// <param name="val">True to make it visible, false to make it invisible</param>
+        public static void SetControlVisible(Control container, Control control, bool val)
+        {
+            if (container.InvokeRequired)
+            {
+                SetControlVisibleCallback d = SetControlVisible;
+                try
+                {
+                    container.Invoke(d, new object[] { container, control, val });
+                }
+                catch (Exception) { }
+            }
+            else
+            {
+                control.Visible = val;
+            }
+        }
+        private delegate void SetControlVisibleCallback(Control container, Control control, bool val);
+
+        /// <summary>
+        /// Display a new dialog
+        /// </summary>
+        /// <param name="container">The control that contains the control to change</param>
+        /// <param name="control">The control to display</param>
+        /// <param name="modal">True to make it a modal dialog</param>
+        public static void DisplayDialog(Control container, Form control, bool modal)
+        {
+            if (container.InvokeRequired)
+            {
+                DisplayDialogCallback d = DisplayDialog;
+                try
+                {
+                    container.Invoke(d, new object[] { container, control, modal });
+                }
+                catch (Exception) { }
+            }
+            else
+            {
+                if (modal)
+                    control.ShowDialog(container);
+                else
+                    control.Show(container);
+            }
+        }
+        private delegate void DisplayDialogCallback(Control container, Form control, bool modal);
+
+        /// <summary>
+        /// Hides a control
+        /// </summary>
+        /// <param name="container">The control to hide</param>
+        /// <param name="val">True to hide, false to show</param>
+        public static void SafeHide(Control container, bool val)
+        {
+            if (container.InvokeRequired)
+            {
+                SafeHideCallback d = SafeHide;
+                try
+                {
+                    container.Invoke(d, new object[] { container, val });
+                }
+                catch (Exception) { }
+            }
+            else
+            {
+                if (val)
+                    container.Hide();
+                else
+                    container.Show();
+            }
+        }
+        private delegate void SafeHideCallback(Control container, bool val);
+
+        /// <summary>
+        /// Change the selected index
+        /// </summary>
+        /// <param name="container">The control that contains the control to change</param>
+        /// <param name="control">The control to change</param>
+        /// <param name="index">The new selected index</param>
+        public static void SetSelectedIndex(Control container, ComboBox control, int index)
+        {
+            if (container.InvokeRequired)
+            {
+                SetSelectedIndexCallback d = SetSelectedIndex;
+                try
+                {
+                    container.Invoke(d, new object[] { container, control, index });
+                }
+                catch (Exception) { }
+            }
+            else
+            {
+                control.SelectedIndex = index;
+            }
+        }
+        private delegate void SetSelectedIndexCallback(Control container, ComboBox control, int index);
+
+        /// <summary>
+        /// Get the name of the selected tab in a TabControl
+        /// </summary>
+        /// <param name="container">The tab container</param>
+        /// <param name="tabPages">The tab pages</param>
+        /// <returns>The name of the selected tab</returns>
+        public static string GetSelectedTabName(TabControl container, TabControl.TabPageCollection tabPages)
+        {
+            if (container.InvokeRequired)
+            {
+                GetSelectedTabNameCallback d = GetSelectedTabName;
+                try
+                {
+                    return container.Invoke(d, new object[] { container, tabPages }) as string;
+                }
+                catch (Exception) { }
+            }
+            else
+            {
+                return tabPages[container.SelectedIndex].Name;
+            }
+            return string.Empty;
+        }
+        private delegate string GetSelectedTabNameCallback(TabControl container, TabControl.TabPageCollection tabPages);
+
+        /// <summary>
+        /// Selects the row with the given CecKeypress for a datagrid
+        /// </summary>
+        /// <param name="container">The datagrid container</param>
+        /// <param name="dgView">The datagrid</param>
+        /// <param name="key">The key to selected</param>
+        public static void SelectKeypressRow(Control container, DataGridView dgView, CecKeypress key)
+        {
+            if (dgView.InvokeRequired)
+            {
+                SelectKeypressRowCallback d = SelectKeypressRow;
+                try
+                {
+                    container.Invoke(d, new object[] { container, dgView, key });
+                }
+                catch (Exception) { }
+            }
+            else
+            {
+                var rowIndex = -1;
+                foreach (DataGridViewRow row in dgView.Rows)
+                {
+                    CecButtonConfigItem item = row.DataBoundItem as CecButtonConfigItem;
+                    if (item != null && item.Key.Keycode == key.Keycode)
+                    {
+                        rowIndex = row.Index;
+                        row.Selected = true;
+                        item.Enabled = true;
+                    }
+                    else
+                    {
+                        row.Selected = false;
+                    }
+                }
+                if (rowIndex > -1)
+                    dgView.FirstDisplayedScrollingRowIndex = rowIndex;
+            }
+        }
+        private delegate void SelectKeypressRowCallback(Control container, DataGridView dgView, CecKeypress key);
+    }
+
+}
diff -Nru libcec-2.1.1/src/LibCecTray/ui/AsyncForm.cs libcec-2.1.4/src/LibCecTray/ui/AsyncForm.cs
--- libcec-2.1.1/src/LibCecTray/ui/AsyncForm.cs	2013-03-09 20:14:55.000000000 +0000
+++ libcec-2.1.4/src/LibCecTray/ui/AsyncForm.cs	2013-12-13 18:06:00.000000000 +0000
@@ -37,370 +37,6 @@
 
 namespace LibCECTray.ui
 {
-  interface IAsyncControls
-  {
-    void SetControlEnabled(Control control, bool val);
-    void SetControlText(Control control, string val);
-    void SetToolStripMenuText(ToolStripMenuItem item, string val);
-    void SetCheckboxChecked(CheckBox control, bool val);
-    void SetCheckboxItemChecked(CheckedListBox control, int index, bool val);
-    void SetProgressValue(ProgressBar control, int val);
-    void SetComboBoxItems(ComboBox control, int selectedIndex, object[] val);
-    void SetControlVisible(Control control, bool val);
-    void DisplayDialog(Form control, bool modal);
-    void SafeHide(bool val);
-    void SetSelectedIndex(ComboBox control, int index);
-    string GetSelectedTabName(TabControl container, TabControl.TabPageCollection tabPages);
-    void SelectKeypressRow(Control container, DataGridView dgView, CecKeypress key);
-  }
-
-  /// <summary>
-  /// Utility methods to change GUI content from another thread
-  /// </summary>
-  class AsyncControls
-  {
-    /// <summary>
-    /// Enable or disable a control
-    /// </summary>
-    /// <param name="container">The control that contains the control to change</param>
-    /// <param name="control">The control to change</param>
-    /// <param name="val">True to enable, false to disable</param>
-    public static void SetControlEnabled(Control container, Control control, bool val)
-    {
-      if (container == null || control == null) return;
-      if (container.InvokeRequired)
-      {
-        SetControlEnabledCallback d = SetControlEnabled;
-        try
-        {
-          container.Invoke(d, new object[] { container, control, val });
-        }
-        catch { }
-      }
-      else
-      {
-        control.Enabled = val;
-      }
-    }
-    private delegate void SetControlEnabledCallback(Control container, Control control, bool val);
-
-    /// <summary>
-    /// Change the text label of a control
-    /// </summary>
-    /// <param name="container">The control that contains the control to change</param>
-    /// <param name="control">The control to change</param>
-    /// <param name="val">The new text</param>
-    public static void SetControlText(Control container, Control control, string val)
-    {
-      if (container == null || control == null) return;
-      if (container.InvokeRequired)
-      {
-        SetControlTextCallback d = SetControlText;
-        try
-        {
-          container.Invoke(d, new object[] { container, control, val });
-        }
-        catch { }
-      }
-      else
-      {
-        control.Text = val;
-      }
-    }
-    private delegate void SetControlTextCallback(Control container, Control control, string val);
-
-    /// <summary>
-    /// Change the checked status of a checkbox
-    /// </summary>
-    /// <param name="container">The control that contains the control to change</param>
-    /// <param name="control">The control to change</param>
-    /// <param name="val">True to change to checked, false to change to unchecked</param>
-    public static void SetCheckboxChecked(Control container, CheckBox control, bool val)
-    {
-      if (container.InvokeRequired)
-      {
-        SetCheckboxCheckedCallback d = SetCheckboxChecked;
-        try
-        {
-          container.Invoke(d, new object[] { container, control, val });
-        }
-        catch { }
-      }
-      else
-      {
-        control.Checked = val;
-      }
-    }
-    private delegate void SetCheckboxCheckedCallback(Control container, CheckBox control, bool val);
-
-    /// <summary>
-    /// Change the checked status of an item in a CheckedListBox
-    /// </summary>
-    /// <param name="container">The control that contains the control to change</param>
-    /// <param name="control">The control to change</param>
-    /// <param name="index">The index of the checkbox in the list to change</param>
-    /// <param name="val">True to change to checked, false to change to unchecked</param>
-    public static void SetCheckboxItemChecked(Control container, CheckedListBox control, int index, bool val)
-    {
-      if (container.InvokeRequired)
-      {
-        SetCheckboxItemCheckedCallback d = SetCheckboxItemChecked;
-        try
-        {
-          container.Invoke(d, new object[] { container, control, index, val });
-        }
-        catch (Exception) { }
-      }
-      else
-      {
-        control.SetItemChecked(index, val);
-      }
-    }
-    private delegate void SetCheckboxItemCheckedCallback(Control container, CheckedListBox control, int index, bool val);
-
-    /// <summary>
-    /// Changes the toolstrip menu text
-    /// </summary>
-    /// <param name="container">The control that contains the control to change</param>
-    /// <param name="item">The toolstrip menu item to change</param>
-    /// <param name="val">The new value</param>
-    public static void SetToolStripMenuText(Control container, ToolStripMenuItem item, string val)
-    {
-      if (container.InvokeRequired)
-      {
-        SetToolStripMenuTextCallback d = SetToolStripMenuText;
-        try
-        {
-          container.Invoke(d, new object[] { container, item, val });
-        }
-        catch (Exception) { }
-      }
-      else
-      {
-        item.Text = val;
-      }
-    }
-    private delegate void SetToolStripMenuTextCallback(Control container, ToolStripMenuItem item, string val);
-
-    /// <summary>
-    /// Changes the progress value of a progress bar
-    /// </summary>
-    /// <param name="container">The control that contains the control to change</param>
-    /// <param name="control">The control to change</param>
-    /// <param name="val">The new percentage</param>
-    public static void SetProgressValue(Control container, ProgressBar control, int val)
-    {
-      if (container.InvokeRequired)
-      {
-        SetProgressValueCallback d = SetProgressValue;
-        try
-        {
-          container.Invoke(d, new object[] { container, control, val });
-        }
-        catch (Exception) { }
-      }
-      else
-      {
-        control.Value = val;
-      }
-    }
-    private delegate void SetProgressValueCallback(Control container, ProgressBar control, int val);
-
-    /// <summary>
-    /// Replaces the items of a combobox
-    /// </summary>
-    /// <param name="container">The control that contains the control to change</param>
-    /// <param name="control">The control to change</param>
-    /// <param name="selectedIndex">The new selection index</param>
-    /// <param name="val">The new content</param>
-    public static void SetComboBoxItems(Control container, ComboBox control, int selectedIndex, object[] val)
-    {
-      if (container.InvokeRequired)
-      {
-        SetComboBoxItemsCallback d = SetComboBoxItems;
-        try
-        {
-          container.Invoke(d, new object[] { container, control, selectedIndex, val });
-        }
-        catch (Exception) { }
-      }
-      else
-      {
-        control.Items.Clear();
-        control.Items.AddRange(val);
-        if (control.Items.Count > 0)
-          control.SelectedIndex = selectedIndex;
-      }
-    }
-    private delegate void SetComboBoxItemsCallback(Control container, ComboBox control, int selectedIndex, object[] val);
-
-    /// <summary>
-    /// Make a control visible or invisible
-    /// </summary>
-    /// <param name="container">The control that contains the control to change</param>
-    /// <param name="control">The control to change</param>
-    /// <param name="val">True to make it visible, false to make it invisible</param>
-    public static void SetControlVisible(Control container, Control control, bool val)
-    {
-      if (container.InvokeRequired)
-      {
-        SetControlVisibleCallback d = SetControlVisible;
-        try
-        {
-          container.Invoke(d, new object[] { container, control, val });
-        }
-        catch (Exception) { }
-      }
-      else
-      {
-        control.Visible = val;
-      }
-    }
-    private delegate void SetControlVisibleCallback(Control container, Control control, bool val);
-
-    /// <summary>
-    /// Display a new dialog
-    /// </summary>
-    /// <param name="container">The control that contains the control to change</param>
-    /// <param name="control">The control to display</param>
-    /// <param name="modal">True to make it a modal dialog</param>
-    public static void DisplayDialog(Control container, Form control, bool modal)
-    {
-      if (container.InvokeRequired)
-      {
-        DisplayDialogCallback d = DisplayDialog;
-        try
-        {
-          container.Invoke(d, new object[] { container, control, modal });
-        }
-        catch (Exception) { }
-      }
-      else
-      {
-        if (modal)
-          control.ShowDialog(container);
-        else
-          control.Show(container);
-      }
-    }
-    private delegate void DisplayDialogCallback(Control container, Form control, bool modal);
-
-    /// <summary>
-    /// Hides a control
-    /// </summary>
-    /// <param name="container">The control to hide</param>
-    /// <param name="val">True to hide, false to show</param>
-    public static void SafeHide(Control container, bool val)
-    {
-      if (container.InvokeRequired)
-      {
-        SafeHideCallback d = SafeHide;
-        try
-        {
-          container.Invoke(d, new object[] { container, val });
-        }
-        catch (Exception) { }
-      }
-      else
-      {
-        if (val)
-          container.Hide();
-        else
-          container.Show();
-      }
-    }
-    private delegate void SafeHideCallback(Control container, bool val);
-
-    /// <summary>
-    /// Change the selected index
-    /// </summary>
-    /// <param name="container">The control that contains the control to change</param>
-    /// <param name="control">The control to change</param>
-    /// <param name="index">The new selected index</param>
-    public static void SetSelectedIndex(Control container, ComboBox control, int index)
-    {
-      if (container.InvokeRequired)
-      {
-        SetSelectedIndexCallback d = SetSelectedIndex;
-        try
-        {
-          container.Invoke(d, new object[] { container, control, index });
-        }
-        catch (Exception) { }
-      }
-      else
-      {
-        control.SelectedIndex = index;
-      }
-    }
-    private delegate void SetSelectedIndexCallback(Control container, ComboBox control, int index);
-
-    /// <summary>
-    /// Get the name of the selected tab in a TabControl
-    /// </summary>
-    /// <param name="container">The tab container</param>
-    /// <param name="tabPages">The tab pages</param>
-    /// <returns>The name of the selected tab</returns>
-    public static string GetSelectedTabName(TabControl container, TabControl.TabPageCollection tabPages)
-    {
-      if (container.InvokeRequired)
-      {
-        GetSelectedTabNameCallback d = GetSelectedTabName;
-        try
-        {
-          return container.Invoke(d, new object[] { container, tabPages }) as string;
-        }
-        catch (Exception) { }
-      }
-      else
-      {
-        return tabPages[container.SelectedIndex].Name;
-      }
-      return string.Empty;
-    }
-    private delegate string GetSelectedTabNameCallback(TabControl container, TabControl.TabPageCollection tabPages);
-
-    /// <summary>
-    /// Selects the row with the given CecKeypress for a datagrid
-    /// </summary>
-    /// <param name="container">The datagrid container</param>
-    /// <param name="dgView">The datagrid</param>
-    /// <param name="key">The key to selected</param>
-    public static void SelectKeypressRow(Control container, DataGridView dgView, CecKeypress key)
-    {
-      if (dgView.InvokeRequired)
-      {
-        SelectKeypressRowCallback d = SelectKeypressRow;
-        try
-        {
-          container.Invoke(d, new object[] { container, dgView, key });
-        }
-        catch (Exception) { }
-      }
-      else
-      {
-        var rowIndex = -1;
-        foreach (DataGridViewRow row in dgView.Rows)
-        {
-          CecButtonConfigItem item = row.DataBoundItem as CecButtonConfigItem;
-          if (item != null && item.Key.Keycode == key.Keycode)
-          {
-            rowIndex = row.Index;
-            row.Selected = true;
-            item.Enabled = true;
-          }
-          else
-          {
-            row.Selected = false;
-          }
-        }
-        if (rowIndex > -1)
-          dgView.FirstDisplayedScrollingRowIndex = rowIndex;
-      }
-    }
-    private delegate void SelectKeypressRowCallback(Control container, DataGridView dgView, CecKeypress key);
-  }
-
   /// <summary>
   /// Form that implements IAsyncControls
   /// </summary>
diff -Nru libcec-2.1.1/src/LibCecTray/ui/CECTray.Designer.cs libcec-2.1.4/src/LibCecTray/ui/CECTray.Designer.cs
--- libcec-2.1.1/src/LibCecTray/ui/CECTray.Designer.cs	2013-03-09 20:14:55.000000000 +0000
+++ libcec-2.1.4/src/LibCecTray/ui/CECTray.Designer.cs	2013-12-13 18:06:00.000000000 +0000
@@ -15,747 +15,746 @@
     /// </summary>
     private void InitializeComponent()
     {
-      this.components = new System.ComponentModel.Container();
-      System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CECTray));
-      this.pProgress = new System.Windows.Forms.ProgressBar();
-      this.lStatus = new System.Windows.Forms.Label();
-      this.helpPortNumber = new System.Windows.Forms.ToolTip(this.components);
-      this.cbPortNumber = new System.Windows.Forms.ComboBox();
-      this.helpConnectedHDMIDevice = new System.Windows.Forms.ToolTip(this.components);
-      this.cbConnectedDevice = new System.Windows.Forms.ComboBox();
-      this.helpPhysicalAddress = new System.Windows.Forms.ToolTip(this.components);
-      this.tbPhysicalAddress = new System.Windows.Forms.TextBox();
-      this.helpDeviceType = new System.Windows.Forms.ToolTip(this.components);
-      this.cbDeviceType = new System.Windows.Forms.ComboBox();
-      this.cbVendorId = new System.Windows.Forms.ComboBox();
-      this.trayIcon = new System.Windows.Forms.NotifyIcon(this.components);
-      this.trayIconMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
-      this.tsAdvanced = new System.Windows.Forms.ToolStripMenuItem();
-      this.tsMenuShowHide = new System.Windows.Forms.ToolStripMenuItem();
-      this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
-      this.tsMenuClose = new System.Windows.Forms.ToolStripMenuItem();
-      this.LogOutput = new System.Windows.Forms.TabPage();
-      this.bSaveLog = new System.Windows.Forms.Button();
-      this.bClearLog = new System.Windows.Forms.Button();
-      this.cbLogDebug = new System.Windows.Forms.CheckBox();
-      this.cbLogTraffic = new System.Windows.Forms.CheckBox();
-      this.cbLogNotice = new System.Windows.Forms.CheckBox();
-      this.cbLogWarning = new System.Windows.Forms.CheckBox();
-      this.cbLogError = new System.Windows.Forms.CheckBox();
-      this.tbLog = new System.Windows.Forms.TextBox();
-      this.tbTestCommands = new System.Windows.Forms.TabPage();
-      this.bRescanDevices = new System.Windows.Forms.Button();
-      this.bMute = new System.Windows.Forms.Button();
-      this.bVolDown = new System.Windows.Forms.Button();
-      this.bVolUp = new System.Windows.Forms.Button();
-      this.bActivateSource = new System.Windows.Forms.Button();
-      this.bScan = new System.Windows.Forms.Button();
-      this.bStandby = new System.Windows.Forms.Button();
-      this.bSendImageViewOn = new System.Windows.Forms.Button();
-      this.lDestination = new System.Windows.Forms.Label();
-      this.cbCommandDestination = new System.Windows.Forms.ComboBox();
-      this.Configuration = new System.Windows.Forms.TabPage();
-      this.cbOverrideAddress = new System.Windows.Forms.CheckBox();
-      this.bReloadConfig = new System.Windows.Forms.Button();
-      this.cbVendorOverride = new System.Windows.Forms.CheckBox();
-      this.lPowerOff = new System.Windows.Forms.Label();
-      this.cbPowerOffDevices = new System.Windows.Forms.CheckedListBox();
-      this.lWakeDevices = new System.Windows.Forms.Label();
-      this.cbWakeDevices = new System.Windows.Forms.CheckedListBox();
-      this.cbActivateSource = new System.Windows.Forms.CheckBox();
-      this.lPlayerConfig = new System.Windows.Forms.Label();
-      this.lAdapterConfig = new System.Windows.Forms.Label();
-      this.bClose = new System.Windows.Forms.Button();
-      this.bSaveConfig = new System.Windows.Forms.Button();
-      this.lDeviceType = new System.Windows.Forms.Label();
-      this.lConnectedDevice = new System.Windows.Forms.Label();
-      this.lPortNumber = new System.Windows.Forms.Label();
-      this.tabPanel = new System.Windows.Forms.TabControl();
-      this.menuStrip1 = new System.Windows.Forms.MenuStrip();
-      this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-      this.hideToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-      this.advancedModeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-      this.closeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-      this.applicationsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-      this.addNewApplicationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-      this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-      this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-      this.cbStartMinimised = new System.Windows.Forms.CheckBox();
-      this.trayIconMenu.SuspendLayout();
-      this.LogOutput.SuspendLayout();
-      this.tbTestCommands.SuspendLayout();
-      this.Configuration.SuspendLayout();
-      this.tabPanel.SuspendLayout();
-      this.menuStrip1.SuspendLayout();
-      this.SuspendLayout();
-      // 
-      // pProgress
-      // 
-      this.pProgress.Location = new System.Drawing.Point(314, 407);
-      this.pProgress.Name = "pProgress";
-      this.pProgress.Size = new System.Drawing.Size(298, 23);
-      this.pProgress.TabIndex = 1;
-      // 
-      // lStatus
-      // 
-      this.lStatus.AutoSize = true;
-      this.lStatus.Location = new System.Drawing.Point(12, 416);
-      this.lStatus.Name = "lStatus";
-      this.lStatus.Size = new System.Drawing.Size(61, 13);
-      this.lStatus.TabIndex = 2;
-      this.lStatus.Text = "Initialising...";
-      // 
-      // cbPortNumber
-      // 
-      this.cbPortNumber.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Append;
-      this.cbPortNumber.Enabled = false;
-      this.cbPortNumber.FormattingEnabled = true;
-      this.cbPortNumber.Location = new System.Drawing.Point(174, 40);
-      this.cbPortNumber.Name = "cbPortNumber";
-      this.cbPortNumber.Size = new System.Drawing.Size(133, 21);
-      this.cbPortNumber.TabIndex = 11;
-      this.cbPortNumber.Text = "global_hdmi_port";
-      this.helpPortNumber.SetToolTip(this.cbPortNumber, "The HDMI port number, to which you connected your USB-CEC adapter.");
-      // 
-      // cbConnectedDevice
-      // 
-      this.cbConnectedDevice.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Append;
-      this.cbConnectedDevice.Enabled = false;
-      this.cbConnectedDevice.FormattingEnabled = true;
-      this.cbConnectedDevice.Location = new System.Drawing.Point(174, 67);
-      this.cbConnectedDevice.Name = "cbConnectedDevice";
-      this.cbConnectedDevice.Size = new System.Drawing.Size(133, 21);
-      this.cbConnectedDevice.TabIndex = 5;
-      this.cbConnectedDevice.Text = "global_connected_to_hdmi_device";
-      this.helpConnectedHDMIDevice.SetToolTip(this.cbConnectedDevice, "The HDMI device to which the USB-CEC adapter is connected");
-      // 
-      // tbPhysicalAddress
-      // 
-      this.tbPhysicalAddress.Enabled = false;
-      this.tbPhysicalAddress.Location = new System.Drawing.Point(174, 95);
-      this.tbPhysicalAddress.MaxLength = 4;
-      this.tbPhysicalAddress.Name = "tbPhysicalAddress";
-      this.tbPhysicalAddress.Size = new System.Drawing.Size(38, 20);
-      this.tbPhysicalAddress.TabIndex = 6;
-      this.tbPhysicalAddress.Text = "global_override_physical_address";
-      this.helpPhysicalAddress.SetToolTip(this.tbPhysicalAddress, "The physical address of the adapter. Leave this untouched if you want to autodete" +
-              "ct this value.");
-      // 
-      // cbDeviceType
-      // 
-      this.cbDeviceType.Enabled = false;
-      this.cbDeviceType.FormattingEnabled = true;
-      this.cbDeviceType.Location = new System.Drawing.Point(174, 123);
-      this.cbDeviceType.Name = "cbDeviceType";
-      this.cbDeviceType.Size = new System.Drawing.Size(133, 21);
-      this.cbDeviceType.TabIndex = 14;
-      this.cbDeviceType.Text = "global_device_type";
-      this.helpDeviceType.SetToolTip(this.cbDeviceType, "Set this to \'Player\' when your TV is having problems with \'Recorder\'");
-      // 
-      // cbVendorId
-      // 
-      this.cbVendorId.Enabled = false;
-      this.cbVendorId.FormattingEnabled = true;
-      this.cbVendorId.Location = new System.Drawing.Point(174, 153);
-      this.cbVendorId.Name = "cbVendorId";
-      this.cbVendorId.Size = new System.Drawing.Size(133, 21);
-      this.cbVendorId.TabIndex = 28;
-      this.cbVendorId.Text = "global_override_tv_vendor";
-      this.helpDeviceType.SetToolTip(this.cbVendorId, "Only set this value when autodetection isn\'t working");
-      // 
-      // trayIcon
-      // 
-      this.trayIcon.ContextMenuStrip = this.trayIconMenu;
-      this.trayIcon.Icon = ((System.Drawing.Icon)(resources.GetObject("trayIcon.Icon")));
-      this.trayIcon.Text = "Pulse-Eight USB-CEC Adapter";
-      this.trayIcon.Visible = true;
-      this.trayIcon.Click += new System.EventHandler(this.TrayIconClick);
-      // 
-      // trayIconMenu
-      // 
-      this.trayIconMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.components = new System.ComponentModel.Container();
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CECTray));
+            this.pProgress = new System.Windows.Forms.ProgressBar();
+            this.lStatus = new System.Windows.Forms.Label();
+            this.helpPortNumber = new System.Windows.Forms.ToolTip(this.components);
+            this.cbPortNumber = new System.Windows.Forms.ComboBox();
+            this.helpConnectedHDMIDevice = new System.Windows.Forms.ToolTip(this.components);
+            this.cbConnectedDevice = new System.Windows.Forms.ComboBox();
+            this.helpPhysicalAddress = new System.Windows.Forms.ToolTip(this.components);
+            this.tbPhysicalAddress = new System.Windows.Forms.TextBox();
+            this.helpDeviceType = new System.Windows.Forms.ToolTip(this.components);
+            this.cbDeviceType = new System.Windows.Forms.ComboBox();
+            this.cbVendorId = new System.Windows.Forms.ComboBox();
+            this.trayIcon = new System.Windows.Forms.NotifyIcon(this.components);
+            this.trayIconMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
+            this.tsAdvanced = new System.Windows.Forms.ToolStripMenuItem();
+            this.tsMenuShowHide = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+            this.tsMenuClose = new System.Windows.Forms.ToolStripMenuItem();
+            this.LogOutput = new System.Windows.Forms.TabPage();
+            this.bSaveLog = new System.Windows.Forms.Button();
+            this.bClearLog = new System.Windows.Forms.Button();
+            this.cbLogDebug = new System.Windows.Forms.CheckBox();
+            this.cbLogTraffic = new System.Windows.Forms.CheckBox();
+            this.cbLogNotice = new System.Windows.Forms.CheckBox();
+            this.cbLogWarning = new System.Windows.Forms.CheckBox();
+            this.cbLogError = new System.Windows.Forms.CheckBox();
+            this.tbLog = new System.Windows.Forms.TextBox();
+            this.tbTestCommands = new System.Windows.Forms.TabPage();
+            this.bRescanDevices = new System.Windows.Forms.Button();
+            this.bMute = new System.Windows.Forms.Button();
+            this.bVolDown = new System.Windows.Forms.Button();
+            this.bVolUp = new System.Windows.Forms.Button();
+            this.bActivateSource = new System.Windows.Forms.Button();
+            this.bScan = new System.Windows.Forms.Button();
+            this.bStandby = new System.Windows.Forms.Button();
+            this.bSendImageViewOn = new System.Windows.Forms.Button();
+            this.lDestination = new System.Windows.Forms.Label();
+            this.cbCommandDestination = new System.Windows.Forms.ComboBox();
+            this.Configuration = new System.Windows.Forms.TabPage();
+            this.cbStartMinimised = new System.Windows.Forms.CheckBox();
+            this.cbOverrideAddress = new System.Windows.Forms.CheckBox();
+            this.bReloadConfig = new System.Windows.Forms.Button();
+            this.cbVendorOverride = new System.Windows.Forms.CheckBox();
+            this.lPowerOff = new System.Windows.Forms.Label();
+            this.cbPowerOffDevices = new System.Windows.Forms.CheckedListBox();
+            this.lWakeDevices = new System.Windows.Forms.Label();
+            this.cbWakeDevices = new System.Windows.Forms.CheckedListBox();
+            this.cbActivateSource = new System.Windows.Forms.CheckBox();
+            this.lPlayerConfig = new System.Windows.Forms.Label();
+            this.lAdapterConfig = new System.Windows.Forms.Label();
+            this.bClose = new System.Windows.Forms.Button();
+            this.bSaveConfig = new System.Windows.Forms.Button();
+            this.lDeviceType = new System.Windows.Forms.Label();
+            this.lConnectedDevice = new System.Windows.Forms.Label();
+            this.lPortNumber = new System.Windows.Forms.Label();
+            this.tabPanel = new System.Windows.Forms.TabControl();
+            this.menuStrip1 = new System.Windows.Forms.MenuStrip();
+            this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.hideToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.advancedModeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.closeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.applicationsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.addNewApplicationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.trayIconMenu.SuspendLayout();
+            this.LogOutput.SuspendLayout();
+            this.tbTestCommands.SuspendLayout();
+            this.Configuration.SuspendLayout();
+            this.tabPanel.SuspendLayout();
+            this.menuStrip1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // pProgress
+            // 
+            this.pProgress.Location = new System.Drawing.Point(314, 407);
+            this.pProgress.Name = "pProgress";
+            this.pProgress.Size = new System.Drawing.Size(298, 23);
+            this.pProgress.TabIndex = 1;
+            // 
+            // lStatus
+            // 
+            this.lStatus.AutoSize = true;
+            this.lStatus.Location = new System.Drawing.Point(12, 416);
+            this.lStatus.Name = "lStatus";
+            this.lStatus.Size = new System.Drawing.Size(61, 13);
+            this.lStatus.TabIndex = 2;
+            this.lStatus.Text = "Initialising...";
+            // 
+            // cbPortNumber
+            // 
+            this.cbPortNumber.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Append;
+            this.cbPortNumber.Enabled = false;
+            this.cbPortNumber.FormattingEnabled = true;
+            this.cbPortNumber.Location = new System.Drawing.Point(174, 40);
+            this.cbPortNumber.Name = "cbPortNumber";
+            this.cbPortNumber.Size = new System.Drawing.Size(133, 21);
+            this.cbPortNumber.TabIndex = 11;
+            this.cbPortNumber.Text = "global_hdmi_port";
+            this.helpPortNumber.SetToolTip(this.cbPortNumber, "The HDMI port number, to which you connected your USB-CEC adapter.");
+            // 
+            // cbConnectedDevice
+            // 
+            this.cbConnectedDevice.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Append;
+            this.cbConnectedDevice.Enabled = false;
+            this.cbConnectedDevice.FormattingEnabled = true;
+            this.cbConnectedDevice.Location = new System.Drawing.Point(174, 67);
+            this.cbConnectedDevice.Name = "cbConnectedDevice";
+            this.cbConnectedDevice.Size = new System.Drawing.Size(133, 21);
+            this.cbConnectedDevice.TabIndex = 5;
+            this.cbConnectedDevice.Text = "global_connected_to_hdmi_device";
+            this.helpConnectedHDMIDevice.SetToolTip(this.cbConnectedDevice, "The HDMI device to which the USB-CEC adapter is connected");
+            // 
+            // tbPhysicalAddress
+            // 
+            this.tbPhysicalAddress.Enabled = false;
+            this.tbPhysicalAddress.Location = new System.Drawing.Point(174, 95);
+            this.tbPhysicalAddress.MaxLength = 4;
+            this.tbPhysicalAddress.Name = "tbPhysicalAddress";
+            this.tbPhysicalAddress.Size = new System.Drawing.Size(38, 20);
+            this.tbPhysicalAddress.TabIndex = 6;
+            this.tbPhysicalAddress.Text = "global_override_physical_address";
+            this.helpPhysicalAddress.SetToolTip(this.tbPhysicalAddress, "The physical address of the adapter. Leave this untouched if you want to autodete" +
+        "ct this value.");
+            // 
+            // cbDeviceType
+            // 
+            this.cbDeviceType.Enabled = false;
+            this.cbDeviceType.FormattingEnabled = true;
+            this.cbDeviceType.Location = new System.Drawing.Point(174, 123);
+            this.cbDeviceType.Name = "cbDeviceType";
+            this.cbDeviceType.Size = new System.Drawing.Size(133, 21);
+            this.cbDeviceType.TabIndex = 14;
+            this.cbDeviceType.Text = "global_device_type";
+            this.helpDeviceType.SetToolTip(this.cbDeviceType, "Set this to \'Player\' when your TV is having problems with \'Recorder\'");
+            // 
+            // cbVendorId
+            // 
+            this.cbVendorId.Enabled = false;
+            this.cbVendorId.FormattingEnabled = true;
+            this.cbVendorId.Location = new System.Drawing.Point(174, 153);
+            this.cbVendorId.Name = "cbVendorId";
+            this.cbVendorId.Size = new System.Drawing.Size(133, 21);
+            this.cbVendorId.TabIndex = 28;
+            this.cbVendorId.Text = "global_override_tv_vendor";
+            this.helpDeviceType.SetToolTip(this.cbVendorId, "Only set this value when autodetection isn\'t working");
+            // 
+            // trayIcon
+            // 
+            this.trayIcon.ContextMenuStrip = this.trayIconMenu;
+            this.trayIcon.Icon = ((System.Drawing.Icon)(resources.GetObject("trayIcon.Icon")));
+            this.trayIcon.Text = "Pulse-Eight USB-CEC Adapter";
+            this.trayIcon.Visible = true;
+            this.trayIcon.Click += new System.EventHandler(this.TrayIconClick);
+            // 
+            // trayIconMenu
+            // 
+            this.trayIconMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.tsAdvanced,
             this.tsMenuShowHide,
             this.toolStripSeparator1,
             this.tsMenuClose});
-      this.trayIconMenu.Name = "trayIconMenu";
-      this.trayIconMenu.Size = new System.Drawing.Size(162, 76);
-      // 
-      // tsAdvanced
-      // 
-      this.tsAdvanced.Name = "tsAdvanced";
-      this.tsAdvanced.Size = new System.Drawing.Size(161, 22);
-      this.tsAdvanced.Text = "Advanced mode";
-      this.tsAdvanced.Click += new System.EventHandler(this.TsAdvancedClick);
-      // 
-      // tsMenuShowHide
-      // 
-      this.tsMenuShowHide.Name = "tsMenuShowHide";
-      this.tsMenuShowHide.Size = new System.Drawing.Size(161, 22);
-      this.tsMenuShowHide.Text = "Hide";
-      this.tsMenuShowHide.Click += new System.EventHandler(this.TsMenuShowHideClick);
-      // 
-      // toolStripSeparator1
-      // 
-      this.toolStripSeparator1.Name = "toolStripSeparator1";
-      this.toolStripSeparator1.Size = new System.Drawing.Size(158, 6);
-      // 
-      // tsMenuClose
-      // 
-      this.tsMenuClose.Name = "tsMenuClose";
-      this.tsMenuClose.Size = new System.Drawing.Size(161, 22);
-      this.tsMenuClose.Text = "Exit";
-      this.tsMenuClose.Click += new System.EventHandler(this.TsMenuCloseClick);
-      // 
-      // LogOutput
-      // 
-      this.LogOutput.Controls.Add(this.bSaveLog);
-      this.LogOutput.Controls.Add(this.bClearLog);
-      this.LogOutput.Controls.Add(this.cbLogDebug);
-      this.LogOutput.Controls.Add(this.cbLogTraffic);
-      this.LogOutput.Controls.Add(this.cbLogNotice);
-      this.LogOutput.Controls.Add(this.cbLogWarning);
-      this.LogOutput.Controls.Add(this.cbLogError);
-      this.LogOutput.Controls.Add(this.tbLog);
-      this.LogOutput.Location = new System.Drawing.Point(4, 22);
-      this.LogOutput.Name = "LogOutput";
-      this.LogOutput.Padding = new System.Windows.Forms.Padding(3);
-      this.LogOutput.Size = new System.Drawing.Size(592, 344);
-      this.LogOutput.TabIndex = 1;
-      this.LogOutput.Text = "Log Output";
-      this.LogOutput.UseVisualStyleBackColor = true;
-      // 
-      // bSaveLog
-      // 
-      this.bSaveLog.Location = new System.Drawing.Point(429, 318);
-      this.bSaveLog.Name = "bSaveLog";
-      this.bSaveLog.Size = new System.Drawing.Size(75, 23);
-      this.bSaveLog.TabIndex = 7;
-      this.bSaveLog.Text = "Persist";
-      this.bSaveLog.UseVisualStyleBackColor = true;
-      this.bSaveLog.Click += new System.EventHandler(this.BSaveLogClick);
-      // 
-      // bClearLog
-      // 
-      this.bClearLog.Location = new System.Drawing.Point(510, 318);
-      this.bClearLog.Name = "bClearLog";
-      this.bClearLog.Size = new System.Drawing.Size(75, 23);
-      this.bClearLog.TabIndex = 6;
-      this.bClearLog.Text = "Clear";
-      this.bClearLog.UseVisualStyleBackColor = true;
-      this.bClearLog.Click += new System.EventHandler(this.BClearLogClick);
-      // 
-      // cbLogDebug
-      // 
-      this.cbLogDebug.AutoSize = true;
-      this.cbLogDebug.Checked = true;
-      this.cbLogDebug.CheckState = System.Windows.Forms.CheckState.Checked;
-      this.cbLogDebug.Location = new System.Drawing.Point(268, 324);
-      this.cbLogDebug.Name = "cbLogDebug";
-      this.cbLogDebug.Size = new System.Drawing.Size(58, 17);
-      this.cbLogDebug.TabIndex = 5;
-      this.cbLogDebug.Text = "Debug";
-      this.cbLogDebug.UseVisualStyleBackColor = true;
-      // 
-      // cbLogTraffic
-      // 
-      this.cbLogTraffic.AutoSize = true;
-      this.cbLogTraffic.Checked = true;
-      this.cbLogTraffic.CheckState = System.Windows.Forms.CheckState.Checked;
-      this.cbLogTraffic.Location = new System.Drawing.Point(206, 324);
-      this.cbLogTraffic.Name = "cbLogTraffic";
-      this.cbLogTraffic.Size = new System.Drawing.Size(56, 17);
-      this.cbLogTraffic.TabIndex = 4;
-      this.cbLogTraffic.Text = "Traffic";
-      this.cbLogTraffic.UseVisualStyleBackColor = true;
-      // 
-      // cbLogNotice
-      // 
-      this.cbLogNotice.AutoSize = true;
-      this.cbLogNotice.Checked = true;
-      this.cbLogNotice.CheckState = System.Windows.Forms.CheckState.Checked;
-      this.cbLogNotice.Location = new System.Drawing.Point(137, 324);
-      this.cbLogNotice.Name = "cbLogNotice";
-      this.cbLogNotice.Size = new System.Drawing.Size(62, 17);
-      this.cbLogNotice.TabIndex = 3;
-      this.cbLogNotice.Text = "Notices";
-      this.cbLogNotice.UseVisualStyleBackColor = true;
-      // 
-      // cbLogWarning
-      // 
-      this.cbLogWarning.AutoSize = true;
-      this.cbLogWarning.Checked = true;
-      this.cbLogWarning.CheckState = System.Windows.Forms.CheckState.Checked;
-      this.cbLogWarning.Location = new System.Drawing.Point(65, 324);
-      this.cbLogWarning.Name = "cbLogWarning";
-      this.cbLogWarning.Size = new System.Drawing.Size(66, 17);
-      this.cbLogWarning.TabIndex = 2;
-      this.cbLogWarning.Text = "Warning";
-      this.cbLogWarning.UseVisualStyleBackColor = true;
-      // 
-      // cbLogError
-      // 
-      this.cbLogError.AutoSize = true;
-      this.cbLogError.Checked = true;
-      this.cbLogError.CheckState = System.Windows.Forms.CheckState.Checked;
-      this.cbLogError.Location = new System.Drawing.Point(6, 324);
-      this.cbLogError.Name = "cbLogError";
-      this.cbLogError.Size = new System.Drawing.Size(53, 17);
-      this.cbLogError.TabIndex = 1;
-      this.cbLogError.Text = "Errors";
-      this.cbLogError.UseVisualStyleBackColor = true;
-      // 
-      // tbLog
-      // 
-      this.tbLog.Location = new System.Drawing.Point(6, 0);
-      this.tbLog.Multiline = true;
-      this.tbLog.Name = "tbLog";
-      this.tbLog.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
-      this.tbLog.Size = new System.Drawing.Size(580, 312);
-      this.tbLog.TabIndex = 0;
-      // 
-      // tbTestCommands
-      // 
-      this.tbTestCommands.Controls.Add(this.bRescanDevices);
-      this.tbTestCommands.Controls.Add(this.bMute);
-      this.tbTestCommands.Controls.Add(this.bVolDown);
-      this.tbTestCommands.Controls.Add(this.bVolUp);
-      this.tbTestCommands.Controls.Add(this.bActivateSource);
-      this.tbTestCommands.Controls.Add(this.bScan);
-      this.tbTestCommands.Controls.Add(this.bStandby);
-      this.tbTestCommands.Controls.Add(this.bSendImageViewOn);
-      this.tbTestCommands.Controls.Add(this.lDestination);
-      this.tbTestCommands.Controls.Add(this.cbCommandDestination);
-      this.tbTestCommands.Location = new System.Drawing.Point(4, 22);
-      this.tbTestCommands.Name = "tbTestCommands";
-      this.tbTestCommands.Padding = new System.Windows.Forms.Padding(3);
-      this.tbTestCommands.Size = new System.Drawing.Size(592, 344);
-      this.tbTestCommands.TabIndex = 3;
-      this.tbTestCommands.Text = "CEC tester";
-      this.tbTestCommands.UseVisualStyleBackColor = true;
-      // 
-      // bRescanDevices
-      // 
-      this.bRescanDevices.Enabled = false;
-      this.bRescanDevices.Location = new System.Drawing.Point(424, 65);
-      this.bRescanDevices.Name = "bRescanDevices";
-      this.bRescanDevices.Size = new System.Drawing.Size(150, 23);
-      this.bRescanDevices.TabIndex = 9;
-      this.bRescanDevices.Text = "Re-scan devices";
-      this.bRescanDevices.UseVisualStyleBackColor = true;
-      this.bRescanDevices.Click += new System.EventHandler(this.BRescanDevicesClick);
-      // 
-      // bMute
-      // 
-      this.bMute.Enabled = false;
-      this.bMute.Location = new System.Drawing.Point(164, 65);
-      this.bMute.Name = "bMute";
-      this.bMute.Size = new System.Drawing.Size(150, 23);
-      this.bMute.TabIndex = 8;
-      this.bMute.Text = "Mute";
-      this.bMute.UseVisualStyleBackColor = true;
-      this.bMute.Click += new System.EventHandler(this.BMuteClick);
-      // 
-      // bVolDown
-      // 
-      this.bVolDown.Enabled = false;
-      this.bVolDown.Location = new System.Drawing.Point(164, 36);
-      this.bVolDown.Name = "bVolDown";
-      this.bVolDown.Size = new System.Drawing.Size(150, 23);
-      this.bVolDown.TabIndex = 7;
-      this.bVolDown.Text = "Volume down";
-      this.bVolDown.UseVisualStyleBackColor = true;
-      this.bVolDown.Click += new System.EventHandler(this.BVolDownClick);
-      // 
-      // bVolUp
-      // 
-      this.bVolUp.Enabled = false;
-      this.bVolUp.Location = new System.Drawing.Point(164, 7);
-      this.bVolUp.Name = "bVolUp";
-      this.bVolUp.Size = new System.Drawing.Size(150, 23);
-      this.bVolUp.TabIndex = 6;
-      this.bVolUp.Text = "Volume up";
-      this.bVolUp.UseVisualStyleBackColor = true;
-      this.bVolUp.Click += new System.EventHandler(this.BVolUpClick);
-      // 
-      // bActivateSource
-      // 
-      this.bActivateSource.Enabled = false;
-      this.bActivateSource.Location = new System.Drawing.Point(8, 65);
-      this.bActivateSource.Name = "bActivateSource";
-      this.bActivateSource.Size = new System.Drawing.Size(150, 23);
-      this.bActivateSource.TabIndex = 5;
-      this.bActivateSource.Text = "Make device active";
-      this.bActivateSource.UseVisualStyleBackColor = true;
-      this.bActivateSource.Click += new System.EventHandler(this.BActivateSourceClick);
-      // 
-      // bScan
-      // 
-      this.bScan.Enabled = false;
-      this.bScan.Location = new System.Drawing.Point(8, 94);
-      this.bScan.Name = "bScan";
-      this.bScan.Size = new System.Drawing.Size(150, 23);
-      this.bScan.TabIndex = 4;
-      this.bScan.Text = "Device information";
-      this.bScan.UseVisualStyleBackColor = true;
-      this.bScan.Click += new System.EventHandler(this.BScanClick);
-      // 
-      // bStandby
-      // 
-      this.bStandby.Enabled = false;
-      this.bStandby.Location = new System.Drawing.Point(8, 36);
-      this.bStandby.Name = "bStandby";
-      this.bStandby.Size = new System.Drawing.Size(150, 23);
-      this.bStandby.TabIndex = 3;
-      this.bStandby.Text = "Put device in standby";
-      this.bStandby.UseVisualStyleBackColor = true;
-      this.bStandby.Click += new System.EventHandler(this.BStandbyClick);
-      // 
-      // bSendImageViewOn
-      // 
-      this.bSendImageViewOn.Enabled = false;
-      this.bSendImageViewOn.Location = new System.Drawing.Point(8, 7);
-      this.bSendImageViewOn.Name = "bSendImageViewOn";
-      this.bSendImageViewOn.Size = new System.Drawing.Size(150, 23);
-      this.bSendImageViewOn.TabIndex = 2;
-      this.bSendImageViewOn.Text = "Power on device";
-      this.bSendImageViewOn.UseVisualStyleBackColor = true;
-      this.bSendImageViewOn.Click += new System.EventHandler(this.BSendImageViewOnClick);
-      // 
-      // lDestination
-      // 
-      this.lDestination.AutoSize = true;
-      this.lDestination.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-      this.lDestination.Location = new System.Drawing.Point(420, 3);
-      this.lDestination.Name = "lDestination";
-      this.lDestination.Size = new System.Drawing.Size(138, 24);
-      this.lDestination.TabIndex = 1;
-      this.lDestination.Text = "Target device";
-      // 
-      // cbCommandDestination
-      // 
-      this.cbCommandDestination.FormattingEnabled = true;
-      this.cbCommandDestination.Items.AddRange(new object[] {
+            this.trayIconMenu.Name = "trayIconMenu";
+            this.trayIconMenu.Size = new System.Drawing.Size(152, 76);
+            // 
+            // tsAdvanced
+            // 
+            this.tsAdvanced.Name = "tsAdvanced";
+            this.tsAdvanced.Size = new System.Drawing.Size(151, 22);
+            this.tsAdvanced.Text = "Advanced mode";
+            this.tsAdvanced.Click += new System.EventHandler(this.TsAdvancedClick);
+            // 
+            // tsMenuShowHide
+            // 
+            this.tsMenuShowHide.Name = "tsMenuShowHide";
+            this.tsMenuShowHide.Size = new System.Drawing.Size(151, 22);
+            this.tsMenuShowHide.Text = "Hide";
+            this.tsMenuShowHide.Click += new System.EventHandler(this.TsMenuShowHideClick);
+            // 
+            // toolStripSeparator1
+            // 
+            this.toolStripSeparator1.Name = "toolStripSeparator1";
+            this.toolStripSeparator1.Size = new System.Drawing.Size(148, 6);
+            // 
+            // tsMenuClose
+            // 
+            this.tsMenuClose.Name = "tsMenuClose";
+            this.tsMenuClose.Size = new System.Drawing.Size(151, 22);
+            this.tsMenuClose.Text = "Exit";
+            this.tsMenuClose.Click += new System.EventHandler(this.TsMenuCloseClick);
+            // 
+            // LogOutput
+            // 
+            this.LogOutput.Controls.Add(this.bSaveLog);
+            this.LogOutput.Controls.Add(this.bClearLog);
+            this.LogOutput.Controls.Add(this.cbLogDebug);
+            this.LogOutput.Controls.Add(this.cbLogTraffic);
+            this.LogOutput.Controls.Add(this.cbLogNotice);
+            this.LogOutput.Controls.Add(this.cbLogWarning);
+            this.LogOutput.Controls.Add(this.cbLogError);
+            this.LogOutput.Controls.Add(this.tbLog);
+            this.LogOutput.Location = new System.Drawing.Point(4, 22);
+            this.LogOutput.Name = "LogOutput";
+            this.LogOutput.Padding = new System.Windows.Forms.Padding(3);
+            this.LogOutput.Size = new System.Drawing.Size(592, 344);
+            this.LogOutput.TabIndex = 1;
+            this.LogOutput.Text = "Log Output";
+            this.LogOutput.UseVisualStyleBackColor = true;
+            // 
+            // bSaveLog
+            // 
+            this.bSaveLog.Location = new System.Drawing.Point(429, 318);
+            this.bSaveLog.Name = "bSaveLog";
+            this.bSaveLog.Size = new System.Drawing.Size(75, 23);
+            this.bSaveLog.TabIndex = 7;
+            this.bSaveLog.Text = "Save";
+            this.bSaveLog.UseVisualStyleBackColor = true;
+            this.bSaveLog.Click += new System.EventHandler(this.BSaveLogClick);
+            // 
+            // bClearLog
+            // 
+            this.bClearLog.Location = new System.Drawing.Point(510, 318);
+            this.bClearLog.Name = "bClearLog";
+            this.bClearLog.Size = new System.Drawing.Size(75, 23);
+            this.bClearLog.TabIndex = 6;
+            this.bClearLog.Text = "Clear";
+            this.bClearLog.UseVisualStyleBackColor = true;
+            this.bClearLog.Click += new System.EventHandler(this.BClearLogClick);
+            // 
+            // cbLogDebug
+            // 
+            this.cbLogDebug.AutoSize = true;
+            this.cbLogDebug.Checked = true;
+            this.cbLogDebug.CheckState = System.Windows.Forms.CheckState.Checked;
+            this.cbLogDebug.Location = new System.Drawing.Point(268, 324);
+            this.cbLogDebug.Name = "cbLogDebug";
+            this.cbLogDebug.Size = new System.Drawing.Size(58, 17);
+            this.cbLogDebug.TabIndex = 5;
+            this.cbLogDebug.Text = "Debug";
+            this.cbLogDebug.UseVisualStyleBackColor = true;
+            // 
+            // cbLogTraffic
+            // 
+            this.cbLogTraffic.AutoSize = true;
+            this.cbLogTraffic.Checked = true;
+            this.cbLogTraffic.CheckState = System.Windows.Forms.CheckState.Checked;
+            this.cbLogTraffic.Location = new System.Drawing.Point(206, 324);
+            this.cbLogTraffic.Name = "cbLogTraffic";
+            this.cbLogTraffic.Size = new System.Drawing.Size(56, 17);
+            this.cbLogTraffic.TabIndex = 4;
+            this.cbLogTraffic.Text = "Traffic";
+            this.cbLogTraffic.UseVisualStyleBackColor = true;
+            // 
+            // cbLogNotice
+            // 
+            this.cbLogNotice.AutoSize = true;
+            this.cbLogNotice.Checked = true;
+            this.cbLogNotice.CheckState = System.Windows.Forms.CheckState.Checked;
+            this.cbLogNotice.Location = new System.Drawing.Point(137, 324);
+            this.cbLogNotice.Name = "cbLogNotice";
+            this.cbLogNotice.Size = new System.Drawing.Size(62, 17);
+            this.cbLogNotice.TabIndex = 3;
+            this.cbLogNotice.Text = "Notices";
+            this.cbLogNotice.UseVisualStyleBackColor = true;
+            // 
+            // cbLogWarning
+            // 
+            this.cbLogWarning.AutoSize = true;
+            this.cbLogWarning.Checked = true;
+            this.cbLogWarning.CheckState = System.Windows.Forms.CheckState.Checked;
+            this.cbLogWarning.Location = new System.Drawing.Point(65, 324);
+            this.cbLogWarning.Name = "cbLogWarning";
+            this.cbLogWarning.Size = new System.Drawing.Size(66, 17);
+            this.cbLogWarning.TabIndex = 2;
+            this.cbLogWarning.Text = "Warning";
+            this.cbLogWarning.UseVisualStyleBackColor = true;
+            // 
+            // cbLogError
+            // 
+            this.cbLogError.AutoSize = true;
+            this.cbLogError.Checked = true;
+            this.cbLogError.CheckState = System.Windows.Forms.CheckState.Checked;
+            this.cbLogError.Location = new System.Drawing.Point(6, 324);
+            this.cbLogError.Name = "cbLogError";
+            this.cbLogError.Size = new System.Drawing.Size(53, 17);
+            this.cbLogError.TabIndex = 1;
+            this.cbLogError.Text = "Errors";
+            this.cbLogError.UseVisualStyleBackColor = true;
+            // 
+            // tbLog
+            // 
+            this.tbLog.Location = new System.Drawing.Point(6, 0);
+            this.tbLog.Multiline = true;
+            this.tbLog.Name = "tbLog";
+            this.tbLog.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
+            this.tbLog.Size = new System.Drawing.Size(580, 312);
+            this.tbLog.TabIndex = 0;
+            // 
+            // tbTestCommands
+            // 
+            this.tbTestCommands.Controls.Add(this.bRescanDevices);
+            this.tbTestCommands.Controls.Add(this.bMute);
+            this.tbTestCommands.Controls.Add(this.bVolDown);
+            this.tbTestCommands.Controls.Add(this.bVolUp);
+            this.tbTestCommands.Controls.Add(this.bActivateSource);
+            this.tbTestCommands.Controls.Add(this.bScan);
+            this.tbTestCommands.Controls.Add(this.bStandby);
+            this.tbTestCommands.Controls.Add(this.bSendImageViewOn);
+            this.tbTestCommands.Controls.Add(this.lDestination);
+            this.tbTestCommands.Controls.Add(this.cbCommandDestination);
+            this.tbTestCommands.Location = new System.Drawing.Point(4, 22);
+            this.tbTestCommands.Name = "tbTestCommands";
+            this.tbTestCommands.Padding = new System.Windows.Forms.Padding(3);
+            this.tbTestCommands.Size = new System.Drawing.Size(592, 344);
+            this.tbTestCommands.TabIndex = 3;
+            this.tbTestCommands.Text = "CEC tester";
+            this.tbTestCommands.UseVisualStyleBackColor = true;
+            // 
+            // bRescanDevices
+            // 
+            this.bRescanDevices.Enabled = false;
+            this.bRescanDevices.Location = new System.Drawing.Point(424, 65);
+            this.bRescanDevices.Name = "bRescanDevices";
+            this.bRescanDevices.Size = new System.Drawing.Size(150, 23);
+            this.bRescanDevices.TabIndex = 9;
+            this.bRescanDevices.Text = "Re-scan devices";
+            this.bRescanDevices.UseVisualStyleBackColor = true;
+            this.bRescanDevices.Click += new System.EventHandler(this.BRescanDevicesClick);
+            // 
+            // bMute
+            // 
+            this.bMute.Enabled = false;
+            this.bMute.Location = new System.Drawing.Point(164, 65);
+            this.bMute.Name = "bMute";
+            this.bMute.Size = new System.Drawing.Size(150, 23);
+            this.bMute.TabIndex = 8;
+            this.bMute.Text = "Mute";
+            this.bMute.UseVisualStyleBackColor = true;
+            this.bMute.Click += new System.EventHandler(this.BMuteClick);
+            // 
+            // bVolDown
+            // 
+            this.bVolDown.Enabled = false;
+            this.bVolDown.Location = new System.Drawing.Point(164, 36);
+            this.bVolDown.Name = "bVolDown";
+            this.bVolDown.Size = new System.Drawing.Size(150, 23);
+            this.bVolDown.TabIndex = 7;
+            this.bVolDown.Text = "Volume down";
+            this.bVolDown.UseVisualStyleBackColor = true;
+            this.bVolDown.Click += new System.EventHandler(this.BVolDownClick);
+            // 
+            // bVolUp
+            // 
+            this.bVolUp.Enabled = false;
+            this.bVolUp.Location = new System.Drawing.Point(164, 7);
+            this.bVolUp.Name = "bVolUp";
+            this.bVolUp.Size = new System.Drawing.Size(150, 23);
+            this.bVolUp.TabIndex = 6;
+            this.bVolUp.Text = "Volume up";
+            this.bVolUp.UseVisualStyleBackColor = true;
+            this.bVolUp.Click += new System.EventHandler(this.BVolUpClick);
+            // 
+            // bActivateSource
+            // 
+            this.bActivateSource.Enabled = false;
+            this.bActivateSource.Location = new System.Drawing.Point(8, 65);
+            this.bActivateSource.Name = "bActivateSource";
+            this.bActivateSource.Size = new System.Drawing.Size(150, 23);
+            this.bActivateSource.TabIndex = 5;
+            this.bActivateSource.Text = "Make device active";
+            this.bActivateSource.UseVisualStyleBackColor = true;
+            this.bActivateSource.Click += new System.EventHandler(this.BActivateSourceClick);
+            // 
+            // bScan
+            // 
+            this.bScan.Enabled = false;
+            this.bScan.Location = new System.Drawing.Point(8, 94);
+            this.bScan.Name = "bScan";
+            this.bScan.Size = new System.Drawing.Size(150, 23);
+            this.bScan.TabIndex = 4;
+            this.bScan.Text = "Device information";
+            this.bScan.UseVisualStyleBackColor = true;
+            this.bScan.Click += new System.EventHandler(this.BScanClick);
+            // 
+            // bStandby
+            // 
+            this.bStandby.Enabled = false;
+            this.bStandby.Location = new System.Drawing.Point(8, 36);
+            this.bStandby.Name = "bStandby";
+            this.bStandby.Size = new System.Drawing.Size(150, 23);
+            this.bStandby.TabIndex = 3;
+            this.bStandby.Text = "Put device in standby";
+            this.bStandby.UseVisualStyleBackColor = true;
+            this.bStandby.Click += new System.EventHandler(this.BStandbyClick);
+            // 
+            // bSendImageViewOn
+            // 
+            this.bSendImageViewOn.Enabled = false;
+            this.bSendImageViewOn.Location = new System.Drawing.Point(8, 7);
+            this.bSendImageViewOn.Name = "bSendImageViewOn";
+            this.bSendImageViewOn.Size = new System.Drawing.Size(150, 23);
+            this.bSendImageViewOn.TabIndex = 2;
+            this.bSendImageViewOn.Text = "Power on device";
+            this.bSendImageViewOn.UseVisualStyleBackColor = true;
+            this.bSendImageViewOn.Click += new System.EventHandler(this.BSendImageViewOnClick);
+            // 
+            // lDestination
+            // 
+            this.lDestination.AutoSize = true;
+            this.lDestination.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.lDestination.Location = new System.Drawing.Point(420, 3);
+            this.lDestination.Name = "lDestination";
+            this.lDestination.Size = new System.Drawing.Size(138, 24);
+            this.lDestination.TabIndex = 1;
+            this.lDestination.Text = "Target device";
+            // 
+            // cbCommandDestination
+            // 
+            this.cbCommandDestination.FormattingEnabled = true;
+            this.cbCommandDestination.Items.AddRange(new object[] {
             "0: TV",
             "F: Broadcast"});
-      this.cbCommandDestination.Location = new System.Drawing.Point(437, 30);
-      this.cbCommandDestination.Name = "cbCommandDestination";
-      this.cbCommandDestination.Size = new System.Drawing.Size(121, 21);
-      this.cbCommandDestination.TabIndex = 0;
-      this.cbCommandDestination.Text = "0: TV";
-      this.cbCommandDestination.SelectedIndexChanged += new System.EventHandler(this.CbCommandDestinationSelectedIndexChanged);
-      // 
-      // Configuration
-      // 
-      this.Configuration.Controls.Add(this.cbStartMinimised);
-      this.Configuration.Controls.Add(this.cbOverrideAddress);
-      this.Configuration.Controls.Add(this.bReloadConfig);
-      this.Configuration.Controls.Add(this.cbVendorOverride);
-      this.Configuration.Controls.Add(this.cbVendorId);
-      this.Configuration.Controls.Add(this.lPowerOff);
-      this.Configuration.Controls.Add(this.cbPowerOffDevices);
-      this.Configuration.Controls.Add(this.lWakeDevices);
-      this.Configuration.Controls.Add(this.cbWakeDevices);
-      this.Configuration.Controls.Add(this.cbActivateSource);
-      this.Configuration.Controls.Add(this.lPlayerConfig);
-      this.Configuration.Controls.Add(this.lAdapterConfig);
-      this.Configuration.Controls.Add(this.cbDeviceType);
-      this.Configuration.Controls.Add(this.bClose);
-      this.Configuration.Controls.Add(this.bSaveConfig);
-      this.Configuration.Controls.Add(this.cbPortNumber);
-      this.Configuration.Controls.Add(this.tbPhysicalAddress);
-      this.Configuration.Controls.Add(this.cbConnectedDevice);
-      this.Configuration.Controls.Add(this.lDeviceType);
-      this.Configuration.Controls.Add(this.lConnectedDevice);
-      this.Configuration.Controls.Add(this.lPortNumber);
-      this.Configuration.Location = new System.Drawing.Point(4, 22);
-      this.Configuration.Name = "Configuration";
-      this.Configuration.Padding = new System.Windows.Forms.Padding(3);
-      this.Configuration.Size = new System.Drawing.Size(592, 344);
-      this.Configuration.TabIndex = 0;
-      this.Configuration.Text = "Configuration";
-      this.Configuration.UseVisualStyleBackColor = true;
-      // 
-      // cbOverrideAddress
-      // 
-      this.cbOverrideAddress.AutoSize = true;
-      this.cbOverrideAddress.Enabled = false;
-      this.cbOverrideAddress.Location = new System.Drawing.Point(10, 97);
-      this.cbOverrideAddress.Name = "cbOverrideAddress";
-      this.cbOverrideAddress.Size = new System.Drawing.Size(151, 17);
-      this.cbOverrideAddress.TabIndex = 31;
-      this.cbOverrideAddress.Text = "override_physical_address";
-      this.cbOverrideAddress.UseVisualStyleBackColor = true;
-      // 
-      // bReloadConfig
-      // 
-      this.bReloadConfig.Enabled = false;
-      this.bReloadConfig.Location = new System.Drawing.Point(357, 315);
-      this.bReloadConfig.Name = "bReloadConfig";
-      this.bReloadConfig.Size = new System.Drawing.Size(125, 23);
-      this.bReloadConfig.TabIndex = 30;
-      this.bReloadConfig.Text = "Reset configuration";
-      this.bReloadConfig.UseVisualStyleBackColor = true;
-      this.bReloadConfig.Click += new System.EventHandler(this.BReloadConfigClick);
-      // 
-      // cbVendorOverride
-      // 
-      this.cbVendorOverride.AutoSize = true;
-      this.cbVendorOverride.Enabled = false;
-      this.cbVendorOverride.Location = new System.Drawing.Point(10, 156);
-      this.cbVendorOverride.Name = "cbVendorOverride";
-      this.cbVendorOverride.Size = new System.Drawing.Size(118, 17);
-      this.cbVendorOverride.TabIndex = 29;
-      this.cbVendorOverride.Text = "override_tv_vendor";
-      this.cbVendorOverride.UseVisualStyleBackColor = true;
-      // 
-      // lPowerOff
-      // 
-      this.lPowerOff.AutoSize = true;
-      this.lPowerOff.Location = new System.Drawing.Point(448, 35);
-      this.lPowerOff.Name = "lPowerOff";
-      this.lPowerOff.Size = new System.Drawing.Size(87, 13);
-      this.lPowerOff.TabIndex = 26;
-      this.lPowerOff.Text = "standby_devices";
-      // 
-      // cbPowerOffDevices
-      // 
-      this.cbPowerOffDevices.Enabled = false;
-      this.cbPowerOffDevices.FormattingEnabled = true;
-      this.cbPowerOffDevices.Items.AddRange(new object[] {
+            this.cbCommandDestination.Location = new System.Drawing.Point(437, 30);
+            this.cbCommandDestination.Name = "cbCommandDestination";
+            this.cbCommandDestination.Size = new System.Drawing.Size(121, 21);
+            this.cbCommandDestination.TabIndex = 0;
+            this.cbCommandDestination.Text = "0: TV";
+            this.cbCommandDestination.SelectedIndexChanged += new System.EventHandler(this.CbCommandDestinationSelectedIndexChanged);
+            // 
+            // Configuration
+            // 
+            this.Configuration.Controls.Add(this.cbStartMinimised);
+            this.Configuration.Controls.Add(this.cbOverrideAddress);
+            this.Configuration.Controls.Add(this.bReloadConfig);
+            this.Configuration.Controls.Add(this.cbVendorOverride);
+            this.Configuration.Controls.Add(this.cbVendorId);
+            this.Configuration.Controls.Add(this.lPowerOff);
+            this.Configuration.Controls.Add(this.cbPowerOffDevices);
+            this.Configuration.Controls.Add(this.lWakeDevices);
+            this.Configuration.Controls.Add(this.cbWakeDevices);
+            this.Configuration.Controls.Add(this.cbActivateSource);
+            this.Configuration.Controls.Add(this.lPlayerConfig);
+            this.Configuration.Controls.Add(this.lAdapterConfig);
+            this.Configuration.Controls.Add(this.cbDeviceType);
+            this.Configuration.Controls.Add(this.bClose);
+            this.Configuration.Controls.Add(this.bSaveConfig);
+            this.Configuration.Controls.Add(this.cbPortNumber);
+            this.Configuration.Controls.Add(this.tbPhysicalAddress);
+            this.Configuration.Controls.Add(this.cbConnectedDevice);
+            this.Configuration.Controls.Add(this.lDeviceType);
+            this.Configuration.Controls.Add(this.lConnectedDevice);
+            this.Configuration.Controls.Add(this.lPortNumber);
+            this.Configuration.Location = new System.Drawing.Point(4, 22);
+            this.Configuration.Name = "Configuration";
+            this.Configuration.Padding = new System.Windows.Forms.Padding(3);
+            this.Configuration.Size = new System.Drawing.Size(592, 344);
+            this.Configuration.TabIndex = 0;
+            this.Configuration.Text = "Configuration";
+            this.Configuration.UseVisualStyleBackColor = true;
+            // 
+            // cbStartMinimised
+            // 
+            this.cbStartMinimised.AutoSize = true;
+            this.cbStartMinimised.Enabled = false;
+            this.cbStartMinimised.Location = new System.Drawing.Point(9, 232);
+            this.cbStartMinimised.Name = "cbStartMinimised";
+            this.cbStartMinimised.Size = new System.Drawing.Size(118, 17);
+            this.cbStartMinimised.TabIndex = 32;
+            this.cbStartMinimised.Text = "global_start_hidden";
+            this.cbStartMinimised.UseVisualStyleBackColor = true;
+            // 
+            // cbOverrideAddress
+            // 
+            this.cbOverrideAddress.AutoSize = true;
+            this.cbOverrideAddress.Enabled = false;
+            this.cbOverrideAddress.Location = new System.Drawing.Point(10, 97);
+            this.cbOverrideAddress.Name = "cbOverrideAddress";
+            this.cbOverrideAddress.Size = new System.Drawing.Size(151, 17);
+            this.cbOverrideAddress.TabIndex = 31;
+            this.cbOverrideAddress.Text = "override_physical_address";
+            this.cbOverrideAddress.UseVisualStyleBackColor = true;
+            // 
+            // bReloadConfig
+            // 
+            this.bReloadConfig.Enabled = false;
+            this.bReloadConfig.Location = new System.Drawing.Point(357, 315);
+            this.bReloadConfig.Name = "bReloadConfig";
+            this.bReloadConfig.Size = new System.Drawing.Size(125, 23);
+            this.bReloadConfig.TabIndex = 30;
+            this.bReloadConfig.Text = "Reset configuration";
+            this.bReloadConfig.UseVisualStyleBackColor = true;
+            this.bReloadConfig.Click += new System.EventHandler(this.BReloadConfigClick);
+            // 
+            // cbVendorOverride
+            // 
+            this.cbVendorOverride.AutoSize = true;
+            this.cbVendorOverride.Enabled = false;
+            this.cbVendorOverride.Location = new System.Drawing.Point(10, 156);
+            this.cbVendorOverride.Name = "cbVendorOverride";
+            this.cbVendorOverride.Size = new System.Drawing.Size(118, 17);
+            this.cbVendorOverride.TabIndex = 29;
+            this.cbVendorOverride.Text = "override_tv_vendor";
+            this.cbVendorOverride.UseVisualStyleBackColor = true;
+            // 
+            // lPowerOff
+            // 
+            this.lPowerOff.AutoSize = true;
+            this.lPowerOff.Location = new System.Drawing.Point(448, 35);
+            this.lPowerOff.Name = "lPowerOff";
+            this.lPowerOff.Size = new System.Drawing.Size(87, 13);
+            this.lPowerOff.TabIndex = 26;
+            this.lPowerOff.Text = "standby_devices";
+            // 
+            // cbPowerOffDevices
+            // 
+            this.cbPowerOffDevices.Enabled = false;
+            this.cbPowerOffDevices.FormattingEnabled = true;
+            this.cbPowerOffDevices.Items.AddRange(new object[] {
             "global_standby_devices"});
-      this.cbPowerOffDevices.Location = new System.Drawing.Point(450, 52);
-      this.cbPowerOffDevices.Name = "cbPowerOffDevices";
-      this.cbPowerOffDevices.Size = new System.Drawing.Size(118, 94);
-      this.cbPowerOffDevices.TabIndex = 25;
-      // 
-      // lWakeDevices
-      // 
-      this.lWakeDevices.AutoSize = true;
-      this.lWakeDevices.Location = new System.Drawing.Point(328, 35);
-      this.lWakeDevices.Name = "lWakeDevices";
-      this.lWakeDevices.Size = new System.Drawing.Size(76, 13);
-      this.lWakeDevices.TabIndex = 24;
-      this.lWakeDevices.Text = "wake_devices";
-      // 
-      // cbWakeDevices
-      // 
-      this.cbWakeDevices.Enabled = false;
-      this.cbWakeDevices.FormattingEnabled = true;
-      this.cbWakeDevices.Items.AddRange(new object[] {
+            this.cbPowerOffDevices.Location = new System.Drawing.Point(450, 52);
+            this.cbPowerOffDevices.Name = "cbPowerOffDevices";
+            this.cbPowerOffDevices.Size = new System.Drawing.Size(118, 94);
+            this.cbPowerOffDevices.TabIndex = 25;
+            // 
+            // lWakeDevices
+            // 
+            this.lWakeDevices.AutoSize = true;
+            this.lWakeDevices.Location = new System.Drawing.Point(328, 35);
+            this.lWakeDevices.Name = "lWakeDevices";
+            this.lWakeDevices.Size = new System.Drawing.Size(76, 13);
+            this.lWakeDevices.TabIndex = 24;
+            this.lWakeDevices.Text = "wake_devices";
+            // 
+            // cbWakeDevices
+            // 
+            this.cbWakeDevices.Enabled = false;
+            this.cbWakeDevices.FormattingEnabled = true;
+            this.cbWakeDevices.Items.AddRange(new object[] {
             "global_wake_devices"});
-      this.cbWakeDevices.Location = new System.Drawing.Point(320, 52);
-      this.cbWakeDevices.Name = "cbWakeDevices";
-      this.cbWakeDevices.Size = new System.Drawing.Size(118, 94);
-      this.cbWakeDevices.TabIndex = 23;
-      // 
-      // cbActivateSource
-      // 
-      this.cbActivateSource.AutoSize = true;
-      this.cbActivateSource.Enabled = false;
-      this.cbActivateSource.Location = new System.Drawing.Point(9, 209);
-      this.cbActivateSource.Name = "cbActivateSource";
-      this.cbActivateSource.Size = new System.Drawing.Size(136, 17);
-      this.cbActivateSource.TabIndex = 19;
-      this.cbActivateSource.Text = "global_activate_source";
-      this.cbActivateSource.UseVisualStyleBackColor = true;
-      // 
-      // lPlayerConfig
-      // 
-      this.lPlayerConfig.AutoSize = true;
-      this.lPlayerConfig.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-      this.lPlayerConfig.Location = new System.Drawing.Point(6, 182);
-      this.lPlayerConfig.Name = "lPlayerConfig";
-      this.lPlayerConfig.Size = new System.Drawing.Size(198, 24);
-      this.lPlayerConfig.TabIndex = 16;
-      this.lPlayerConfig.Text = "Player Configuration";
-      // 
-      // lAdapterConfig
-      // 
-      this.lAdapterConfig.AutoSize = true;
-      this.lAdapterConfig.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-      this.lAdapterConfig.Location = new System.Drawing.Point(6, 3);
-      this.lAdapterConfig.Name = "lAdapterConfig";
-      this.lAdapterConfig.Size = new System.Drawing.Size(213, 24);
-      this.lAdapterConfig.TabIndex = 15;
-      this.lAdapterConfig.Text = "Adapter Configuration";
-      // 
-      // bClose
-      // 
-      this.bClose.Enabled = false;
-      this.bClose.Location = new System.Drawing.Point(95, 315);
-      this.bClose.Name = "bClose";
-      this.bClose.Size = new System.Drawing.Size(125, 23);
-      this.bClose.TabIndex = 13;
-      this.bClose.Text = "Close";
-      this.bClose.UseVisualStyleBackColor = true;
-      this.bClose.Click += new System.EventHandler(this.BCancelClick);
-      // 
-      // bSaveConfig
-      // 
-      this.bSaveConfig.Enabled = false;
-      this.bSaveConfig.Location = new System.Drawing.Point(226, 315);
-      this.bSaveConfig.Name = "bSaveConfig";
-      this.bSaveConfig.Size = new System.Drawing.Size(125, 23);
-      this.bSaveConfig.TabIndex = 12;
-      this.bSaveConfig.Text = "Persist configuration";
-      this.bSaveConfig.UseVisualStyleBackColor = true;
-      this.bSaveConfig.Click += new System.EventHandler(this.BSaveClick);
-      // 
-      // lDeviceType
-      // 
-      this.lDeviceType.AutoSize = true;
-      this.lDeviceType.Location = new System.Drawing.Point(6, 126);
-      this.lDeviceType.Name = "lDeviceType";
-      this.lDeviceType.Size = new System.Drawing.Size(65, 13);
-      this.lDeviceType.TabIndex = 3;
-      this.lDeviceType.Text = "device_type";
-      // 
-      // lConnectedDevice
-      // 
-      this.lConnectedDevice.AutoSize = true;
-      this.lConnectedDevice.Location = new System.Drawing.Point(6, 70);
-      this.lConnectedDevice.Name = "lConnectedDevice";
-      this.lConnectedDevice.Size = new System.Drawing.Size(139, 13);
-      this.lConnectedDevice.TabIndex = 1;
-      this.lConnectedDevice.Text = "connected_to_hdmi_device";
-      // 
-      // lPortNumber
-      // 
-      this.lPortNumber.AutoSize = true;
-      this.lPortNumber.Location = new System.Drawing.Point(6, 43);
-      this.lPortNumber.Name = "lPortNumber";
-      this.lPortNumber.Size = new System.Drawing.Size(53, 13);
-      this.lPortNumber.TabIndex = 0;
-      this.lPortNumber.Text = "hdmi_port";
-      // 
-      // tabPanel
-      // 
-      this.tabPanel.Controls.Add(this.Configuration);
-      this.tabPanel.Controls.Add(this.tbTestCommands);
-      this.tabPanel.Controls.Add(this.LogOutput);
-      this.tabPanel.Location = new System.Drawing.Point(12, 27);
-      this.tabPanel.Name = "tabPanel";
-      this.tabPanel.SelectedIndex = 0;
-      this.tabPanel.Size = new System.Drawing.Size(600, 370);
-      this.tabPanel.TabIndex = 0;
-      this.tabPanel.SelectedIndexChanged += new System.EventHandler(this.TabControl1SelectedIndexChanged);
-      // 
-      // menuStrip1
-      // 
-      this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.cbWakeDevices.Location = new System.Drawing.Point(320, 52);
+            this.cbWakeDevices.Name = "cbWakeDevices";
+            this.cbWakeDevices.Size = new System.Drawing.Size(118, 94);
+            this.cbWakeDevices.TabIndex = 23;
+            // 
+            // cbActivateSource
+            // 
+            this.cbActivateSource.AutoSize = true;
+            this.cbActivateSource.Enabled = false;
+            this.cbActivateSource.Location = new System.Drawing.Point(9, 209);
+            this.cbActivateSource.Name = "cbActivateSource";
+            this.cbActivateSource.Size = new System.Drawing.Size(136, 17);
+            this.cbActivateSource.TabIndex = 19;
+            this.cbActivateSource.Text = "global_activate_source";
+            this.cbActivateSource.UseVisualStyleBackColor = true;
+            // 
+            // lPlayerConfig
+            // 
+            this.lPlayerConfig.AutoSize = true;
+            this.lPlayerConfig.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.lPlayerConfig.Location = new System.Drawing.Point(6, 182);
+            this.lPlayerConfig.Name = "lPlayerConfig";
+            this.lPlayerConfig.Size = new System.Drawing.Size(198, 24);
+            this.lPlayerConfig.TabIndex = 16;
+            this.lPlayerConfig.Text = "Player Configuration";
+            // 
+            // lAdapterConfig
+            // 
+            this.lAdapterConfig.AutoSize = true;
+            this.lAdapterConfig.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.lAdapterConfig.Location = new System.Drawing.Point(6, 3);
+            this.lAdapterConfig.Name = "lAdapterConfig";
+            this.lAdapterConfig.Size = new System.Drawing.Size(213, 24);
+            this.lAdapterConfig.TabIndex = 15;
+            this.lAdapterConfig.Text = "Adapter Configuration";
+            // 
+            // bClose
+            // 
+            this.bClose.Enabled = false;
+            this.bClose.Location = new System.Drawing.Point(95, 315);
+            this.bClose.Name = "bClose";
+            this.bClose.Size = new System.Drawing.Size(125, 23);
+            this.bClose.TabIndex = 13;
+            this.bClose.Text = "Close";
+            this.bClose.UseVisualStyleBackColor = true;
+            this.bClose.Click += new System.EventHandler(this.BCancelClick);
+            // 
+            // bSaveConfig
+            // 
+            this.bSaveConfig.Enabled = false;
+            this.bSaveConfig.Location = new System.Drawing.Point(226, 315);
+            this.bSaveConfig.Name = "bSaveConfig";
+            this.bSaveConfig.Size = new System.Drawing.Size(125, 23);
+            this.bSaveConfig.TabIndex = 12;
+            this.bSaveConfig.Text = "Persist configuration";
+            this.bSaveConfig.UseVisualStyleBackColor = true;
+            this.bSaveConfig.Click += new System.EventHandler(this.BSaveClick);
+            // 
+            // lDeviceType
+            // 
+            this.lDeviceType.AutoSize = true;
+            this.lDeviceType.Location = new System.Drawing.Point(6, 126);
+            this.lDeviceType.Name = "lDeviceType";
+            this.lDeviceType.Size = new System.Drawing.Size(65, 13);
+            this.lDeviceType.TabIndex = 3;
+            this.lDeviceType.Text = "device_type";
+            // 
+            // lConnectedDevice
+            // 
+            this.lConnectedDevice.AutoSize = true;
+            this.lConnectedDevice.Location = new System.Drawing.Point(6, 70);
+            this.lConnectedDevice.Name = "lConnectedDevice";
+            this.lConnectedDevice.Size = new System.Drawing.Size(139, 13);
+            this.lConnectedDevice.TabIndex = 1;
+            this.lConnectedDevice.Text = "connected_to_hdmi_device";
+            // 
+            // lPortNumber
+            // 
+            this.lPortNumber.AutoSize = true;
+            this.lPortNumber.Location = new System.Drawing.Point(6, 43);
+            this.lPortNumber.Name = "lPortNumber";
+            this.lPortNumber.Size = new System.Drawing.Size(53, 13);
+            this.lPortNumber.TabIndex = 0;
+            this.lPortNumber.Text = "hdmi_port";
+            // 
+            // tabPanel
+            // 
+            this.tabPanel.Controls.Add(this.Configuration);
+            this.tabPanel.Controls.Add(this.tbTestCommands);
+            this.tabPanel.Controls.Add(this.LogOutput);
+            this.tabPanel.Location = new System.Drawing.Point(12, 27);
+            this.tabPanel.Name = "tabPanel";
+            this.tabPanel.SelectedIndex = 0;
+            this.tabPanel.Size = new System.Drawing.Size(600, 370);
+            this.tabPanel.TabIndex = 0;
+            this.tabPanel.SelectedIndexChanged += new System.EventHandler(this.TabControl1SelectedIndexChanged);
+            // 
+            // menuStrip1
+            // 
+            this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.fileToolStripMenuItem,
             this.applicationsToolStripMenuItem,
             this.helpToolStripMenuItem});
-      this.menuStrip1.Location = new System.Drawing.Point(0, 0);
-      this.menuStrip1.Name = "menuStrip1";
-      this.menuStrip1.Size = new System.Drawing.Size(624, 24);
-      this.menuStrip1.TabIndex = 3;
-      this.menuStrip1.Text = "menuStrip1";
-      // 
-      // fileToolStripMenuItem
-      // 
-      this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.menuStrip1.Location = new System.Drawing.Point(0, 0);
+            this.menuStrip1.Name = "menuStrip1";
+            this.menuStrip1.Size = new System.Drawing.Size(624, 24);
+            this.menuStrip1.TabIndex = 3;
+            this.menuStrip1.Text = "menuStrip1";
+            // 
+            // fileToolStripMenuItem
+            // 
+            this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.hideToolStripMenuItem,
             this.advancedModeToolStripMenuItem,
             this.closeToolStripMenuItem});
-      this.fileToolStripMenuItem.Name = "fileToolStripMenuItem";
-      this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20);
-      this.fileToolStripMenuItem.Text = "File";
-      // 
-      // hideToolStripMenuItem
-      // 
-      this.hideToolStripMenuItem.Name = "hideToolStripMenuItem";
-      this.hideToolStripMenuItem.Size = new System.Drawing.Size(161, 22);
-      this.hideToolStripMenuItem.Text = "Hide";
-      this.hideToolStripMenuItem.Click += new System.EventHandler(this.HideToolStripMenuItemClick);
-      // 
-      // advancedModeToolStripMenuItem
-      // 
-      this.advancedModeToolStripMenuItem.Name = "advancedModeToolStripMenuItem";
-      this.advancedModeToolStripMenuItem.Size = new System.Drawing.Size(161, 22);
-      this.advancedModeToolStripMenuItem.Text = "Advanced mode";
-      this.advancedModeToolStripMenuItem.Click += new System.EventHandler(this.AdvancedModeToolStripMenuItemClick);
-      // 
-      // closeToolStripMenuItem
-      // 
-      this.closeToolStripMenuItem.Name = "closeToolStripMenuItem";
-      this.closeToolStripMenuItem.Size = new System.Drawing.Size(161, 22);
-      this.closeToolStripMenuItem.Text = "Close";
-      this.closeToolStripMenuItem.Click += new System.EventHandler(this.CloseToolStripMenuItemClick);
-      // 
-      // applicationsToolStripMenuItem
-      // 
-      this.applicationsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.fileToolStripMenuItem.Name = "fileToolStripMenuItem";
+            this.fileToolStripMenuItem.Size = new System.Drawing.Size(35, 20);
+            this.fileToolStripMenuItem.Text = "File";
+            // 
+            // hideToolStripMenuItem
+            // 
+            this.hideToolStripMenuItem.Name = "hideToolStripMenuItem";
+            this.hideToolStripMenuItem.Size = new System.Drawing.Size(151, 22);
+            this.hideToolStripMenuItem.Text = "Hide";
+            this.hideToolStripMenuItem.Click += new System.EventHandler(this.HideToolStripMenuItemClick);
+            // 
+            // advancedModeToolStripMenuItem
+            // 
+            this.advancedModeToolStripMenuItem.Name = "advancedModeToolStripMenuItem";
+            this.advancedModeToolStripMenuItem.Size = new System.Drawing.Size(151, 22);
+            this.advancedModeToolStripMenuItem.Text = "Advanced mode";
+            this.advancedModeToolStripMenuItem.Click += new System.EventHandler(this.AdvancedModeToolStripMenuItemClick);
+            // 
+            // closeToolStripMenuItem
+            // 
+            this.closeToolStripMenuItem.Name = "closeToolStripMenuItem";
+            this.closeToolStripMenuItem.Size = new System.Drawing.Size(151, 22);
+            this.closeToolStripMenuItem.Text = "Close";
+            this.closeToolStripMenuItem.Click += new System.EventHandler(this.CloseToolStripMenuItemClick);
+            // 
+            // applicationsToolStripMenuItem
+            // 
+            this.applicationsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.addNewApplicationToolStripMenuItem});
-      this.applicationsToolStripMenuItem.Enabled = false;
-      this.applicationsToolStripMenuItem.Name = "applicationsToolStripMenuItem";
-      this.applicationsToolStripMenuItem.Size = new System.Drawing.Size(85, 20);
-      this.applicationsToolStripMenuItem.Text = "Applications";
-      // 
-      // addNewApplicationToolStripMenuItem
-      // 
-      this.addNewApplicationToolStripMenuItem.Enabled = false;
-      this.addNewApplicationToolStripMenuItem.Name = "addNewApplicationToolStripMenuItem";
-      this.addNewApplicationToolStripMenuItem.Size = new System.Drawing.Size(183, 22);
-      this.addNewApplicationToolStripMenuItem.Text = "Add new application";
-      this.addNewApplicationToolStripMenuItem.Click += new System.EventHandler(this.AddNewApplicationToolStripMenuItemClick);
-      // 
-      // helpToolStripMenuItem
-      // 
-      this.helpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.applicationsToolStripMenuItem.Enabled = false;
+            this.applicationsToolStripMenuItem.Name = "applicationsToolStripMenuItem";
+            this.applicationsToolStripMenuItem.Size = new System.Drawing.Size(76, 20);
+            this.applicationsToolStripMenuItem.Text = "Applications";
+            // 
+            // addNewApplicationToolStripMenuItem
+            // 
+            this.addNewApplicationToolStripMenuItem.Enabled = false;
+            this.addNewApplicationToolStripMenuItem.Name = "addNewApplicationToolStripMenuItem";
+            this.addNewApplicationToolStripMenuItem.Size = new System.Drawing.Size(170, 22);
+            this.addNewApplicationToolStripMenuItem.Text = "Add new application";
+            this.addNewApplicationToolStripMenuItem.Click += new System.EventHandler(this.AddNewApplicationToolStripMenuItemClick);
+            // 
+            // helpToolStripMenuItem
+            // 
+            this.helpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.aboutToolStripMenuItem});
-      this.helpToolStripMenuItem.Name = "helpToolStripMenuItem";
-      this.helpToolStripMenuItem.Size = new System.Drawing.Size(44, 20);
-      this.helpToolStripMenuItem.Text = "Help";
-      // 
-      // aboutToolStripMenuItem
-      // 
-      this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem";
-      this.aboutToolStripMenuItem.Size = new System.Drawing.Size(107, 22);
-      this.aboutToolStripMenuItem.Text = "About";
-      this.aboutToolStripMenuItem.Click += new System.EventHandler(this.AboutToolStripMenuItemClick);
-      // 
-      // cbStartMinimised
-      // 
-      this.cbStartMinimised.AutoSize = true;
-      this.cbStartMinimised.Enabled = false;
-      this.cbStartMinimised.Location = new System.Drawing.Point(9, 232);
-      this.cbStartMinimised.Name = "cbStartMinimised";
-      this.cbStartMinimised.Size = new System.Drawing.Size(118, 17);
-      this.cbStartMinimised.TabIndex = 32;
-      this.cbStartMinimised.Text = "global_start_hidden";
-      this.cbStartMinimised.UseVisualStyleBackColor = true;
-      // 
-      // CECTray
-      // 
-      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-      this.ClientSize = new System.Drawing.Size(624, 442);
-      this.Controls.Add(this.menuStrip1);
-      this.Controls.Add(this.lStatus);
-      this.Controls.Add(this.pProgress);
-      this.Controls.Add(this.tabPanel);
-      this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
-      this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-      this.MainMenuStrip = this.menuStrip1;
-      this.MaximizeBox = false;
-      this.Name = "CECTray";
-      this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-      this.Load += new System.EventHandler(this.CECTrayLoad);
-      this.Resize += new System.EventHandler(this.CECTrayResize);
-      this.trayIconMenu.ResumeLayout(false);
-      this.LogOutput.ResumeLayout(false);
-      this.LogOutput.PerformLayout();
-      this.tbTestCommands.ResumeLayout(false);
-      this.tbTestCommands.PerformLayout();
-      this.Configuration.ResumeLayout(false);
-      this.Configuration.PerformLayout();
-      this.tabPanel.ResumeLayout(false);
-      this.menuStrip1.ResumeLayout(false);
-      this.menuStrip1.PerformLayout();
-      this.ResumeLayout(false);
-      this.PerformLayout();
+            this.helpToolStripMenuItem.Name = "helpToolStripMenuItem";
+            this.helpToolStripMenuItem.Size = new System.Drawing.Size(40, 20);
+            this.helpToolStripMenuItem.Text = "Help";
+            // 
+            // aboutToolStripMenuItem
+            // 
+            this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem";
+            this.aboutToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
+            this.aboutToolStripMenuItem.Text = "About";
+            this.aboutToolStripMenuItem.Click += new System.EventHandler(this.AboutToolStripMenuItemClick);
+            // 
+            // CECTray
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(624, 442);
+            this.Controls.Add(this.menuStrip1);
+            this.Controls.Add(this.lStatus);
+            this.Controls.Add(this.pProgress);
+            this.Controls.Add(this.tabPanel);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
+            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.MainMenuStrip = this.menuStrip1;
+            this.MaximizeBox = false;
+            this.Name = "CECTray";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+            this.Resize += new System.EventHandler(this.CECTrayResize);
+            this.trayIconMenu.ResumeLayout(false);
+            this.LogOutput.ResumeLayout(false);
+            this.LogOutput.PerformLayout();
+            this.tbTestCommands.ResumeLayout(false);
+            this.tbTestCommands.PerformLayout();
+            this.Configuration.ResumeLayout(false);
+            this.Configuration.PerformLayout();
+            this.tabPanel.ResumeLayout(false);
+            this.menuStrip1.ResumeLayout(false);
+            this.menuStrip1.PerformLayout();
+            this.ResumeLayout(false);
+            this.PerformLayout();
 
     }
 
diff -Nru libcec-2.1.1/src/LibCecTray/ui/CECTray.cs libcec-2.1.4/src/LibCecTray/ui/CECTray.cs
--- libcec-2.1.1/src/LibCecTray/ui/CECTray.cs	2013-03-09 20:14:55.000000000 +0000
+++ libcec-2.1.4/src/LibCecTray/ui/CECTray.cs	2013-12-13 18:06:00.000000000 +0000
@@ -38,23 +38,14 @@
 using LibCECTray.controller;
 using LibCECTray.controller.applications;
 using LibCECTray.settings;
+using Microsoft.Win32;
+using System.Security.Permissions;
+using System.Runtime.InteropServices;
+using System.Threading;
 
 namespace LibCECTray.ui
 {
   /// <summary>
-  /// The tab pages in this application
-  /// </summary>
-  internal enum ConfigTab
-  {
-    Configuration,
-    KeyConfiguration,
-    Tester,
-    Log,
-    WMC,
-    XBMC
-  }
-
-  /// <summary>
   /// Main LibCecTray GUI
   /// </summary>
   partial class CECTray : AsyncForm
@@ -63,6 +54,13 @@
     {
       Text = Resources.app_name;
       InitializeComponent();
+
+      _sstimer.Interval = 5000;
+      _sstimer.Tick += ScreensaverActiveCheck;
+      _sstimer.Enabled = false;
+
+      _lastScreensaverActivated = DateTime.Now;
+
       VisibleChanged += delegate
                        {
                          if (!Visible)
@@ -70,6 +68,133 @@
                          else
                            OnShow();
                        };
+
+      SystemEvents.SessionEnding += new SessionEndingEventHandler(OnSessionEnding);
+    }
+
+    public void OnSessionEnding(object sender, SessionEndingEventArgs e)
+    {
+      Controller.CECActions.SuppressUpdates = true;
+      Controller.Close();
+    }
+
+    #region Power state change window messages
+    private const int WM_POWERBROADCAST      = 0x0218;
+    private const int WM_SYSCOMMAND          = 0x0112;
+
+    private const int PBT_APMSUSPEND         = 0x0004;
+    private const int PBT_APMRESUMESUSPEND   = 0x0007;
+    private const int PBT_APMRESUMECRITICAL  = 0x0006;
+    private const int PBT_APMRESUMEAUTOMATIC = 0x0012;
+    private const int PBT_POWERSETTINGCHANGE = 0x8013;
+
+    private static Guid GUID_SYSTEM_AWAYMODE = new Guid("98a7f580-01f7-48aa-9c0f-44352c29e5c0");
+
+    private const int SC_SCREENSAVE             = 0xF140;
+    private const int SPI_GETSCREENSAVERRUNNING = 0x0072;
+
+    [DllImport("user32.dll", SetLastError = true)]
+    static extern bool SystemParametersInfo(int action, int param, ref int retval, int updini);
+
+    [StructLayout(LayoutKind.Sequential, Pack = 4)]
+    internal struct POWERBROADCAST_SETTING
+    {
+      public Guid PowerSetting;
+      public uint DataLength;
+      public byte Data;
+    }
+    #endregion
+
+    /// <summary>
+    /// Check for power state changes, and pass up when it's something we don't care about
+    /// </summary>
+    /// <param name="msg">The incoming window message</param>
+    protected override void WndProc(ref Message msg)
+    {
+      if (msg.Msg == WM_SYSCOMMAND && (msg.WParam.ToInt32() & 0xfff0) == SC_SCREENSAVE)
+      {
+        // there's no event for screensaver exit
+        if (!_sstimer.Enabled)
+        {
+          // guard against screensaver failing, and resulting in power up and down spam to the tv
+          TimeSpan diff = DateTime.Now - _lastScreensaverActivated;
+          if (diff.TotalSeconds > 60)
+          {
+            _sstimer.Enabled = true;
+            _lastScreensaverActivated = DateTime.Now;
+            Controller.CECActions.SendStandby(CecLogicalAddress.Broadcast);
+          }
+        }
+      }
+      else if (msg.Msg == WM_POWERBROADCAST)
+      {
+        switch (msg.WParam.ToInt32())
+        {
+          case PBT_APMSUSPEND:
+            OnSleep();
+            return;
+
+          case PBT_APMRESUMESUSPEND:
+          case PBT_APMRESUMECRITICAL:
+          case PBT_APMRESUMEAUTOMATIC:
+            OnWake();
+            return;
+
+          case PBT_POWERSETTINGCHANGE:
+            {
+              POWERBROADCAST_SETTING pwr = (POWERBROADCAST_SETTING)Marshal.PtrToStructure(msg.LParam, typeof(POWERBROADCAST_SETTING));
+              if (pwr.PowerSetting == GUID_SYSTEM_AWAYMODE && pwr.DataLength == Marshal.SizeOf(typeof(Int32)))
+              {
+                switch (pwr.Data)
+                {
+                  case 0:
+                    // do _not_ wake the pc when away mode is deactivated
+                    //OnWake();
+                    //return;
+                  case 1:
+                    Controller.CECActions.SendStandby(CecLogicalAddress.Broadcast);
+                    return;
+                  default:
+                    break;
+                }
+              }
+            }
+            break;
+          default:
+            break;
+        }
+      }
+
+      // pass up when not handled
+      base.WndProc(ref msg);
+    }
+
+    private void ScreensaverActiveCheck(object sender, EventArgs e)
+    {
+      if (!IsScreensaverActive())
+      {
+        _sstimer.Enabled = false;
+        Controller.CECActions.ActivateSource();
+      }
+    }
+
+    private bool IsScreensaverActive()
+    {
+      int active = 1;
+      SystemParametersInfo(SPI_GETSCREENSAVERRUNNING, 0, ref active, 0);
+      return active == 1;
+    }
+
+    private void OnWake()
+    {
+      Controller.Initialise();
+    }
+
+    private void OnSleep()
+    {
+      Controller.CECActions.SuppressUpdates = true;
+      AsyncDisconnect dc = new AsyncDisconnect(Controller);
+      (new Thread(dc.Process)).Start();
     }
 
     public override sealed string Text
@@ -78,7 +203,7 @@
       set { base.Text = value; }
     }
 
-    private void CECTrayLoad(object sender, EventArgs e)
+    public void Initialise()
     {
       Controller.Initialise();
     }
@@ -88,7 +213,7 @@
       Hide();
       if (disposing)
       {
-        Controller.Close();
+        OnSleep();
       }
       if (disposing && (components != null))
       {
@@ -184,7 +309,7 @@
 
     private void BActivateSourceClick(object sender, EventArgs e)
     {
-      Controller.CECActions.ActivateSource(GetTargetDevice());
+      Controller.CECActions.SetStreamPath(GetTargetDevice());
     }
 
     private void CbCommandDestinationSelectedIndexChanged(object sender, EventArgs e)
@@ -484,7 +609,10 @@
     private CECController _controller;
     public CECController Controller
     {
-      get { return _controller ?? (_controller = new CECController(this)); }
+      get
+      {
+        return _controller ?? (_controller = new CECController(this));
+      }
     }
     public Control.ControlCollection TabControls
     {
@@ -494,6 +622,9 @@
     {
       get { return GetSelectedTabName(tabPanel, tabPanel.TabPages); }
     }
+
+    private System.Windows.Forms.Timer _sstimer = new System.Windows.Forms.Timer();
+    private DateTime _lastScreensaverActivated;
     #endregion
 
     private void AddNewApplicationToolStripMenuItemClick(object sender, EventArgs e)
@@ -502,4 +633,32 @@
       Controller.DisplayDialog(appConfig, false);
     }
   }
+
+  /// <summary>
+  /// The tab pages in this application
+  /// </summary>
+  internal enum ConfigTab
+  {
+    Configuration,
+    KeyConfiguration,
+    Tester,
+    Log,
+    WMC,
+    XBMC
+  }
+
+  class AsyncDisconnect
+  {
+    public AsyncDisconnect(CECController controller)
+    {
+      _controller = controller;
+    }
+
+    public void Process()
+    {
+      _controller.Close();
+    }
+
+    private CECController _controller;
+  }
 }
diff -Nru libcec-2.1.1/src/LibCecTray/ui/DeviceInformation.cs libcec-2.1.4/src/LibCecTray/ui/DeviceInformation.cs
--- libcec-2.1.1/src/LibCecTray/ui/DeviceInformation.cs	2013-03-09 20:14:55.000000000 +0000
+++ libcec-2.1.4/src/LibCecTray/ui/DeviceInformation.cs	2013-12-13 18:06:00.000000000 +0000
@@ -72,7 +72,7 @@
     {
       SetControlVisible(lInactiveSource, false);
       SetControlVisible(lActiveSource, true);
-      _controller.CECActions.ActivateSource(Address);
+      _controller.CECActions.SetStreamPath(Address);
     }
 
     private void LStandbyLinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
diff -Nru libcec-2.1.1/src/LibCecTray/ui/IAsyncControls.cs libcec-2.1.4/src/LibCecTray/ui/IAsyncControls.cs
--- libcec-2.1.1/src/LibCecTray/ui/IAsyncControls.cs	1970-01-01 00:00:00.000000000 +0000
+++ libcec-2.1.4/src/LibCecTray/ui/IAsyncControls.cs	2013-12-13 18:06:00.000000000 +0000
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows.Forms;
+using CecSharp;
+
+namespace LibCECTray.ui
+{
+    interface IAsyncControls
+    {
+        void SetControlEnabled(Control control, bool val);
+        void SetControlText(Control control, string val);
+        void SetToolStripMenuText(ToolStripMenuItem item, string val);
+        void SetCheckboxChecked(CheckBox control, bool val);
+        void SetCheckboxItemChecked(CheckedListBox control, int index, bool val);
+        void SetProgressValue(ProgressBar control, int val);
+        void SetComboBoxItems(ComboBox control, int selectedIndex, object[] val);
+        void SetControlVisible(Control control, bool val);
+        void DisplayDialog(Form control, bool modal);
+        void SafeHide(bool val);
+        void SetSelectedIndex(ComboBox control, int index);
+        string GetSelectedTabName(TabControl container, TabControl.TabPageCollection tabPages);
+        void SelectKeypressRow(Control container, DataGridView dgView, CecKeypress key);
+    }
+}
diff -Nru libcec-2.1.1/src/lib/CECClient.cpp libcec-2.1.4/src/lib/CECClient.cpp
--- libcec-2.1.1/src/lib/CECClient.cpp	2013-03-09 20:14:55.000000000 +0000
+++ libcec-2.1.4/src/lib/CECClient.cpp	2013-12-13 18:06:00.000000000 +0000
@@ -973,10 +973,10 @@
     {
       key.duration = (unsigned int) (GetTimeMs() - m_buttontime);
 
-      cec_user_control_code comboKey(m_configuration.comboKey);
-      uint32_t iTimeoutMs(m_configuration.iComboKeyTimeoutMs);
-
-      if (key.duration > iTimeoutMs || m_iCurrentButton != comboKey || bSendComboKey)
+      if (key.duration > m_configuration.iComboKeyTimeoutMs ||
+          m_configuration.iComboKeyTimeoutMs == 0 ||
+          m_iCurrentButton != m_configuration.comboKey ||
+          bSendComboKey)
       {
         key.keycode = m_iCurrentButton;
 
@@ -1009,7 +1009,7 @@
 
   {
     CLockObject lock(m_mutex);
-    if (m_iCurrentButton == comboKey && key.duration == 0)
+    if (m_configuration.iComboKeyTimeoutMs > 0 && m_iCurrentButton == comboKey && key.duration == 0)
     {
       // stop + ok -> exit
       if (key.keycode == CEC_USER_CONTROL_CODE_SELECT)
@@ -1070,7 +1070,7 @@
         m_configuration.iComboKeyTimeoutMs : CEC_DEFAULT_COMBO_TIMEOUT_MS);
 
     if (m_iCurrentButton != CEC_USER_CONTROL_CODE_UNKNOWN &&
-          ((m_iCurrentButton == comboKey && iNow - m_buttontime > iTimeoutMs) ||
+          ((m_iCurrentButton == comboKey && iTimeoutMs > 0 && iNow - m_buttontime > iTimeoutMs) ||
           (m_iCurrentButton != comboKey && iNow - m_buttontime > CEC_BUTTON_TIMEOUT)))
     {
       key.duration = (unsigned int) (iNow - m_buttontime);
diff -Nru libcec-2.1.1/src/lib/CECProcessor.cpp libcec-2.1.4/src/lib/CECProcessor.cpp
--- libcec-2.1.1/src/lib/CECProcessor.cpp	2013-03-09 20:14:55.000000000 +0000
+++ libcec-2.1.4/src/lib/CECProcessor.cpp	2013-12-13 18:06:00.000000000 +0000
@@ -57,6 +57,34 @@
 
 #define ToString(x) CCECTypeUtils::ToString(x)
 
+CCECStandbyProtection::CCECStandbyProtection(CCECProcessor* processor) :
+    m_processor(processor) {}
+CCECStandbyProtection::~CCECStandbyProtection(void) {}
+
+void* CCECStandbyProtection::Process(void)
+{
+  int64_t last = GetTimeMs();
+  int64_t next;
+  while (!IsStopped())
+  {
+    PLATFORM::CEvent::Sleep(1000);
+
+    next = GetTimeMs();
+
+    // reset the connection if the clock changed
+    if (next < last || next - last > 10000)
+    {
+      libcec_parameter param;
+      param.paramData = NULL; param.paramType = CEC_PARAMETER_TYPE_UNKOWN;
+      m_processor->GetLib()->Alert(CEC_ALERT_CONNECTION_LOST, param);
+      break;
+    }
+
+    last = next;
+  }
+  return NULL;
+}
+
 CCECProcessor::CCECProcessor(CLibCEC *libcec) :
     m_bInitialised(false),
     m_communication(NULL),
@@ -66,7 +94,8 @@
     m_iLastTransmission(0),
     m_bMonitor(true),
     m_addrAllocator(NULL),
-    m_bStallCommunication(false)
+    m_bStallCommunication(false),
+    m_connCheck(NULL)
 {
   m_busDevices = new CCECDeviceMap(this);
 }
@@ -105,11 +134,13 @@
   SetCECInitialised(false);
 
   // stop the processor
+  DELETE_AND_NULL(m_connCheck);
   StopThread(-1);
   m_inBuffer.Broadcast();
   StopThread();
 
   // close the connection
+  CLockObject lock(m_mutex);
   DELETE_AND_NULL(m_communication);
 }
 
@@ -215,6 +246,10 @@
 {
   m_libcec->AddLog(CEC_LOG_DEBUG, "processor thread started");
 
+  if (!m_connCheck)
+    m_connCheck = new CCECStandbyProtection(this);
+  m_connCheck->CreateThread();
+
   cec_command command; command.Clear();
   CTimeout activeSourceCheck(ACTIVE_SOURCE_CHECK_INTERVAL);
   CTimeout tvPresentCheck(TV_PRESENT_CHECK_INTERVAL);
@@ -245,12 +280,17 @@
       // check whether the TV is present and responding
       if (tvPresentCheck.TimeLeft() == 0)
       {
-        if (!m_busDevices->At(CECDEVICE_TV)->IsPresent())
+        CCECClient *primary = GetPrimaryClient();
+        // only check whether the tv responds to polls when a client is connected and not in monitoring mode
+        if (primary && primary->GetConfiguration()->bMonitorOnly != 1)
         {
-          libcec_parameter param;
-          param.paramType = CEC_PARAMETER_TYPE_STRING;
-          param.paramData = (void*)"TV does not respond to CEC polls";
-          GetPrimaryClient()->Alert(CEC_ALERT_TV_POLL_FAILED, param);
+          if (!m_busDevices->At(CECDEVICE_TV)->IsPresent())
+          {
+            libcec_parameter param;
+            param.paramType = CEC_PARAMETER_TYPE_STRING;
+            param.paramData = (void*)"TV does not respond to CEC polls";
+            primary->Alert(CEC_ALERT_TV_POLL_FAILED, param);
+          }
         }
         tvPresentCheck.Init(TV_PRESENT_CHECK_INTERVAL);
       }
@@ -400,6 +440,10 @@
   // reset the state of this message to 'unknown'
   cec_adapter_message_state adapterState = ADAPTER_MESSAGE_STATE_UNKNOWN;
 
+  CLockObject lock(m_mutex);
+  if (!m_communication)
+    return false;
+
   if (!m_communication->SupportsSourceLogicalAddress(transmitData.initiator))
   {
     if (transmitData.initiator == CECDEVICE_UNREGISTERED && m_communication->SupportsSourceLogicalAddress(CECDEVICE_FREEUSE))
@@ -438,15 +482,14 @@
   }
 
   // wait until we finished allocating a new LA if it got lost
+  lock.Unlock();
   while (m_bStallCommunication) Sleep(5);
+  lock.Lock();
 
-  {
-    CLockObject lock(m_mutex);
-    m_iLastTransmission = GetTimeMs();
-    // set the number of tries
-    iMaxTries = initiator->GetHandler()->GetTransmitRetries() + 1;
-    initiator->MarkHandlerReady();
-  }
+  m_iLastTransmission = GetTimeMs();
+  // set the number of tries
+  iMaxTries = initiator->GetHandler()->GetTransmitRetries() + 1;
+  initiator->MarkHandlerReady();
 
   // and try to send the command
   while (bRetry && ++iTries < iMaxTries)
@@ -480,13 +523,7 @@
 void CCECProcessor::ProcessCommand(const cec_command &command)
 {
   // log the command
-  CStdString dataStr;
-  dataStr.Format(">> %1x%1x", command.initiator, command.destination);
-  if (command.opcode_set == 1)
-    dataStr.AppendFormat(":%02x", command.opcode);
-  for (uint8_t iPtr = 0; iPtr < command.parameters.size; iPtr++)
-    dataStr.AppendFormat(":%02x", (unsigned int)command.parameters[iPtr]);
-  m_libcec->AddLog(CEC_LOG_TRAFFIC, dataStr.c_str());
+  m_libcec->AddLog(CEC_LOG_TRAFFIC, ToString(command).c_str());
 
   // find the initiator
   CCECBusDevice *device = m_busDevices->At(command.initiator);
@@ -712,7 +749,7 @@
     // replace a previous client
     CLockObject lock(m_mutex);
     m_clients.erase((*it)->GetLogicalAddress());
-    m_clients.insert(make_pair<cec_logical_address, CCECClient *>((*it)->GetLogicalAddress(), client));
+    m_clients.insert(make_pair((*it)->GetLogicalAddress(), client));
   }
 
   // set the new ackmask
@@ -860,7 +897,7 @@
   client->GetPrimaryDevice()->TransmitOSDName(CECDEVICE_TV, false);
 
   // request the power status of the TV
-  tv->RequestPowerStatus(sourceAddress, true);
+  tv->RequestPowerStatus(sourceAddress, true, true);
 
   return bReturn;
 }
diff -Nru libcec-2.1.1/src/lib/CECProcessor.h libcec-2.1.4/src/lib/CECProcessor.h
--- libcec-2.1.1/src/lib/CECProcessor.h	2013-03-09 20:14:55.000000000 +0000
+++ libcec-2.1.4/src/lib/CECProcessor.h	2013-12-13 18:06:00.000000000 +0000
@@ -52,6 +52,7 @@
   class CCECTV;
   class CCECClient;
   class CCECProcessor;
+  class CCECStandbyProtection;
 
   class CCECAllocateLogicalAddress : public PLATFORM::CThread
   {
@@ -177,5 +178,17 @@
       bool                                        m_bMonitor;
       CCECAllocateLogicalAddress*                 m_addrAllocator;
       bool                                        m_bStallCommunication;
+      CCECStandbyProtection*                      m_connCheck;
+  };
+
+  class CCECStandbyProtection : public PLATFORM::CThread
+  {
+  public:
+    CCECStandbyProtection(CCECProcessor* processor);
+    virtual ~CCECStandbyProtection(void);
+    void* Process(void);
+
+  private:
+    CCECProcessor* m_processor;
   };
 };
diff -Nru libcec-2.1.1/src/lib/CECTypeUtils.h libcec-2.1.4/src/lib/CECTypeUtils.h
--- libcec-2.1.1/src/lib/CECTypeUtils.h	2013-03-09 20:14:55.000000000 +0000
+++ libcec-2.1.4/src/lib/CECTypeUtils.h	2013-12-13 18:06:00.000000000 +0000
@@ -31,6 +31,8 @@
  *     http://www.pulse-eight.net/
  */
 
+#include "lib/platform/util/StdString.h"
+
 namespace CEC
 {
   class CCECTypeUtils
@@ -491,6 +493,7 @@
       case CEC_VENDOR_SONY:
         return "Sony";
       case CEC_VENDOR_TOSHIBA:
+      case CEC_VENDOR_TOSHIBA2:
         return "Toshiba";
       case CEC_VENDOR_AKAI:
         return "Akai";
@@ -514,6 +517,12 @@
         return "Loewe";
       case CEC_VENDOR_DENON:
         return "Denon";
+      case CEC_VENDOR_MARANTZ:
+        return "Marantz";
+      case CEC_VENDOR_HARMAN_KARDON:
+        return "Harman/Kardon";
+      case CEC_VENDOR_PULSE_EIGHT:
+        return "Pulse Eight";
       default:
         return "Unknown";
       }
@@ -573,6 +582,12 @@
         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";
+      case CEC_CLIENT_VERSION_2_1_4:
+        return "2.1.4";
       default:
         return "Unknown";
       }
@@ -632,6 +647,12 @@
         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";
+      case CEC_SERVER_VERSION_2_1_4:
+        return "2.1.4";
       default:
         return "Unknown";
       }
@@ -852,5 +873,16 @@
       }
       return true;
     }
+
+    static CStdString ToString(const cec_command& command)
+    {
+      CStdString dataStr;
+      dataStr.Format(">> %1x%1x", command.initiator, command.destination);
+      if (command.opcode_set == 1)
+        dataStr.AppendFormat(":%02x", command.opcode);
+      for (uint8_t iPtr = 0; iPtr < command.parameters.size; iPtr++)
+        dataStr.AppendFormat(":%02x", (unsigned int)command.parameters[iPtr]);
+      return dataStr;
+    }
   };
 }
diff -Nru libcec-2.1.1/src/lib/Makefile.am libcec-2.1.4/src/lib/Makefile.am
--- libcec-2.1.1/src/lib/Makefile.am	2013-03-09 20:14:55.000000000 +0000
+++ libcec-2.1.4/src/lib/Makefile.am	2013-12-13 18:06:00.000000000 +0000
@@ -26,7 +26,9 @@
                     implementations/SLCommandHandler.cpp \
                     implementations/VLCommandHandler.cpp \
                     implementations/RLCommandHandler.cpp \
-                    implementations/PHCommandHandler.cpp
+                    implementations/PHCommandHandler.cpp \
+                    implementations/RHCommandHandler.cpp \
+                    implementations/AQCommandHandler.cpp
 
 ## server sockets, currently unused
 ##libcec_la_SOURCES += platform/posix/serversocket.cpp
diff -Nru libcec-2.1.1/src/lib/Makefile.in libcec-2.1.4/src/lib/Makefile.in
--- libcec-2.1.1/src/lib/Makefile.in	2013-03-09 20:23:01.000000000 +0000
+++ libcec-2.1.4/src/lib/Makefile.in	2013-12-13 18:15:12.000000000 +0000
@@ -106,6 +106,8 @@
 	implementations/VLCommandHandler.cpp \
 	implementations/RLCommandHandler.cpp \
 	implementations/PHCommandHandler.cpp \
+	implementations/RHCommandHandler.cpp \
+	implementations/AQCommandHandler.cpp \
 	adapter/Pulse-Eight/USBCECAdapterMessage.cpp \
 	adapter/Pulse-Eight/USBCECAdapterCommands.cpp \
 	adapter/Pulse-Eight/USBCECAdapterCommunication.cpp \
@@ -134,8 +136,9 @@
 	CECBusDevice.lo CECDeviceMap.lo CECPlaybackDevice.lo \
 	CECRecordingDevice.lo CECTuner.lo CECTV.lo ANCommandHandler.lo \
 	CECCommandHandler.lo SLCommandHandler.lo VLCommandHandler.lo \
-	RLCommandHandler.lo PHCommandHandler.lo $(am__objects_1) \
-	$(am__objects_2) $(am__objects_3)
+	RLCommandHandler.lo PHCommandHandler.lo RHCommandHandler.lo \
+	AQCommandHandler.lo $(am__objects_1) $(am__objects_2) \
+	$(am__objects_3)
 libcec_la_OBJECTS = $(am_libcec_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -331,7 +334,9 @@
 	implementations/SLCommandHandler.cpp \
 	implementations/VLCommandHandler.cpp \
 	implementations/RLCommandHandler.cpp \
-	implementations/PHCommandHandler.cpp $(am__append_1) \
+	implementations/PHCommandHandler.cpp \
+	implementations/RHCommandHandler.cpp \
+	implementations/AQCommandHandler.cpp $(am__append_1) \
 	$(am__append_2) $(am__append_3)
 libcec_la_LDFLAGS = @LIBS_LIBCEC@ -version-info @VERSION@
 all: all-am
@@ -411,6 +416,7 @@
 	-rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ANCommandHandler.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AQCommandHandler.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AdapterFactory.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CECAudioSystem.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CECBusDevice.Plo@am__quote@
@@ -425,6 +431,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LibCEC.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LibCECC.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PHCommandHandler.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RHCommandHandler.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RLCommandHandler.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RPiCECAdapterCommunication.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RPiCECAdapterDetection.Plo@am__quote@
@@ -562,6 +569,20 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o PHCommandHandler.lo `test -f 'implementations/PHCommandHandler.cpp' || echo '$(srcdir)/'`implementations/PHCommandHandler.cpp
 
+RHCommandHandler.lo: implementations/RHCommandHandler.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT RHCommandHandler.lo -MD -MP -MF $(DEPDIR)/RHCommandHandler.Tpo -c -o RHCommandHandler.lo `test -f 'implementations/RHCommandHandler.cpp' || echo '$(srcdir)/'`implementations/RHCommandHandler.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/RHCommandHandler.Tpo $(DEPDIR)/RHCommandHandler.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='implementations/RHCommandHandler.cpp' object='RHCommandHandler.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o RHCommandHandler.lo `test -f 'implementations/RHCommandHandler.cpp' || echo '$(srcdir)/'`implementations/RHCommandHandler.cpp
+
+AQCommandHandler.lo: implementations/AQCommandHandler.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT AQCommandHandler.lo -MD -MP -MF $(DEPDIR)/AQCommandHandler.Tpo -c -o AQCommandHandler.lo `test -f 'implementations/AQCommandHandler.cpp' || echo '$(srcdir)/'`implementations/AQCommandHandler.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/AQCommandHandler.Tpo $(DEPDIR)/AQCommandHandler.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='implementations/AQCommandHandler.cpp' object='AQCommandHandler.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o AQCommandHandler.lo `test -f 'implementations/AQCommandHandler.cpp' || echo '$(srcdir)/'`implementations/AQCommandHandler.cpp
+
 USBCECAdapterMessage.lo: adapter/Pulse-Eight/USBCECAdapterMessage.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT USBCECAdapterMessage.lo -MD -MP -MF $(DEPDIR)/USBCECAdapterMessage.Tpo -c -o USBCECAdapterMessage.lo `test -f 'adapter/Pulse-Eight/USBCECAdapterMessage.cpp' || echo '$(srcdir)/'`adapter/Pulse-Eight/USBCECAdapterMessage.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/USBCECAdapterMessage.Tpo $(DEPDIR)/USBCECAdapterMessage.Plo
diff -Nru libcec-2.1.1/src/lib/adapter/Pulse-Eight/USBCECAdapterCommands.cpp libcec-2.1.4/src/lib/adapter/Pulse-Eight/USBCECAdapterCommands.cpp
--- libcec-2.1.1/src/lib/adapter/Pulse-Eight/USBCECAdapterCommands.cpp	2013-03-09 20:14:55.000000000 +0000
+++ libcec-2.1.4/src/lib/adapter/Pulse-Eight/USBCECAdapterCommands.cpp	2013-12-13 18:06:00.000000000 +0000
@@ -38,6 +38,7 @@
 #include "lib/LibCEC.h"
 #include "lib/CECProcessor.h"
 #include "lib/CECTypeUtils.h"
+#include "lib/platform/util/util.h"
 #include <stdio.h>
 
 using namespace CEC;
@@ -67,14 +68,14 @@
 
   CCECAdapterMessage params;
   CCECAdapterMessage *message = m_comm->SendCommand(msgCode, params);
-  if (message->state == ADAPTER_MESSAGE_STATE_SENT_ACKED)
+  if (message && message->state == ADAPTER_MESSAGE_STATE_SENT_ACKED)
   {
     retVal = message->response;
     retVal.Shift(2); // shift out start and msgcode
     retVal.size -= 1; // remove end
   }
 
-  delete message;
+  DELETE_AND_NULL(message);
   return retVal;
 }
 
@@ -281,8 +282,8 @@
   CCECAdapterMessage params;
   params.PushEscaped(enabled ? 1 : 0);
   CCECAdapterMessage *message = m_comm->SendCommand(MSGCODE_SET_AUTO_ENABLED, params);
-  bReturn = message->state == ADAPTER_MESSAGE_STATE_SENT_ACKED;
-  delete message;
+  bReturn = message && message->state == ADAPTER_MESSAGE_STATE_SENT_ACKED;
+  DELETE_AND_NULL(message);
 
   if (bReturn)
   {
@@ -310,8 +311,8 @@
   CCECAdapterMessage params;
   params.PushEscaped((uint8_t)type);
   CCECAdapterMessage *message = m_comm->SendCommand(MSGCODE_SET_DEVICE_TYPE, params);
-  bReturn = message->state == ADAPTER_MESSAGE_STATE_SENT_ACKED;
-  delete message;
+  bReturn = message && message->state == ADAPTER_MESSAGE_STATE_SENT_ACKED;
+  DELETE_AND_NULL(message);
 
   if (bReturn)
   {
@@ -339,8 +340,8 @@
   CCECAdapterMessage params;
   params.PushEscaped((uint8_t)address);
   CCECAdapterMessage *message = m_comm->SendCommand(MSGCODE_SET_DEFAULT_LOGICAL_ADDRESS, params);
-  bReturn = message->state == ADAPTER_MESSAGE_STATE_SENT_ACKED;
-  delete message;
+  bReturn = message && message->state == ADAPTER_MESSAGE_STATE_SENT_ACKED;
+  DELETE_AND_NULL(message);
 
   if (bReturn)
   {
@@ -369,8 +370,8 @@
   params.PushEscaped(iMask >> 8);
   params.PushEscaped((uint8_t)iMask);
   CCECAdapterMessage *message = m_comm->SendCommand(MSGCODE_SET_LOGICAL_ADDRESS_MASK, params);
-  bReturn = message->state == ADAPTER_MESSAGE_STATE_SENT_ACKED;
-  delete message;
+  bReturn = message && message->state == ADAPTER_MESSAGE_STATE_SENT_ACKED;
+  DELETE_AND_NULL(message);
 
   if (bReturn)
   {
@@ -399,8 +400,8 @@
   params.PushEscaped(iPhysicalAddress >> 8);
   params.PushEscaped((uint8_t)iPhysicalAddress);
   CCECAdapterMessage *message = m_comm->SendCommand(MSGCODE_SET_PHYSICAL_ADDRESS, params);
-  bReturn = message->state == ADAPTER_MESSAGE_STATE_SENT_ACKED;
-  delete message;
+  bReturn = message && message->state == ADAPTER_MESSAGE_STATE_SENT_ACKED;
+  DELETE_AND_NULL(message);
 
   if (bReturn)
   {
@@ -428,8 +429,8 @@
   CCECAdapterMessage params;
   params.PushEscaped((uint8_t)version);
   CCECAdapterMessage *message = m_comm->SendCommand(MSGCODE_SET_HDMI_VERSION, params);
-  bReturn = message->state == ADAPTER_MESSAGE_STATE_SENT_ACKED;
-  delete message;
+  bReturn = message && message->state == ADAPTER_MESSAGE_STATE_SENT_ACKED;
+  DELETE_AND_NULL(message);
 
   if (bReturn)
   {
@@ -454,8 +455,8 @@
   for (size_t iPtr = 0; iPtr < strlen(strOSDName); iPtr++)
     params.PushEscaped(strOSDName[iPtr]);
   CCECAdapterMessage *message = m_comm->SendCommand(MSGCODE_SET_OSD_NAME, params);
-  bReturn = message->state == ADAPTER_MESSAGE_STATE_SENT_ACKED;
-  delete message;
+  bReturn = message && message->state == ADAPTER_MESSAGE_STATE_SENT_ACKED;
+  DELETE_AND_NULL(message);
 
   if (bReturn)
     snprintf(m_persistedConfiguration.strDeviceName, 13, "%s", strOSDName);
@@ -475,8 +476,8 @@
 
   CCECAdapterMessage params;
   CCECAdapterMessage *message = m_comm->SendCommand(MSGCODE_WRITE_EEPROM, params);
-  bool bReturn = message->state == ADAPTER_MESSAGE_STATE_SENT_ACKED;
-  delete message;
+  bool bReturn = message && message->state == ADAPTER_MESSAGE_STATE_SENT_ACKED;
+  DELETE_AND_NULL(message);
 
   if (bReturn)
   {
@@ -574,8 +575,8 @@
 
   CCECAdapterMessage params;
   CCECAdapterMessage *message = m_comm->SendCommand(MSGCODE_PING, params);
-  bool bReturn = message->state == ADAPTER_MESSAGE_STATE_SENT_ACKED;
-  delete message;
+  bool bReturn = message && message->state == ADAPTER_MESSAGE_STATE_SENT_ACKED;
+  DELETE_AND_NULL(message);
   return bReturn;
 }
 
@@ -587,8 +588,8 @@
   params.PushEscaped(iMask >> 8);
   params.PushEscaped((uint8_t)iMask);
   CCECAdapterMessage *message  = m_comm->SendCommand(MSGCODE_SET_ACK_MASK, params);
-  bool bReturn = message->state == ADAPTER_MESSAGE_STATE_SENT_ACKED;
-  delete message;
+  bool bReturn = message && message->state == ADAPTER_MESSAGE_STATE_SENT_ACKED;
+  DELETE_AND_NULL(message);
   return bReturn;
 }
 
@@ -601,7 +602,7 @@
     CCECAdapterMessage params;
     params.PushEscaped(bSetTo ? 1 : 0);
     CCECAdapterMessage *message = m_comm->SendCommand(MSGCODE_SET_ACTIVE_SOURCE, params);
-    delete message;
+    DELETE_AND_NULL(message);
   }
 }
 
@@ -611,8 +612,8 @@
 
   CCECAdapterMessage params;
   CCECAdapterMessage *message = m_comm->SendCommand(MSGCODE_START_BOOTLOADER, params);
-  bool bReturn = message->state == ADAPTER_MESSAGE_STATE_SENT_ACKED;
-  delete message;
+  bool bReturn = message && message->state == ADAPTER_MESSAGE_STATE_SENT_ACKED;
+  DELETE_AND_NULL(message);
   return bReturn;
 }
 
@@ -622,8 +623,8 @@
   CCECAdapterMessage params;
   params.PushEscaped(iTimeout);
   CCECAdapterMessage *message = m_comm->SendCommand(MSGCODE_TRANSMIT_IDLETIME, params);
-  bool bReturn = message->state == ADAPTER_MESSAGE_STATE_SENT_ACKED;
-  delete message;
+  bool bReturn = message && message->state == ADAPTER_MESSAGE_STATE_SENT_ACKED;
+  DELETE_AND_NULL(message);
   return bReturn;
 }
 
@@ -640,8 +641,8 @@
   CCECAdapterMessage params;
   params.PushEscaped(controlled ? 1 : 0);
   CCECAdapterMessage *message = m_comm->SendCommand(MSGCODE_SET_CONTROLLED, params);
-  bool bReturn = message->state == ADAPTER_MESSAGE_STATE_SENT_ACKED;
-  delete message;
+  bool bReturn = message && message->state == ADAPTER_MESSAGE_STATE_SENT_ACKED;
+  DELETE_AND_NULL(message);
 
   if (bReturn)
   {
diff -Nru libcec-2.1.1/src/lib/adapter/Pulse-Eight/USBCECAdapterCommunication.cpp libcec-2.1.4/src/lib/adapter/Pulse-Eight/USBCECAdapterCommunication.cpp
--- libcec-2.1.1/src/lib/adapter/Pulse-Eight/USBCECAdapterCommunication.cpp	2013-03-09 20:14:55.000000000 +0000
+++ libcec-2.1.4/src/lib/adapter/Pulse-Eight/USBCECAdapterCommunication.cpp	2013-12-13 18:06:00.000000000 +0000
@@ -304,6 +304,7 @@
     m_lastPollDestination = msg.Destination();
     if (msg.Destination() < CECDEVICE_BROADCAST)
     {
+      CLockObject waitingLock(m_waitingMutex);
       if (!m_bWaitingForAck[msg.Destination()] && !msg.IsEOM())
       {
         if (m_callback)
@@ -328,7 +329,7 @@
   /* mark as waiting for an ack from the destination */
   if (dest < CECDEVICE_BROADCAST)
   {
-    CLockObject lock(m_mutex);
+    CLockObject waitingLock(m_waitingMutex);
     m_bWaitingForAck[dest] = true;
   }
 }
@@ -382,8 +383,7 @@
   {
     LIB_CEC->AddLog(CEC_LOG_DEBUG, "error writing command '%s' to serial port '%s': %s", CCECAdapterMessage::ToString(message->Message()), m_port->GetName().c_str(), m_port->GetError().c_str());
     message->state = ADAPTER_MESSAGE_STATE_ERROR;
-    // this will trigger an alert in the reader thread
-    m_port->Close();
+    // let the higher level close the port
     return false;
   }
 
@@ -416,7 +416,7 @@
     if (m_port->GetErrorNumber())
     {
       LIB_CEC->AddLog(CEC_LOG_ERROR, "error reading from serial port: %s", m_port->GetError().c_str());
-      m_port->Close();
+      // let the higher level close the port
       return false;
     }
   }
@@ -729,6 +729,11 @@
         /* failed to ping the adapter 3 times in a row. something must be wrong with the connection */
         m_com->LIB_CEC->AddLog(CEC_LOG_ERROR, "failed to ping the adapter 3 times in a row. closing the connection.");
         m_com->StopThread(false);
+
+        libcec_parameter param;
+        param.paramData = NULL; param.paramType = CEC_PARAMETER_TYPE_UNKOWN;
+        m_com->LIB_CEC->Alert(CEC_ALERT_CONNECTION_LOST, param);
+
         break;
       }
     }
diff -Nru libcec-2.1.1/src/lib/adapter/Pulse-Eight/USBCECAdapterCommunication.h libcec-2.1.4/src/lib/adapter/Pulse-Eight/USBCECAdapterCommunication.h
--- libcec-2.1.1/src/lib/adapter/Pulse-Eight/USBCECAdapterCommunication.h	2013-03-09 20:14:55.000000000 +0000
+++ libcec-2.1.4/src/lib/adapter/Pulse-Eight/USBCECAdapterCommunication.h	2013-12-13 18:06:00.000000000 +0000
@@ -182,6 +182,7 @@
     CUSBCECAdapterCommands *                     m_commands;             /**< commands that can be sent to the adapter */
     CCECAdapterMessageQueue *                    m_adapterMessageQueue;  /**< the incoming and outgoing message queue */
     cec_logical_addresses                        m_logicalAddresses;     /**< the logical address list that this instance is using */
+    PLATFORM::CMutex                             m_waitingMutex;
   };
 
   class CAdapterEepromWriteThread : public PLATFORM::CThread
diff -Nru libcec-2.1.1/src/lib/adapter/Pulse-Eight/USBCECAdapterDetection.cpp libcec-2.1.4/src/lib/adapter/Pulse-Eight/USBCECAdapterDetection.cpp
--- libcec-2.1.1/src/lib/adapter/Pulse-Eight/USBCECAdapterDetection.cpp	2013-03-09 20:14:55.000000000 +0000
+++ libcec-2.1.4/src/lib/adapter/Pulse-Eight/USBCECAdapterDetection.cpp	2013-12-13 18:06:00.000000000 +0000
@@ -61,6 +61,8 @@
 #include <libudev.h>
 }
 #elif defined(__FreeBSD__)
+#include <sys/param.h>
+#include <sys/sysctl.h>
 #include <stdio.h>
 #include <unistd.h>
 #endif
@@ -434,22 +436,77 @@
   }
 #elif defined(__FreeBSD__)
   char devicePath[PATH_MAX + 1];
+  char infos[512];
+  char sysctlname[32];
+  char ttyname[8];
+  char *pos;
+  size_t infos_size = sizeof(infos);
   int i;
 
-  for (i = 0; i < 8; ++i)
+  for (i = 0; ; ++i)
   {
-    (void)snprintf(devicePath, sizeof(devicePath), "/dev/ttyU%d", i);
-    if (strDevicePath && strcmp(devicePath, strDevicePath) != 0)
+    unsigned int iVendor, iProduct;
+    memset(infos, 0, sizeof(infos));
+    (void)snprintf(sysctlname, sizeof(sysctlname),
+      "dev.umodem.%d.%%pnpinfo", i);
+    if (sysctlbyname(sysctlname, infos, &infos_size,
+      NULL, 0) != 0)
+        break;
+    pos = strstr(infos, "vendor=");
+    if (pos == NULL)
       continue;
-    if (!access(devicePath, 0))
-    {
-      snprintf(deviceList[iFound].strComPath, sizeof(deviceList[iFound].strComPath), "%s", devicePath);
-      snprintf(deviceList[iFound].strComName, sizeof(deviceList[iFound].strComName), "%s", devicePath);
-      deviceList[iFound].iVendorId = CEC_VID;
-      deviceList[iFound].iProductId = CEC_VID;
-      deviceList[iFound].adapterType = ADAPTERTYPE_P8_EXTERNAL; // will be overridden when not doing a "quick scan" by the actual type
-      iFound++;
+    sscanf(pos, "vendor=%x ", &iVendor);
+
+    pos = strstr(infos, "product=");
+    if (pos == NULL)
+      continue;
+    sscanf(pos, "product=%x ", &iProduct);
+
+    if (iVendor != CEC_VID || (iProduct != CEC_PID && iProduct != CEC_PID2))
+      continue;
+
+    pos = strstr(infos, "ttyname=");
+    if (pos == NULL)
+      continue;
+    sscanf(pos, "ttyname=%s ", ttyname);
+
+    (void)snprintf(devicePath, sizeof(devicePath),
+      "/dev/tty%s", ttyname);
+
+    if (strDevicePath) {
+      char currStrDevicePath[512];
+      int port = 0;
+      int devaddr = 0;
+      memset(currStrDevicePath, 0, sizeof(currStrDevicePath));
+      memset(infos, 0, sizeof(infos));
+      (void)snprintf(sysctlname, sizeof(sysctlname),
+        "dev.umodem.%d.%%location", i);
+      if (sysctlbyname(sysctlname, infos, &infos_size,
+        NULL, 0) != 0)
+          break;
+
+      pos = strstr(infos, "port=");
+      if (pos == NULL)
+        continue;
+      sscanf(pos, "port=%d ", &port);
+
+      pos = strstr(infos, "devaddr=");
+      if (pos == NULL)
+        continue;
+      sscanf(pos, "devaddr=%d ", &devaddr);
+
+      (void)snprintf(currStrDevicePath, sizeof(currStrDevicePath),
+        "/dev/ugen%d.%d", port, devaddr);
+
+      if (strcmp(currStrDevicePath, strDevicePath) != 0)
+        continue;
     }
+    snprintf(deviceList[iFound].strComPath, sizeof(deviceList[iFound].strComPath), "%s", devicePath);
+    snprintf(deviceList[iFound].strComName, sizeof(deviceList[iFound].strComName), "%s", devicePath);
+    deviceList[iFound].iVendorId = iVendor;
+    deviceList[iFound].iProductId = iProduct;
+    deviceList[iFound].adapterType = ADAPTERTYPE_P8_EXTERNAL; // will be overridden when not doing a "quick scan" by the actual type
+    iFound++;
   }
 #else
   //silence "unused" warnings
diff -Nru libcec-2.1.1/src/lib/adapter/TDA995x/TDA995xCECAdapterCommunication.cpp libcec-2.1.4/src/lib/adapter/TDA995x/TDA995xCECAdapterCommunication.cpp
--- libcec-2.1.1/src/lib/adapter/TDA995x/TDA995xCECAdapterCommunication.cpp	2013-03-09 20:14:55.000000000 +0000
+++ libcec-2.1.4/src/lib/adapter/TDA995x/TDA995xCECAdapterCommunication.cpp	2013-12-13 18:06:00.000000000 +0000
@@ -217,7 +217,7 @@
 
   m_dev->Ioctl(CEC_IOCTL_GET_SW_VERSION, &vers);
   
-  return (vers.majorVersionNr * 100) + vers.minorVersionNr;
+  return vers.majorVersionNr;
 }
 
 
@@ -336,15 +336,16 @@
       if (frame.service == CEC_RX_PKT)
       {
         cec_command cmd;
-	
+
         cec_command::Format(
           cmd, initiator, destination,
           ( frame.size > 3 ) ? cec_opcode(frame.data[0]) : CEC_OPCODE_NONE);
-	
+
         for( uint8_t i = 1; i < frame.size-3; i++ )
-           cmd.parameters.PushBack(frame.data[i]);
-	
-        m_callback->OnCommandReceived(cmd);
+          cmd.parameters.PushBack(frame.data[i]);
+
+        if (!IsStopped())
+          m_callback->OnCommandReceived(cmd);
       }
       else if (frame.service == CEC_ACK_PKT)
       {
diff -Nru libcec-2.1.1/src/lib/devices/CECBusDevice.cpp libcec-2.1.4/src/lib/devices/CECBusDevice.cpp
--- libcec-2.1.1/src/lib/devices/CECBusDevice.cpp	2013-03-09 20:14:55.000000000 +0000
+++ libcec-2.1.4/src/lib/devices/CECBusDevice.cpp	2013-12-13 18:06:00.000000000 +0000
@@ -40,6 +40,9 @@
 #include "lib/implementations/SLCommandHandler.h"
 #include "lib/implementations/VLCommandHandler.h"
 #include "lib/implementations/PHCommandHandler.h"
+#include "lib/implementations/RLCommandHandler.h"
+#include "lib/implementations/RHCommandHandler.h"
+#include "lib/implementations/AQCommandHandler.h"
 #include "lib/LibCEC.h"
 #include "lib/CECTypeUtils.h"
 #include "lib/platform/util/timeutils.h"
@@ -58,6 +61,78 @@
 #define LIB_CEC     m_processor->GetLib()
 #define ToString(p) CCECTypeUtils::ToString(p)
 
+CResponse::CResponse(cec_opcode opcode) :
+    m_opcode(opcode)
+{
+}
+
+CResponse::~CResponse(void)
+{
+  Broadcast();
+}
+
+bool CResponse::Wait(uint32_t iTimeout)
+{
+  return m_event.Wait(iTimeout);
+}
+
+void CResponse::Broadcast(void)
+{
+  m_event.Broadcast();
+}
+
+CWaitForResponse::CWaitForResponse(void)
+{
+}
+
+CWaitForResponse::~CWaitForResponse(void)
+{
+  Clear();
+}
+
+void CWaitForResponse::Clear()
+{
+  PLATFORM::CLockObject lock(m_mutex);
+  for (std::map<cec_opcode, CResponse*>::iterator it = m_waitingFor.begin(); it != m_waitingFor.end(); it++)
+  {
+    it->second->Broadcast();
+    delete it->second;
+  }
+  m_waitingFor.clear();
+}
+
+bool CWaitForResponse::Wait(cec_opcode opcode, uint32_t iTimeout)
+{
+  CResponse *response = GetEvent(opcode);
+  return response ? response->Wait(iTimeout) : false;
+}
+
+void CWaitForResponse::Received(cec_opcode opcode)
+{
+  CResponse *response = GetEvent(opcode);
+  if (response)
+    response->Broadcast();
+}
+
+CResponse* CWaitForResponse::GetEvent(cec_opcode opcode)
+{
+  CResponse *retVal(NULL);
+  {
+    PLATFORM::CLockObject lock(m_mutex);
+    std::map<cec_opcode, CResponse*>::iterator it = m_waitingFor.find(opcode);
+    if (it != m_waitingFor.end())
+    {
+      retVal = it->second;
+    }
+    else
+    {
+      retVal = new CResponse(opcode);
+      m_waitingFor[opcode] = retVal;
+    }
+    return retVal;
+  }
+}
+
 CCECBusDevice::CCECBusDevice(CCECProcessor *processor, cec_logical_address iLogicalAddress, uint16_t iPhysicalAddress /* = CEC_INVALID_PHYSICAL_ADDRESS */) :
   m_type                  (CEC_DEVICE_TYPE_RESERVED),
   m_iPhysicalAddress      (iPhysicalAddress),
@@ -136,6 +211,16 @@
         case CEC_VENDOR_PHILIPS:
           m_handler = new CPHCommandHandler(this, iTransmitTimeout, iTransmitWait, iTransmitRetries, iActiveSourcePending);
           break;
+        case CEC_VENDOR_TOSHIBA:
+        case CEC_VENDOR_TOSHIBA2:
+          m_handler = new CRLCommandHandler(this, iTransmitTimeout, iTransmitWait, iTransmitRetries, iActiveSourcePending);
+          break;
+        case CEC_VENDOR_ONKYO:
+          m_handler = new CRHCommandHandler(this, iTransmitTimeout, iTransmitWait, iTransmitRetries, iActiveSourcePending);
+          break;
+        case CEC_VENDOR_SHARP:
+          m_handler = new CAQCommandHandler(this, iTransmitTimeout, iTransmitWait, iTransmitRetries, iActiveSourcePending);
+          break;
         default:
           m_handler = new CCECCommandHandler(this, iTransmitTimeout, iTransmitWait, iTransmitRetries, iActiveSourcePending);
           break;
@@ -600,7 +685,7 @@
   if (bRequestUpdate)
   {
     CheckVendorIdRequested(initiator);
-    RequestPowerStatus(initiator);
+    RequestPowerStatus(initiator, bUpdate);
   }
 
   CLockObject lock(m_mutex);
@@ -637,7 +722,7 @@
   return m_bImageViewOnSent;
 }
 
-bool CCECBusDevice::RequestPowerStatus(const cec_logical_address initiator, bool bWaitForResponse /* = true */)
+bool CCECBusDevice::RequestPowerStatus(const cec_logical_address initiator, bool bUpdate, bool bWaitForResponse /* = true */)
 {
   bool bReturn(false);
 
@@ -645,7 +730,7 @@
       !IsUnsupportedFeature(CEC_OPCODE_GIVE_DEVICE_POWER_STATUS))
   {
     MarkBusy();
-    bReturn = m_handler->TransmitRequestPowerStatus(initiator, m_iLogicalAddress, bWaitForResponse);
+    bReturn = m_handler->TransmitRequestPowerStatus(initiator, m_iLogicalAddress, bUpdate, bWaitForResponse);
     if (!bReturn)
       SetPowerStatus(CEC_POWER_STATUS_UNKNOWN);
     MarkReady();
@@ -804,7 +889,7 @@
       if (m_deviceStatus != newStatus)
         LIB_CEC->AddLog(CEC_LOG_DEBUG, "%s (%X): device status changed into 'handled by libCEC'", GetLogicalAddressName(), m_iLogicalAddress);
       SetPowerStatus   (CEC_POWER_STATUS_ON);
-      SetVendorId      (CEC_VENDOR_UNKNOWN);
+      SetVendorId      (CEC_VENDOR_PULSE_EIGHT);
       SetMenuState     (CEC_MENU_STATE_ACTIVATED);
       SetCecVersion    (libCECSpecVersion);
       SetStreamPath    (CEC_INVALID_PHYSICAL_ADDRESS);
@@ -997,14 +1082,12 @@
     if ((*it)->GetLogicalAddress() != m_iLogicalAddress)
       (*it)->MarkAsInactiveSource();
 
-  if (bWasActivated)
-  {
-    if (IsHandledByLibCEC())
-      m_processor->SetActiveSource(true, false);
-    CCECClient *client = GetClient();
-    if (client)
-      client->SourceActivated(m_iLogicalAddress);
-  }
+  if (bWasActivated && IsHandledByLibCEC())
+    m_processor->SetActiveSource(true, false);
+
+  CCECClient *client = GetClient();
+  if (client)
+    client->SourceActivated(m_iLogicalAddress);
 }
 
 void CCECBusDevice::MarkAsInactiveSource(bool bClientUnregistered /* = false */)
@@ -1134,14 +1217,10 @@
     return;
 
   CCECBusDevice* newRoute = m_processor->GetDeviceByPhysicalAddress(iRoute, true);
-  if (newRoute)
+  if (newRoute && newRoute->IsHandledByLibCEC())
   {
     // we were made the active source, send notification
-    if (newRoute->IsHandledByLibCEC())
-      newRoute->ActivateSource();
-    // another device was made active
-    else
-      newRoute->MarkAsActiveSource();
+    newRoute->ActivateSource();
   }
 }
 
diff -Nru libcec-2.1.1/src/lib/devices/CECBusDevice.h libcec-2.1.4/src/lib/devices/CECBusDevice.h
--- libcec-2.1.1/src/lib/devices/CECBusDevice.h	2013-03-09 20:14:55.000000000 +0000
+++ libcec-2.1.4/src/lib/devices/CECBusDevice.h	2013-12-13 18:06:00.000000000 +0000
@@ -50,22 +50,11 @@
   class CResponse
   {
   public:
-    CResponse(cec_opcode opcode) :
-        m_opcode(opcode){}
-    ~CResponse(void)
-    {
-      Broadcast();
-    }
-
-    bool Wait(uint32_t iTimeout)
-    {
-      return m_event.Wait(iTimeout);
-    }
-
-    void Broadcast(void)
-    {
-      m_event.Broadcast();
-    }
+    CResponse(cec_opcode opcode);
+    ~CResponse(void);
+
+    bool Wait(uint32_t iTimeout);
+    void Broadcast(void);
 
   private:
     cec_opcode       m_opcode;
@@ -75,52 +64,15 @@
   class CWaitForResponse
   {
   public:
-    CWaitForResponse(void) {}
-    ~CWaitForResponse(void)
-    {
-      Clear();
-    }
-
-    void Clear()
-    {
-      PLATFORM::CLockObject lock(m_mutex);
-      for (std::map<cec_opcode, CResponse*>::iterator it = m_waitingFor.begin(); it != m_waitingFor.end(); it++)
-        it->second->Broadcast();
-      m_waitingFor.clear();
-    }
-
-    bool Wait(cec_opcode opcode, uint32_t iTimeout = CEC_DEFAULT_TRANSMIT_WAIT)
-    {
-      CResponse *response = GetEvent(opcode);
-      return response ? response->Wait(iTimeout) : false;
-    }
-
-    void Received(cec_opcode opcode)
-    {
-      CResponse *response = GetEvent(opcode);
-      if (response)
-        response->Broadcast();
-    }
+    CWaitForResponse(void);
+    ~CWaitForResponse(void);
+
+    void Clear();
+    bool Wait(cec_opcode opcode, uint32_t iTimeout = CEC_DEFAULT_TRANSMIT_WAIT);
+    void Received(cec_opcode opcode);
 
   private:
-    CResponse *GetEvent(cec_opcode opcode)
-    {
-      CResponse *retVal(NULL);
-      {
-        PLATFORM::CLockObject lock(m_mutex);
-        std::map<cec_opcode, CResponse*>::iterator it = m_waitingFor.find(opcode);
-        if (it != m_waitingFor.end())
-        {
-          retVal = it->second;
-        }
-        else
-        {
-          retVal = new CResponse(opcode);
-          m_waitingFor[opcode] = retVal;
-        }
-        return retVal;
-      }
-    }
+    CResponse *GetEvent(cec_opcode opcode);
 
     PLATFORM::CMutex                 m_mutex;
     std::map<cec_opcode, CResponse*> m_waitingFor;
@@ -194,7 +146,7 @@
     virtual void                  SetPowerStatus(const cec_power_status powerStatus);
     virtual void                  OnImageViewOnSent(bool bSentByLibCEC);
     virtual bool                  ImageViewOnSent(void);
-    virtual bool                  RequestPowerStatus(const cec_logical_address initiator, bool bWaitForResponse = true);
+    virtual bool                  RequestPowerStatus(const cec_logical_address initiator, bool bUpdate, bool bWaitForResponse = true);
     virtual bool                  TransmitPowerState(const cec_logical_address destination, bool bIsReply);
 
     virtual cec_vendor_id         GetCurrentVendorId(void);
diff -Nru libcec-2.1.1/src/lib/implementations/ANCommandHandler.cpp libcec-2.1.4/src/lib/implementations/ANCommandHandler.cpp
--- libcec-2.1.1/src/lib/implementations/ANCommandHandler.cpp	2013-03-09 20:14:55.000000000 +0000
+++ libcec-2.1.4/src/lib/implementations/ANCommandHandler.cpp	2013-12-13 18:06:00.000000000 +0000
@@ -76,11 +76,6 @@
   return COMMAND_HANDLED;
 }
 
-int CANCommandHandler::HandleVendorRemoteButtonUp(const cec_command &command)
-{
-  return HandleUserControlRelease(command);
-}
-
 bool CANCommandHandler::PowerOn(const cec_logical_address iInitiator, const cec_logical_address iDestination)
 {
   if (iDestination == CECDEVICE_AUDIOSYSTEM)
@@ -92,3 +87,32 @@
 
   return CCECCommandHandler::PowerOn(iInitiator, iDestination);
 }
+
+int CANCommandHandler::HandleDeviceVendorCommandWithId(const cec_command &command)
+{
+  if (!m_processor->IsHandledByLibCEC(command.destination))
+    return CEC_ABORT_REASON_INVALID_OPERAND;
+
+  // samsung's vendor id
+  if (command.parameters[0] == 0x00 && command.parameters[1] == 0x00 && command.parameters[2] == 0xf0)
+  {
+    // unknown vendor command sent to devices
+    if (command.parameters[3] == 0x23)
+    {
+      cec_command response;
+      cec_command::Format(response, command.destination, command.initiator, CEC_OPCODE_VENDOR_COMMAND_WITH_ID);
+
+      // samsung vendor id
+      response.parameters.PushBack(0x00); response.parameters.PushBack(0x00); response.parameters.PushBack(0xf0);
+
+      // XXX see bugzid 2164. reply sent back by audio systems, we might have to send something different
+      response.parameters.PushBack(0x24);
+      response.parameters.PushBack(0x00);
+      response.parameters.PushBack(0x80);
+
+      Transmit(response, false, true);
+      return COMMAND_HANDLED;
+    }
+  }
+  return CEC_ABORT_REASON_INVALID_OPERAND;
+}
diff -Nru libcec-2.1.1/src/lib/implementations/ANCommandHandler.h libcec-2.1.4/src/lib/implementations/ANCommandHandler.h
--- libcec-2.1.1/src/lib/implementations/ANCommandHandler.h	2013-03-09 20:14:55.000000000 +0000
+++ libcec-2.1.4/src/lib/implementations/ANCommandHandler.h	2013-12-13 18:06:00.000000000 +0000
@@ -46,7 +46,7 @@
     virtual ~CANCommandHandler(void) {};
 
     int HandleVendorRemoteButtonDown(const cec_command &command);
-    int HandleVendorRemoteButtonUp(const cec_command &command);
+    int HandleDeviceVendorCommandWithId(const cec_command &command);
 
   protected:
     bool PowerOn(const cec_logical_address iInitiator, const cec_logical_address iDestination);
diff -Nru libcec-2.1.1/src/lib/implementations/AQCommandHandler.cpp libcec-2.1.4/src/lib/implementations/AQCommandHandler.cpp
--- libcec-2.1.1/src/lib/implementations/AQCommandHandler.cpp	1970-01-01 00:00:00.000000000 +0000
+++ libcec-2.1.4/src/lib/implementations/AQCommandHandler.cpp	2013-12-13 18:06:00.000000000 +0000
@@ -0,0 +1,89 @@
+/*
+ * This file is part of the libCEC(R) library.
+ *
+ * libCEC(R) is Copyright (C) 2011-2013 Pulse-Eight Limited.  All rights reserved.
+ * libCEC(R) is an original work, containing original code.
+ *
+ * libCEC(R) is a trademark of Pulse-Eight Limited.
+ *
+ * This program is dual-licensed; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ *
+ * Alternatively, you can license this library under a commercial license,
+ * please contact Pulse-Eight Licensing for more information.
+ *
+ * For more information contact:
+ * Pulse-Eight Licensing       <license@pulse-eight.com>
+ *     http://www.pulse-eight.com/
+ *     http://www.pulse-eight.net/
+ */
+
+#include "env.h"
+#include "AQCommandHandler.h"
+
+#include "lib/devices/CECBusDevice.h"
+#include "lib/CECProcessor.h"
+#include "lib/LibCEC.h"
+#include "lib/CECClient.h"
+
+using namespace CEC;
+using namespace PLATFORM;
+
+#define LIB_CEC     m_busDevice->GetProcessor()->GetLib()
+#define ToString(p) LIB_CEC->ToString(p)
+
+CAQCommandHandler::CAQCommandHandler(CCECBusDevice *busDevice,
+                                     int32_t iTransmitTimeout /* = CEC_DEFAULT_TRANSMIT_TIMEOUT */,
+                                     int32_t iTransmitWait /* = CEC_DEFAULT_TRANSMIT_WAIT */,
+                                     int8_t iTransmitRetries /* = CEC_DEFAULT_TRANSMIT_RETRIES */,
+                                     int64_t iActiveSourcePending /* = 0 */) :
+    CCECCommandHandler(busDevice, iTransmitTimeout, iTransmitWait, iTransmitRetries, iActiveSourcePending),
+    m_powerOnCheck(NULL)
+{
+  m_vendorId = CEC_VENDOR_SHARP;
+}
+
+CAQCommandHandler::~CAQCommandHandler(void)
+{
+  delete m_powerOnCheck;
+}
+
+bool CAQCommandHandler::PowerOn(const cec_logical_address iInitiator, const cec_logical_address iDestination)
+{
+  bool bCheck(false);
+  bool bRetval(false);
+  if (m_busDevice->GetCurrentPowerStatus() != CEC_POWER_STATUS_ON && (!m_powerOnCheck || !m_powerOnCheck->IsRunning()))
+    bCheck = true;
+  bRetval = CCECCommandHandler::PowerOn(iInitiator, iDestination);
+
+  if (bRetval && bCheck)
+  {
+    if (!m_powerOnCheck)
+      m_powerOnCheck = new CAQPowerStatusCheck(this, iInitiator, iDestination);
+    if (m_powerOnCheck)
+      m_powerOnCheck->CreateThread();
+  }
+
+  return bRetval;
+}
+
+void* CAQPowerStatusCheck::Process(void)
+{
+  // sleep for 2 seconds and query the power status
+  Sleep(2000);
+  if (m_handler->m_busDevice->GetProcessor()->GetDevice(m_iDestination)->GetPowerStatus(m_iInitiator, true) == CEC_POWER_STATUS_STANDBY)
+    m_handler->m_busDevice->GetProcessor()->GetLib()->AddLog(CEC_LOG_WARNING, "AQUOS LINK 'auto power on' is disabled, which prevents the TV from being powered on. To correct this, press the menu button on your remote, go to 'link operation' -> 'AQUOS LINK setup' -> 'Auto power on' and set it to 'On'");
+  return NULL;
+}
diff -Nru libcec-2.1.1/src/lib/implementations/AQCommandHandler.h libcec-2.1.4/src/lib/implementations/AQCommandHandler.h
--- libcec-2.1.1/src/lib/implementations/AQCommandHandler.h	1970-01-01 00:00:00.000000000 +0000
+++ libcec-2.1.4/src/lib/implementations/AQCommandHandler.h	2013-12-13 18:06:00.000000000 +0000
@@ -0,0 +1,74 @@
+#pragma once
+/*
+ * This file is part of the libCEC(R) library.
+ *
+ * libCEC(R) is Copyright (C) 2011-2013 Pulse-Eight Limited.  All rights reserved.
+ * libCEC(R) is an original work, containing original code.
+ *
+ * libCEC(R) is a trademark of Pulse-Eight Limited.
+ *
+ * This program is dual-licensed; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ *
+ * Alternatively, you can license this library under a commercial license,
+ * please contact Pulse-Eight Licensing for more information.
+ *
+ * For more information contact:
+ * Pulse-Eight Licensing       <license@pulse-eight.com>
+ *     http://www.pulse-eight.com/
+ *     http://www.pulse-eight.net/
+ */
+
+#include "CECCommandHandler.h"
+#include "lib/platform/threads/threads.h"
+
+namespace CEC
+{
+  class CAQPowerStatusCheck;
+
+  class CAQCommandHandler : public CCECCommandHandler
+  {
+    friend class CAQPowerStatusCheck;
+  public:
+    CAQCommandHandler(CCECBusDevice *busDevice,
+                      int32_t iTransmitTimeout = CEC_DEFAULT_TRANSMIT_TIMEOUT,
+                      int32_t iTransmitWait = CEC_DEFAULT_TRANSMIT_WAIT,
+                      int8_t iTransmitRetries = CEC_DEFAULT_TRANSMIT_RETRIES,
+                      int64_t iActiveSourcePending = 0);
+    virtual ~CAQCommandHandler(void);
+
+  protected:
+    virtual bool PowerOn(const cec_logical_address iInitiator, const cec_logical_address iDestination);
+
+  private:
+    CAQPowerStatusCheck* m_powerOnCheck;
+  };
+
+  class CAQPowerStatusCheck : public PLATFORM::CThread
+  {
+  public:
+    CAQPowerStatusCheck(CAQCommandHandler* handler, cec_logical_address iInitiator, cec_logical_address iDestination) :
+      m_handler(handler),
+      m_iInitiator(iInitiator),
+      m_iDestination(iDestination) {}
+    virtual ~CAQPowerStatusCheck(void) {}
+
+  private:
+    void* Process(void);
+    CAQCommandHandler* m_handler;
+    cec_logical_address m_iInitiator;
+    cec_logical_address m_iDestination;
+  };
+};
diff -Nru libcec-2.1.1/src/lib/implementations/CECCommandHandler.cpp libcec-2.1.4/src/lib/implementations/CECCommandHandler.cpp
--- libcec-2.1.1/src/lib/implementations/CECCommandHandler.cpp	2013-03-09 20:14:55.000000000 +0000
+++ libcec-2.1.4/src/lib/implementations/CECCommandHandler.cpp	2013-12-13 18:06:00.000000000 +0000
@@ -257,6 +257,14 @@
 int CCECCommandHandler::HandleDeviceVendorId(const cec_command &command)
 {
   SetVendorId(command);
+
+  if (command.initiator == CECDEVICE_TV)
+  {
+    CCECBusDevice* primary = m_processor->GetPrimaryDevice();
+    if (primary)
+      primary->TransmitVendorID(CECDEVICE_BROADCAST, false, false);
+  }
+
   return COMMAND_HANDLED;
 }
 
@@ -455,6 +463,13 @@
   {
     uint16_t iNewAddress = ((uint16_t)command.parameters[0] << 8) | ((uint16_t)command.parameters[1]);
     SetPhysicalAddress(command.initiator, iNewAddress);
+
+    if (command.initiator == CECDEVICE_TV)
+    {
+      CCECBusDevice* primary = m_processor->GetPrimaryDevice();
+      if (primary)
+        primary->TransmitPhysicalAddress(false);
+    }
     return COMMAND_HANDLED;
   }
   return CEC_ABORT_REASON_INVALID_OPERAND;
@@ -580,16 +595,12 @@
       if (device->IsHandledByLibCEC() && !device->IsActiveSource())
         device->ActivateSource();
       else
+      {
         device->MarkAsActiveSource();
+        device->TransmitActiveSource(true);
+      }
       return COMMAND_HANDLED;
     }
-    else
-    {
-      cec_logical_address previousSource = m_processor->GetActiveSource(false);
-      CCECBusDevice* device = m_processor->GetDevice(previousSource);
-      if (device && device->GetCurrentPhysicalAddress() != iStreamAddress)
-        device->MarkAsInactiveSource();
-    }
   }
 
   return CEC_ABORT_REASON_INVALID_OPERAND;
@@ -756,6 +767,9 @@
   {
     LIB_CEC->AddLog(CEC_LOG_DEBUG, "sending abort with opcode %02x and reason '%s' to %s", command.opcode, ToString(reason), ToString(command.initiator));
     m_processor->TransmitAbort(command.destination, command.initiator, command.opcode, reason);
+
+    if (reason == CEC_ABORT_REASON_INVALID_OPERAND)
+      RequestEmailFromCustomer(command);
   }
 }
 
@@ -914,12 +928,12 @@
   return Transmit(command, !bWaitForResponse, false);
 }
 
-bool CCECCommandHandler::TransmitRequestPowerStatus(const cec_logical_address iInitiator, const cec_logical_address iDestination, bool bWaitForResponse /* = true */)
+bool CCECCommandHandler::TransmitRequestPowerStatus(const cec_logical_address iInitiator, const cec_logical_address iDestination, bool bUpdate, bool bWaitForResponse /* = true */)
 {
   if (iDestination == CECDEVICE_TV)
   {
     int64_t now(GetTimeMs());
-    if (now - m_iPowerStatusRequested < REQUEST_POWER_STATUS_TIMEOUT)
+    if (!bUpdate && now - m_iPowerStatusRequested < REQUEST_POWER_STATUS_TIMEOUT)
       return true;
     m_iPowerStatusRequested = now;
   }
@@ -1211,7 +1225,7 @@
     bool bTvPresent = (tv && tv->GetStatus() == CEC_DEVICE_STATUS_PRESENT);
     bool bActiveSourceFailed(false);
     if (bTvPresent)
-      bActiveSourceFailed = !m_busDevice->TransmitImageViewOn();
+      bActiveSourceFailed = !tv->PowerOn(m_busDevice->GetLogicalAddress());
     else
       LIB_CEC->AddLog(CEC_LOG_DEBUG, "TV not present, not sending 'image view on'");
 
@@ -1234,6 +1248,14 @@
         if (playbackDevice && SendDeckStatusUpdateOnActiveSource())
           bActiveSourceFailed = !playbackDevice->TransmitDeckStatus(CECDEVICE_TV, false);
       }
+
+      // update system audio mode for audiosystem devices
+      if (bTvPresent && !bActiveSourceFailed)
+      {
+        CCECAudioSystem* audioDevice = m_busDevice->AsAudioSystem();
+        if (audioDevice)
+          bActiveSourceFailed = !audioDevice->TransmitSetSystemAudioMode(CECDEVICE_TV, false);
+      }
     }
 
     // retry later
@@ -1265,3 +1287,31 @@
   CLockObject lock(m_mutex);
   m_iActiveSourcePending = GetTimeMs() + iDelay;
 }
+
+void CCECCommandHandler::RequestEmailFromCustomer(const cec_command& command)
+{
+  bool bInserted(false);
+  map<cec_opcode, vector<cec_command> >::iterator it = m_logsRequested.find(command.opcode);
+  if (it != m_logsRequested.end())
+  {
+    for (vector<cec_command>::const_iterator it2 = it->second.begin(); it2 != it->second.end(); it2++)
+    {
+      // we already logged this one
+      if ((*it2).parameters == command.parameters)
+        return;
+    }
+
+    it->second.push_back(command);
+    bInserted = true;
+  }
+
+  if (!bInserted)
+  {
+    vector<cec_command> commands;
+    commands.push_back(command);
+    m_logsRequested.insert(make_pair(command.opcode, commands));
+  }
+
+  LIB_CEC->AddLog(CEC_LOG_NOTICE, "Unmapped code detected. Please send an email to support@pulse-eight.com with the following details, and if you pressed a key, tell us which one you pressed, and we'll add support for this it.\nCEC command: %s\nVendor ID: %s (%06x)", ToString(command).c_str(), ToString(m_vendorId), m_vendorId);
+}
+
diff -Nru libcec-2.1.1/src/lib/implementations/CECCommandHandler.h libcec-2.1.4/src/lib/implementations/CECCommandHandler.h
--- libcec-2.1.1/src/lib/implementations/CECCommandHandler.h	2013-03-09 20:14:55.000000000 +0000
+++ libcec-2.1.4/src/lib/implementations/CECCommandHandler.h	2013-12-13 18:06:00.000000000 +0000
@@ -33,6 +33,7 @@
 
 #include <vector>
 #include <string>
+#include <map>
 #include "lib/platform/threads/mutex.h"
 
 namespace CEC
@@ -57,7 +58,7 @@
     virtual bool HandleCommand(const cec_command &command);
     virtual cec_vendor_id GetVendorId(void) { return m_vendorId; };
     virtual void SetVendorId(cec_vendor_id vendorId) { m_vendorId = vendorId; }
-    static bool HasSpecificHandler(cec_vendor_id vendorId) { return vendorId == CEC_VENDOR_LG || vendorId == CEC_VENDOR_SAMSUNG || vendorId == CEC_VENDOR_PANASONIC || vendorId == CEC_VENDOR_PHILIPS;}
+    static bool HasSpecificHandler(cec_vendor_id vendorId) { return vendorId == CEC_VENDOR_LG || vendorId == CEC_VENDOR_SAMSUNG || vendorId == CEC_VENDOR_PANASONIC || vendorId == CEC_VENDOR_PHILIPS || vendorId == CEC_VENDOR_SHARP;}
 
     virtual bool InitHandler(void) { return true; }
     virtual bool ActivateSource(bool bTransmitDelayedCommandsOnly = false);
@@ -72,7 +73,7 @@
     virtual bool TransmitRequestOSDName(const cec_logical_address iInitiator, const cec_logical_address iDestination, bool bWaitForResponse = true);
     virtual bool TransmitRequestAudioStatus(const cec_logical_address iInitiator, const cec_logical_address iDestination, bool bWaitForResponse = true);
     virtual bool TransmitRequestPhysicalAddress(const cec_logical_address iInitiator, const cec_logical_address iDestination, bool bWaitForResponse = true);
-    virtual bool TransmitRequestPowerStatus(const cec_logical_address iInitiator, const cec_logical_address iDestination, bool bWaitForResponse = true);
+    virtual bool TransmitRequestPowerStatus(const cec_logical_address iInitiator, const cec_logical_address iDestination, bool bUpdate, bool bWaitForResponse = true);
     virtual bool TransmitRequestVendorId(const cec_logical_address iInitiator, const cec_logical_address iDestination, bool bWaitForResponse = true);
     virtual bool TransmitActiveSource(const cec_logical_address iInitiator, uint16_t iPhysicalAddress, bool bIsReply);
     virtual bool TransmitCECVersion(const cec_logical_address iInitiator, const cec_logical_address iDestination, cec_version cecVersion, bool bIsReply);
@@ -137,8 +138,9 @@
     virtual int HandleUserControlRelease(const cec_command &command);
     virtual int HandleVendorCommand(const cec_command &command);
     virtual int HandleVendorRemoteButtonDown(const cec_command& command);
-    virtual int HandleVendorRemoteButtonUp(const cec_command & UNUSED(command)) { return COMMAND_HANDLED; }
+    virtual int HandleVendorRemoteButtonUp(const cec_command& command) { return HandleUserControlRelease(command); }
     virtual void UnhandledCommand(const cec_command &command, const cec_abort_reason reason);
+    virtual void RequestEmailFromCustomer(const cec_command& command);
 
     virtual void VendorPreActivateSourceHook(void) {};
 
@@ -164,5 +166,6 @@
     int64_t          m_iActiveSourcePending;
     PLATFORM::CMutex m_mutex;
     int64_t          m_iPowerStatusRequested;
+    std::map<cec_opcode, std::vector<cec_command> > m_logsRequested;
   };
 };
diff -Nru libcec-2.1.1/src/lib/implementations/PHCommandHandler.cpp libcec-2.1.4/src/lib/implementations/PHCommandHandler.cpp
--- libcec-2.1.1/src/lib/implementations/PHCommandHandler.cpp	2013-03-09 20:14:55.000000000 +0000
+++ libcec-2.1.4/src/lib/implementations/PHCommandHandler.cpp	2013-12-13 18:06:00.000000000 +0000
@@ -152,9 +152,8 @@
   return CCECCommandHandler::HandleDeviceVendorId(command);
 }
 
-bool CPHCommandHandler::TransmitVendorID(const cec_logical_address iInitiator, const cec_logical_address iDestination, uint64_t UNUSED(iVendorId), bool UNUSED(bIsReply))
+bool CPHCommandHandler::TransmitVendorID(const cec_logical_address iInitiator, const cec_logical_address iDestination, uint64_t UNUSED(iVendorId), bool bIsReply)
 {
-  LIB_CEC->AddLog(CEC_LOG_DEBUG, "<< %s (%X) -> %s (%X): vendor id feature abort", ToString(iInitiator), iInitiator, ToString(iDestination), iDestination);
-  m_processor->TransmitAbort(iInitiator, iDestination, CEC_OPCODE_GIVE_DEVICE_VENDOR_ID);
-  return true;
+  // XXX hack around the hack in CPHCommandHandler::InitHandler
+  return CCECCommandHandler::TransmitVendorID(iInitiator, iDestination, CEC_VENDOR_PULSE_EIGHT, bIsReply);
 }
diff -Nru libcec-2.1.1/src/lib/implementations/PHCommandHandler.h libcec-2.1.4/src/lib/implementations/PHCommandHandler.h
--- libcec-2.1.1/src/lib/implementations/PHCommandHandler.h	2013-03-09 20:14:55.000000000 +0000
+++ libcec-2.1.4/src/lib/implementations/PHCommandHandler.h	2013-12-13 18:06:00.000000000 +0000
@@ -71,7 +71,6 @@
     virtual int HandleUserControlRelease(const cec_command& command);
     virtual bool TransmitVendorID(const cec_logical_address iInitiator, const cec_logical_address iDestination, uint64_t iVendorId, bool bIsReply);
     virtual int HandleDeviceVendorId(const cec_command& command);
-    virtual int HandleVendorRemoteButtonUp(const cec_command & command) { return HandleUserControlRelease(command); }
     uint8_t            m_iLastKeyCode;
     CImageViewOnCheck* m_imageViewOnCheck;
   };
diff -Nru libcec-2.1.1/src/lib/implementations/RHCommandHandler.cpp libcec-2.1.4/src/lib/implementations/RHCommandHandler.cpp
--- libcec-2.1.1/src/lib/implementations/RHCommandHandler.cpp	1970-01-01 00:00:00.000000000 +0000
+++ libcec-2.1.4/src/lib/implementations/RHCommandHandler.cpp	2013-12-13 18:06:00.000000000 +0000
@@ -0,0 +1,65 @@
+/*
+ * This file is part of the libCEC(R) library.
+ *
+ * libCEC(R) is Copyright (C) 2011-2013 Pulse-Eight Limited.  All rights reserved.
+ * libCEC(R) is an original work, containing original code.
+ *
+ * libCEC(R) is a trademark of Pulse-Eight Limited.
+ *
+ * This program is dual-licensed; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ *
+ * Alternatively, you can license this library under a commercial license,
+ * please contact Pulse-Eight Licensing for more information.
+ *
+ * For more information contact:
+ * Pulse-Eight Licensing       <license@pulse-eight.com>
+ *     http://www.pulse-eight.com/
+ *     http://www.pulse-eight.net/
+ */
+
+#include "env.h"
+#include "RHCommandHandler.h"
+
+#include "lib/devices/CECBusDevice.h"
+#include "lib/CECProcessor.h"
+#include "lib/LibCEC.h"
+#include "lib/CECClient.h"
+
+using namespace CEC;
+
+#define LIB_CEC     m_busDevice->GetProcessor()->GetLib()
+#define ToString(p) LIB_CEC->ToString(p)
+
+CRHCommandHandler::CRHCommandHandler(CCECBusDevice *busDevice,
+                                     int32_t iTransmitTimeout /* = CEC_DEFAULT_TRANSMIT_TIMEOUT */,
+                                     int32_t iTransmitWait /* = CEC_DEFAULT_TRANSMIT_WAIT */,
+                                     int8_t iTransmitRetries /* = CEC_DEFAULT_TRANSMIT_RETRIES */,
+                                     int64_t iActiveSourcePending /* = 0 */) :
+    CCECCommandHandler(busDevice, iTransmitTimeout, iTransmitWait, iTransmitRetries, iActiveSourcePending)
+{
+  m_vendorId = CEC_VENDOR_ONKYO;
+}
+
+int CRHCommandHandler::HandleDeviceVendorCommandWithId(const cec_command &command)
+{
+  // onkyo's vendor id
+  if (command.parameters[0] == 0x00 && command.parameters[1] == 0x09 && command.parameters[2] == 0xb0)
+  {
+    // ignore unknown vendor commands sent by onkyo devices, bugzid: 2559
+  }
+  return CEC_ABORT_REASON_INVALID_OPERAND;
+
+}
diff -Nru libcec-2.1.1/src/lib/implementations/RHCommandHandler.h libcec-2.1.4/src/lib/implementations/RHCommandHandler.h
--- libcec-2.1.1/src/lib/implementations/RHCommandHandler.h	1970-01-01 00:00:00.000000000 +0000
+++ libcec-2.1.4/src/lib/implementations/RHCommandHandler.h	2013-12-13 18:06:00.000000000 +0000
@@ -0,0 +1,51 @@
+#pragma once
+/*
+ * This file is part of the libCEC(R) library.
+ *
+ * libCEC(R) is Copyright (C) 2011-2013 Pulse-Eight Limited.  All rights reserved.
+ * libCEC(R) is an original work, containing original code.
+ *
+ * libCEC(R) is a trademark of Pulse-Eight Limited.
+ *
+ * This program is dual-licensed; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ *
+ * Alternatively, you can license this library under a commercial license,
+ * please contact Pulse-Eight Licensing for more information.
+ *
+ * For more information contact:
+ * Pulse-Eight Licensing       <license@pulse-eight.com>
+ *     http://www.pulse-eight.com/
+ *     http://www.pulse-eight.net/
+ */
+
+#include "CECCommandHandler.h"
+
+namespace CEC
+{
+  class CRHCommandHandler : public CCECCommandHandler
+  {
+  public:
+    CRHCommandHandler(CCECBusDevice *busDevice,
+                      int32_t iTransmitTimeout = CEC_DEFAULT_TRANSMIT_TIMEOUT,
+                      int32_t iTransmitWait = CEC_DEFAULT_TRANSMIT_WAIT,
+                      int8_t iTransmitRetries = CEC_DEFAULT_TRANSMIT_RETRIES,
+                      int64_t iActiveSourcePending = 0);
+    virtual ~CRHCommandHandler(void) {};
+
+  protected:
+    int HandleDeviceVendorCommandWithId(const cec_command &command);
+  };
+};
diff -Nru libcec-2.1.1/src/lib/implementations/RLCommandHandler.cpp libcec-2.1.4/src/lib/implementations/RLCommandHandler.cpp
--- libcec-2.1.1/src/lib/implementations/RLCommandHandler.cpp	2013-03-09 20:14:55.000000000 +0000
+++ libcec-2.1.4/src/lib/implementations/RLCommandHandler.cpp	2013-12-13 18:06:00.000000000 +0000
@@ -37,10 +37,14 @@
 #include "lib/devices/CECBusDevice.h"
 #include "lib/CECProcessor.h"
 #include "lib/LibCEC.h"
+#include "lib/CECClient.h"
 
 using namespace CEC;
 using namespace PLATFORM;
 
+#define RL_KEY_TOP_MENU           0x10
+#define RL_KEY_DVD_MENU           0x11
+
 CRLCommandHandler::CRLCommandHandler(CCECBusDevice *busDevice,
                                      int32_t iTransmitTimeout /* = CEC_DEFAULT_TRANSMIT_TIMEOUT */,
                                      int32_t iTransmitWait /* = CEC_DEFAULT_TRANSMIT_WAIT */,
@@ -79,3 +83,59 @@
 
   return true;
 }
+
+int CRLCommandHandler::HandleDeviceVendorCommandWithId(const cec_command &command)
+{
+  if (!m_processor->IsHandledByLibCEC(command.destination))
+    return CEC_ABORT_REASON_INVALID_OPERAND;
+
+  if (command.parameters.size < 4)
+    return CEC_ABORT_REASON_INVALID_OPERAND;
+
+  // check whether the vendor id matches
+  if (command.parameters[0] != 0x00 ||
+      command.parameters[1] != 0x00 ||
+      command.parameters[2] != 0x39)
+    return CEC_ABORT_REASON_INVALID_OPERAND;
+
+  bool bHandled(false);
+  CCECClient* client = m_processor->GetClient(command.destination);
+  if (client)
+  {
+    switch (command.parameters[3])
+    {
+    // user control pressed
+    case CEC_OPCODE_USER_CONTROL_PRESSED:
+      if (command.parameters.size == 5)
+      {
+        bHandled = true;
+        switch (command.parameters[4])
+        {
+        // top menu -> root menu
+        case RL_KEY_TOP_MENU:
+          client->SetCurrentButton(CEC_USER_CONTROL_CODE_ROOT_MENU);
+          break;
+        // dvd menu -> contents menu
+        case RL_KEY_DVD_MENU:
+          client->SetCurrentButton(CEC_USER_CONTROL_CODE_CONTENTS_MENU);
+          break;
+        default:
+          bHandled = false;
+          break;
+        }
+      }
+      break;
+    // user control released
+    case CEC_OPCODE_USER_CONTROL_RELEASE:
+      client->AddKey();
+      bHandled = true;
+      break;
+    default:
+      break;
+    }
+  }
+
+  return bHandled ?
+      COMMAND_HANDLED :
+      CCECCommandHandler::HandleDeviceVendorCommandWithId(command);
+}
diff -Nru libcec-2.1.1/src/lib/implementations/RLCommandHandler.h libcec-2.1.4/src/lib/implementations/RLCommandHandler.h
--- libcec-2.1.1/src/lib/implementations/RLCommandHandler.h	2013-03-09 20:14:55.000000000 +0000
+++ libcec-2.1.4/src/lib/implementations/RLCommandHandler.h	2013-12-13 18:06:00.000000000 +0000
@@ -46,5 +46,6 @@
     virtual ~CRLCommandHandler(void) {};
 
     bool InitHandler(void);
+    int HandleDeviceVendorCommandWithId(const cec_command &command);
   };
 };
diff -Nru libcec-2.1.1/src/lib/implementations/SLCommandHandler.cpp libcec-2.1.4/src/lib/implementations/SLCommandHandler.cpp
--- libcec-2.1.1/src/lib/implementations/SLCommandHandler.cpp	2013-03-09 20:14:55.000000000 +0000
+++ libcec-2.1.4/src/lib/implementations/SLCommandHandler.cpp	2013-12-13 18:06:00.000000000 +0000
@@ -42,19 +42,18 @@
 using namespace CEC;
 using namespace PLATFORM;
 
-#define SL_COMMAND_UNKNOWN_01           0x01
-#define SL_COMMAND_UNKNOWN_02           0x02
-
 #define SL_COMMAND_TYPE_HDDRECORDER_DISC  0x01
 #define SL_COMMAND_TYPE_VCR               0x02
 #define SL_COMMAND_TYPE_DVDPLAYER         0x03
 #define SL_COMMAND_TYPE_HDDRECORDER_DISC2 0x04
 #define SL_COMMAND_TYPE_HDDRECORDER       0x05
 
-#define SL_COMMAND_REQUEST_POWER_STATUS 0xa0
+#define SL_COMMAND_INIT                 0x01
+#define SL_COMMAND_ACK_INIT             0x02
 #define SL_COMMAND_POWER_ON             0x03
 #define SL_COMMAND_CONNECT_REQUEST      0x04
 #define SL_COMMAND_SET_DEVICE_MODE      0x05
+#define SL_COMMAND_REQUEST_POWER_STATUS 0xa0
 
 #define LIB_CEC     m_busDevice->GetProcessor()->GetLib()
 #define ToString(p) LIB_CEC->ToString(p)
@@ -65,8 +64,7 @@
                                      int8_t iTransmitRetries /* = CEC_DEFAULT_TRANSMIT_RETRIES */,
                                      int64_t iActiveSourcePending /* = 0 */) :
     CCECCommandHandler(busDevice, iTransmitTimeout, iTransmitWait, iTransmitRetries, iActiveSourcePending),
-    m_bSLEnabled(false),
-    m_bActiveSourceSent(false)
+    m_bSLEnabled(false)
 {
   m_vendorId = CEC_VENDOR_LG;
 
@@ -98,74 +96,20 @@
       primary->SetVendorId(CEC_VENDOR_LG);
       primary->ReplaceHandler(false);
     }
-
-    if (m_busDevice->GetLogicalAddress() == CECDEVICE_TV)
-    {
-      /* start as 'in transition standby->on' */
-      primary->SetPowerStatus(CEC_POWER_STATUS_IN_TRANSITION_STANDBY_TO_ON);
-      primary->TransmitPowerState(CECDEVICE_TV, false);
-
-      /* send the vendor id */
-      primary->TransmitVendorID(CECDEVICE_BROADCAST, false, false);
-    }
   }
 
   return true;
 }
 
-int CSLCommandHandler::HandleActiveSource(const cec_command &command)
-{
-  if (command.parameters.size == 2)
-  {
-    uint16_t iAddress = ((uint16_t)command.parameters[0] << 8) | ((uint16_t)command.parameters[1]);
-    CCECBusDevice *device = m_processor->GetDeviceByPhysicalAddress(iAddress);
-    if (device)
-      device->MarkAsActiveSource();
-
-    {
-      CLockObject lock(m_SLMutex);
-      m_bActiveSourceSent = false;
-    }
-
-    return COMMAND_HANDLED;
-  }
-
-  return CEC_ABORT_REASON_INVALID_OPERAND;
-
-}
-
-int CSLCommandHandler::HandleDeviceVendorId(const cec_command &command)
-{
-  SetVendorId(command);
-
-  if (!SLInitialised() && command.initiator == CECDEVICE_TV)
-  {
-    CCECBusDevice *destination = m_processor->GetDevice(command.destination);
-    if (destination && (destination->GetLogicalAddress() == CECDEVICE_BROADCAST || destination->IsHandledByLibCEC()))
-    {
-      cec_logical_address initiator = destination->GetLogicalAddress();
-      if (initiator == CECDEVICE_BROADCAST)
-        initiator = m_processor->GetPrimaryDevice()->GetLogicalAddress();
-
-      cec_command response;
-      cec_command::Format(response, initiator, command.initiator, CEC_OPCODE_FEATURE_ABORT);
-      Transmit(response, false, true);
-      return COMMAND_HANDLED;
-    }
-  }
-
-  return CCECCommandHandler::HandleDeviceVendorId(command);
-}
-
 int CSLCommandHandler::HandleVendorCommand(const cec_command &command)
 {
   if (!m_processor->IsHandledByLibCEC(command.destination))
     return true;
 
   if (command.parameters.size == 1 &&
-      command.parameters[0] == SL_COMMAND_UNKNOWN_01)
+      command.parameters[0] == SL_COMMAND_INIT)
   {
-    HandleVendorCommand01(command);
+    HandleVendorCommandSLInit(command);
     return COMMAND_HANDLED;
   }
   else if (command.parameters.size == 2 &&
@@ -190,21 +134,26 @@
   return CCECCommandHandler::HandleVendorCommand(command);
 }
 
-void CSLCommandHandler::HandleVendorCommand01(const cec_command &command)
+void CSLCommandHandler::HandleVendorCommandSLInit(const cec_command &command)
 {
-  m_processor->GetPrimaryDevice()->SetPowerStatus(CEC_POWER_STATUS_IN_TRANSITION_STANDBY_TO_ON);
-  TransmitVendorCommand0205(command.destination, command.initiator);
-
   CCECBusDevice* dev = m_processor->GetDevice(command.destination);
-  if (dev && dev->IsHandledByLibCEC() && dev->IsActiveSource())
-    dev->TransmitActiveSource(false);
+  if (dev && dev->IsHandledByLibCEC())
+  {
+    if (!dev->IsActiveSource())
+    {
+      dev->SetPowerStatus(CEC_POWER_STATUS_STANDBY);
+      dev->TransmitPowerState(command.initiator, true);
+    }
+
+    TransmitVendorCommandSLAckInit(command.destination, command.initiator);
+  }
 }
 
-void CSLCommandHandler::TransmitVendorCommand0205(const cec_logical_address iSource, const cec_logical_address iDestination)
+void CSLCommandHandler::TransmitVendorCommandSLAckInit(const cec_logical_address iSource, const cec_logical_address iDestination)
 {
   cec_command response;
   cec_command::Format(response, iSource, iDestination, CEC_OPCODE_VENDOR_COMMAND);
-  response.PushBack(SL_COMMAND_UNKNOWN_02);
+  response.PushBack(SL_COMMAND_ACK_INIT);
   response.PushBack(SL_COMMAND_TYPE_HDDRECORDER);
 
   Transmit(response, false, true);
@@ -228,10 +177,9 @@
     device->SetPowerStatus(CEC_POWER_STATUS_ON);
     device->TransmitPowerState(command.initiator, false);
     device->TransmitPhysicalAddress(false);
-    {
-      CLockObject lock(m_SLMutex);
-      m_bActiveSourceSent = false;
-    }
+
+    if (device->IsActiveSource())
+      ActivateSource();
   }
 }
 void CSLCommandHandler::HandleVendorCommandPowerOnStatus(const cec_command &command)
@@ -253,7 +201,15 @@
   SetSLInitialised();
   TransmitVendorCommandSetDeviceMode(command.destination, command.initiator, CEC_DEVICE_TYPE_RECORDING_DEVICE);
 
-  ActivateSource();
+
+  if (m_processor->IsActiveSource(command.destination) && m_processor->IsHandledByLibCEC(command.destination))
+  {
+    CCECBusDevice* dev = m_processor->GetDevice(command.destination);
+    CCECPlaybackDevice* pb = dev->AsPlaybackDevice();
+    if (pb)
+      pb->TransmitDeckStatus(command.initiator, true);
+    dev->TransmitPowerState(command.initiator, true);
+  }
 }
 
 void CSLCommandHandler::TransmitVendorCommandSetDeviceMode(const cec_logical_address iSource, const cec_logical_address iDestination, const cec_device_type type)
@@ -279,8 +235,7 @@
   if (command.parameters[0] == CEC_STATUS_REQUEST_ON)
   {
     device->TransmitDeckStatus(command.initiator, true);
-    if (!ActiveSourceSent())
-      ActivateSource();
+    ActivateSource();
     return COMMAND_HANDLED;
   }
   else if (command.parameters[0] == CEC_STATUS_REQUEST_ONCE)
@@ -304,20 +259,10 @@
     }
     else
     {
-      if (!ActiveSourceSent())
-      {
-        device->SetPowerStatus(CEC_POWER_STATUS_IN_TRANSITION_STANDBY_TO_ON);
-        device->TransmitPowerState(command.initiator, true);
-        ActivateSource();
-      }
-      else if (m_resetPowerState.IsSet() && m_resetPowerState.TimeLeft() > 0)
+      if (m_resetPowerState.IsSet() && m_resetPowerState.TimeLeft() > 0)
       {
         /* TODO assume that we've bugged out. the return button no longer works after this */
         LIB_CEC->AddLog(CEC_LOG_WARNING, "FIXME: LG seems to have bugged out. resetting to 'in transition standby to on'. the return button will not work");
-        {
-          CLockObject lock(m_SLMutex);
-          m_bActiveSourceSent = false;
-        }
         device->SetPowerStatus(CEC_POWER_STATUS_IN_TRANSITION_STANDBY_TO_ON);
         device->TransmitPowerState(command.initiator, true);
         device->SetPowerStatus(CEC_POWER_STATUS_ON);
@@ -340,22 +285,25 @@
 {
   if (m_processor->CECInitialised())
   {
-    if (ActiveSourceSent())
-      LIB_CEC->AddLog(CEC_LOG_DEBUG, ">> %i requests active source, ignored", (uint8_t) command.initiator);
-    else
-      ActivateSource();
-    return COMMAND_HANDLED;
+    if (!SLInitialised())
+      TransmitVendorCommandSLAckInit(m_processor->GetPrimaryDevice()->GetLogicalAddress(), command.initiator);
+    CCECCommandHandler::HandleRequestActiveSource(command);
   }
   return CEC_ABORT_REASON_NOT_IN_CORRECT_MODE_TO_RESPOND;
 }
 
 int CSLCommandHandler::HandleFeatureAbort(const cec_command &command)
 {
-  if (command.parameters.size == 0 && m_processor->GetPrimaryDevice()->GetCurrentPowerStatus() == CEC_POWER_STATUS_ON && !SLInitialised() &&
+  CCECBusDevice* primary = m_processor->GetPrimaryDevice();
+  if (command.parameters.size == 0 && primary->GetLogicalAddress() != CECDEVICE_UNKNOWN &&
+      primary->GetCurrentPowerStatus() == CEC_POWER_STATUS_ON && !SLInitialised() &&
       command.initiator == CECDEVICE_TV)
   {
-    m_processor->GetPrimaryDevice()->TransmitPowerState(command.initiator, false);
-    m_processor->GetPrimaryDevice()->TransmitVendorID(CECDEVICE_BROADCAST, false, false);
+    if (!SLInitialised() && m_processor->IsActiveSource(command.destination))
+    {
+      TransmitVendorCommandSLAckInit(command.destination, command.initiator);
+      return COMMAND_HANDLED;
+    }
   }
 
   return CCECCommandHandler::HandleFeatureAbort(command);
@@ -363,11 +311,7 @@
 
 int CSLCommandHandler::HandleStandby(const cec_command &command)
 {
-  if (command.initiator == CECDEVICE_TV)
-  {
-    CLockObject lock(m_SLMutex);
-    m_bActiveSourceSent = false;
-  }
+  ResetSLState();
 
   return CCECCommandHandler::HandleStandby(command);
 }
@@ -377,7 +321,6 @@
   LIB_CEC->AddLog(CEC_LOG_NOTICE, "resetting SL initialised state");
   CLockObject lock(m_SLMutex);
   m_bSLEnabled = false;
-  m_bActiveSourceSent = false;
   m_processor->GetPrimaryDevice()->SetPowerStatus(CEC_POWER_STATUS_IN_TRANSITION_STANDBY_TO_ON);
 }
 
@@ -394,12 +337,6 @@
   return m_bSLEnabled;
 }
 
-bool CSLCommandHandler::ActiveSourceSent(void)
-{
-  CLockObject lock(m_SLMutex);
-  return m_bActiveSourceSent;
-}
-
 bool CSLCommandHandler::PowerOn(const cec_logical_address iInitiator, const cec_logical_address iDestination)
 {
   if (iDestination != CECDEVICE_TV)
@@ -419,9 +356,73 @@
   return CCECCommandHandler::PowerOn(iInitiator, iDestination);
 }
 
-void CSLCommandHandler::VendorPreActivateSourceHook(void)
+bool CSLCommandHandler::ActivateSource(bool bTransmitDelayedCommandsOnly /* = false */)
 {
-  CCECPlaybackDevice *device = m_busDevice->AsPlaybackDevice();
-  if (device)
-    device->SetDeckStatus(!device->IsActiveSource() ? CEC_DECK_INFO_OTHER_STATUS : CEC_DECK_INFO_OTHER_STATUS_LG);
+  if (m_busDevice->IsActiveSource() &&
+      m_busDevice->IsHandledByLibCEC())
+  {
+    {
+      CLockObject lock(m_mutex);
+      // check if we need to send a delayed source switch
+      if (bTransmitDelayedCommandsOnly)
+      {
+        if (m_iActiveSourcePending == 0 || GetTimeMs() < m_iActiveSourcePending)
+          return false;
+
+#ifdef CEC_DEBUGGING
+        LIB_CEC->AddLog(CEC_LOG_DEBUG, "transmitting delayed activate source command");
+#endif
+      }
+    }
+
+    CCECPlaybackDevice *device = m_busDevice->AsPlaybackDevice();
+    if (device)
+      device->SetDeckStatus(!device->IsActiveSource() ? CEC_DECK_INFO_OTHER_STATUS : CEC_DECK_INFO_OTHER_STATUS_LG);
+
+    // power on the TV
+    CCECBusDevice* tv = m_processor->GetDevice(CECDEVICE_TV);
+    bool bTvPresent = (tv && tv->GetStatus() == CEC_DEVICE_STATUS_PRESENT);
+    bool bActiveSourceFailed(false);
+    if (bTvPresent)
+    {
+      bActiveSourceFailed = !device->TransmitImageViewOn();
+    }
+    else
+    {
+      LIB_CEC->AddLog(CEC_LOG_DEBUG, "TV not present, not sending 'image view on'");
+    }
+
+    // check if we're allowed to switch sources
+    bool bSourceSwitchAllowed = SourceSwitchAllowed();
+    if (!bSourceSwitchAllowed)
+      LIB_CEC->AddLog(CEC_LOG_DEBUG, "source switch is currently not allowed by command handler");
+
+    // switch sources (if allowed)
+    if (!bActiveSourceFailed && bSourceSwitchAllowed)
+    {
+      bActiveSourceFailed = !m_busDevice->TransmitActiveSource(false);
+    }
+
+    // retry later
+    if (bActiveSourceFailed || !bSourceSwitchAllowed)
+    {
+      LIB_CEC->AddLog(CEC_LOG_DEBUG, "failed to make '%s' the active source. will retry later", m_busDevice->GetLogicalAddressName());
+      int64_t now(GetTimeMs());
+      CLockObject lock(m_mutex);
+      if (m_iActiveSourcePending == 0 || m_iActiveSourcePending < now)
+        m_iActiveSourcePending = now + (int64_t)CEC_ACTIVE_SOURCE_SWITCH_RETRY_TIME_MS;
+      return false;
+    }
+    else
+    {
+      CLockObject lock(m_mutex);
+      // clear previous pending active source command
+      m_iActiveSourcePending = 0;
+    }
+
+    // mark the handler as initialised
+    CLockObject lock(m_mutex);
+    m_bHandlerInited = true;
+  }
+  return true;
 }
diff -Nru libcec-2.1.1/src/lib/implementations/SLCommandHandler.h libcec-2.1.4/src/lib/implementations/SLCommandHandler.h
--- libcec-2.1.1/src/lib/implementations/SLCommandHandler.h	2013-03-09 20:14:55.000000000 +0000
+++ libcec-2.1.4/src/lib/implementations/SLCommandHandler.h	2013-12-13 18:06:00.000000000 +0000
@@ -46,14 +46,13 @@
     virtual ~CSLCommandHandler(void) {};
 
     bool InitHandler(void);
+    bool ActivateSource(bool bTransmitDelayedCommandsOnly = false);
 
   protected:
-    int HandleActiveSource(const cec_command &command);
-    int HandleDeviceVendorId(const cec_command &command);
     int HandleVendorCommand(const cec_command &command);
 
-    void HandleVendorCommand01(const cec_command &command);
-    void TransmitVendorCommand0205(const cec_logical_address iSource, const cec_logical_address iDestination);
+    void HandleVendorCommandSLInit(const cec_command &command);
+    void TransmitVendorCommandSLAckInit(const cec_logical_address iSource, const cec_logical_address iDestination);
 
     void HandleVendorCommandPowerOn(const cec_command &command);
     void HandleVendorCommandPowerOnStatus(const cec_command &command);
@@ -68,17 +67,12 @@
     int HandleStandby(const cec_command &command);
     bool TransmitMenuState(const cec_logical_address UNUSED(iInitiator), const cec_logical_address UNUSED(iDestination), cec_menu_state UNUSED(menuState), bool UNUSED(bIsReply)) { return true; }
     bool PowerOn(const cec_logical_address iInitiator, const cec_logical_address iDestination);
-    int HandleVendorRemoteButtonUp(const cec_command& command) { return HandleUserControlRelease(command); }
 
     void ResetSLState(void);
     bool SLInitialised(void);
     void SetSLInitialised(void);
-    bool ActiveSourceSent(void);
-
-    void VendorPreActivateSourceHook(void);
 
     bool               m_bSLEnabled;
-    bool               m_bActiveSourceSent;
     PLATFORM::CTimeout m_resetPowerState;
     PLATFORM::CMutex   m_SLMutex;
   };
diff -Nru libcec-2.1.1/src/lib/implementations/VLCommandHandler.cpp libcec-2.1.4/src/lib/implementations/VLCommandHandler.cpp
--- libcec-2.1.1/src/lib/implementations/VLCommandHandler.cpp	2013-03-09 20:14:55.000000000 +0000
+++ libcec-2.1.4/src/lib/implementations/VLCommandHandler.cpp	2013-12-13 18:06:00.000000000 +0000
@@ -106,23 +106,28 @@
       command.parameters[2] != 0x45)
     return CEC_ABORT_REASON_INVALID_OPERAND;
 
-  // XXX this is also sent when the TV is powered off
-#if 0
   if (command.initiator == CECDEVICE_TV &&
       command.parameters.At(3) == VL_UNKNOWN1)
   {
-    // set the power up event time
+    if (command.parameters.size >= 5 && command.parameters.At(4) == 0x05)
     {
-      CLockObject lock(m_mutex);
-      if (m_iPowerUpEventReceived == 0)
-        m_iPowerUpEventReceived = GetTimeMs();
+      // set the power up event time
+      {
+        CLockObject lock(m_mutex);
+        if (m_iPowerUpEventReceived == 0)
+          m_iPowerUpEventReceived = GetTimeMs();
+      }
+      // mark the TV as powered on
+      m_processor->GetTV()->SetPowerStatus(CEC_POWER_STATUS_ON);
+
+      CCECBusDevice* dev = m_processor->GetPrimaryDevice();
+      if (dev && dev->IsActiveSource())
+        dev->TransmitActiveSource(false);
+
+      return COMMAND_HANDLED;
     }
-    // mark the TV as powered on
-    m_processor->GetTV()->SetPowerStatus(CEC_POWER_STATUS_ON);
   }
-  else
-#endif
-    if (command.initiator == CECDEVICE_TV &&
+  else if (command.initiator == CECDEVICE_TV &&
       command.destination == CECDEVICE_BROADCAST &&
       command.parameters.At(3) == VL_POWER_CHANGE)
   {
@@ -248,10 +253,15 @@
   if (command.parameters.size == 3 &&
       command.parameters[0] == 0x10 &&
       command.parameters[1] == 0x01 &&
-      command.parameters[2] == 0x05 &&
       m_processor->IsHandledByLibCEC(command.destination))
   {
+    // XXX i've seen 0x05 and 0x03 as third param. these probably indicate different types of TVs/capabilities
+    // when we feature abort this, then the TV will try the same thing with a vendor command with id
     SendVendorCommandCapabilities(m_processor->GetLogicalAddress(), command.initiator);
+
+    CCECBusDevice* dev = m_processor->GetDevice(command.destination);
+    if (dev && dev->IsActiveSource())
+      dev->ActivateSource(500);
     return COMMAND_HANDLED;
   }
 
@@ -261,7 +271,7 @@
 bool CVLCommandHandler::SourceSwitchAllowed(void)
 {
   if (!PowerUpEventReceived())
-    TransmitRequestPowerStatus(m_processor->GetPrimaryDevice()->GetLogicalAddress(), CECDEVICE_TV, false);
+    TransmitRequestPowerStatus(m_processor->GetPrimaryDevice()->GetLogicalAddress(), CECDEVICE_TV, false, false);
 
   return PowerUpEventReceived();
 }
diff -Nru libcec-2.1.1/src/lib/platform/posix/serialport.cpp libcec-2.1.4/src/lib/platform/posix/serialport.cpp
--- libcec-2.1.1/src/lib/platform/posix/serialport.cpp	2013-03-09 20:14:55.000000000 +0000
+++ libcec-2.1.4/src/lib/platform/posix/serialport.cpp	2013-12-13 18:06:00.000000000 +0000
@@ -61,8 +61,7 @@
   #if !defined(__APPLE__) && !defined(__FreeBSD__) && defined(HAVE_LOCKDEV)
   return dev_unlock(strDeviceName, 0) == 0;
   #else
-  void *tmp = (void*)strDeviceName; // silence unused warning
-  tmp = NULL;
+  (void)strDeviceName; // silence unused warning
   return true;
   #endif
 }
diff -Nru libcec-2.1.1/src/testclient/main.cpp libcec-2.1.4/src/testclient/main.cpp
--- libcec-2.1.1/src/testclient/main.cpp	2013-03-09 20:14:55.000000000 +0000
+++ libcec-2.1.4/src/testclient/main.cpp	2013-12-13 18:06:00.000000000 +0000
@@ -43,6 +43,7 @@
 #include "../lib/platform/os.h"
 #include "../lib/implementations/CECCommandHandler.h"
 #include "../lib/platform/util/StdString.h"
+#include "../lib/platform/threads/threads.h"
 
 using namespace CEC;
 using namespace std;
@@ -52,6 +53,8 @@
 
 #include "../../include/cecloader.h"
 
+static void PrintToStdOut(const char *strFormat, ...);
+
 ICECCallbacks        g_callbacks;
 libcec_configuration g_config;
 int                  g_cecLogLevel(-1);
@@ -63,8 +66,38 @@
 bool                 g_bExit(false);
 bool                 g_bHardExit(false);
 CMutex               g_outputMutex;
+ICECAdapter*         g_parser;
+
+class CReconnect : public PLATFORM::CThread
+{
+public:
+  static CReconnect& Get(void)
+  {
+    static CReconnect _instance;
+    return _instance;
+  }
+
+  virtual ~CReconnect(void) {}
+
+  void* Process(void)
+  {
+    if (g_parser)
+    {
+      g_parser->Close();
+      if (!g_parser->Open(g_strPort.c_str()))
+      {
+        PrintToStdOut("Failed to reconnect\n");
+        g_bExit = true;
+      }
+    }
+    return NULL;
+  }
+
+private:
+  CReconnect(void) {}
+};
 
-inline void PrintToStdOut(const char *strFormat, ...)
+static void PrintToStdOut(const char *strFormat, ...)
 {
   CStdString strLog;
 
@@ -186,8 +219,11 @@
   switch (type)
   {
   case CEC_ALERT_CONNECTION_LOST:
-    PrintToStdOut("Connection lost - exiting\n");
-    g_bExit = true;
+    if (!CReconnect::Get().IsRunning())
+    {
+      PrintToStdOut("Connection lost - trying to reconnect\n");
+      CReconnect::Get().CreateThread(false);
+    }
     break;
   default:
     break;
@@ -1190,8 +1226,8 @@
     g_config.deviceTypes.Add(CEC_DEVICE_TYPE_RECORDING_DEVICE);
   }
 
-  ICECAdapter *parser = LibCecInitialise(&g_config);
-  if (!parser)
+  g_parser = LibCecInitialise(&g_config);
+  if (!g_parser)
   {
 #ifdef __WINDOWS__
     cout << "Cannot load libcec.dll" << endl;
@@ -1199,19 +1235,19 @@
     cout << "Cannot load libcec.so" << endl;
 #endif
 
-    if (parser)
-      UnloadLibCec(parser);
+    if (g_parser)
+      UnloadLibCec(g_parser);
 
     return 1;
   }
 
   // init video on targets that need this
-  parser->InitVideoStandalone();
+  g_parser->InitVideoStandalone();
 
   if (!g_bSingleCommand)
   {
     CStdString strLog;
-    strLog.Format("CEC Parser created - libCEC version %s", parser->ToString((cec_server_version)g_config.serverVersion));
+    strLog.Format("CEC Parser created - libCEC version %s", g_parser->ToString((cec_server_version)g_config.serverVersion));
     cout << strLog.c_str() << endl;
 
     //make stdin non-blocking
@@ -1227,13 +1263,13 @@
     if (!g_bSingleCommand)
       cout << "no serial port given. trying autodetect: ";
     cec_adapter devices[10];
-    uint8_t iDevicesFound = parser->FindAdapters(devices, 10, NULL);
+    uint8_t iDevicesFound = g_parser->FindAdapters(devices, 10, NULL);
     if (iDevicesFound <= 0)
     {
       if (g_bSingleCommand)
         cout << "autodetect ";
       cout << "FAILED" << endl;
-      UnloadLibCec(parser);
+      UnloadLibCec(g_parser);
       return 1;
     }
     else
@@ -1249,10 +1285,10 @@
 
   PrintToStdOut("opening a connection to the CEC adapter...");
 
-  if (!parser->Open(g_strPort.c_str()))
+  if (!g_parser->Open(g_strPort.c_str()))
   {
     PrintToStdOut("unable to open the device on port %s", g_strPort.c_str());
-    UnloadLibCec(parser);
+    UnloadLibCec(g_parser);
     return 1;
   }
 
@@ -1265,7 +1301,7 @@
     getline(cin, input);
     cin.clear();
 
-    if (ProcessConsoleCommand(parser, input) && !g_bSingleCommand && !g_bExit && !g_bHardExit)
+    if (ProcessConsoleCommand(g_parser, input) && !g_bSingleCommand && !g_bExit && !g_bHardExit)
     {
       if (!input.empty())
         PrintToStdOut("waiting for input");
@@ -1277,8 +1313,8 @@
       CEvent::Sleep(50);
   }
 
-  parser->Close();
-  UnloadLibCec(parser);
+  g_parser->Close();
+  UnloadLibCec(g_parser);
 
   if (g_logOutput.is_open())
     g_logOutput.close();