toshiba: fixed - toshiba handler wasn't initialised, and toshiba uses more than one...

diff --git a/include/cectypes.h b/include/cectypes.h
index 95194f61ecfb8f6ed0eb53924faa212513477b6b..82bf6478cdf232b47e7da078a6dd1d0908437947 100644 (file)
--- a/include/cectypes.h
+++ b/include/cectypes.h
@@ -831,6 +831,7 @@ typedef enum cec_vendor_id
   CEC_VENDOR_LOEWE     = 0x000982,
   CEC_VENDOR_ONKYO     = 0x0009B0,
   CEC_VENDOR_MEDION    = 0x000CB8,
+  CEC_VENDOR_TOSHIBA2  = 0x000CE7,
   CEC_VENDOR_AKAI      = 0x0020C7,
   CEC_VENDOR_AOC       = 0x002467,
   CEC_VENDOR_PANASONIC = 0x008045,

diff --git a/src/lib/CECTypeUtils.h b/src/lib/CECTypeUtils.h
index 68ef5d1838406793d77021a14e9b19decf0f0cfa..b5541aa5d9f53b76ae91339882924488e7b2256b 100644 (file)
--- a/src/lib/CECTypeUtils.h
+++ b/src/lib/CECTypeUtils.h
@@ -493,6 +493,7 @@ namespace CEC
       case CEC_VENDOR_SONY:
         return "Sony";
       case CEC_VENDOR_TOSHIBA:
+      case CEC_VENDOR_TOSHIBA2:
         return "Toshiba";
       case CEC_VENDOR_AKAI:
         return "Akai";

diff --git a/src/lib/devices/CECBusDevice.cpp b/src/lib/devices/CECBusDevice.cpp
index e249a0b3c45dda279bc73182ce48dce7b26b396c..a2cfbee65da002f306f7c74961871ca87065ba0b 100644 (file)
--- a/src/lib/devices/CECBusDevice.cpp
+++ b/src/lib/devices/CECBusDevice.cpp
@@ -40,6 +40,7 @@
 #include "lib/implementations/SLCommandHandler.h"
 #include "lib/implementations/VLCommandHandler.h"
 #include "lib/implementations/PHCommandHandler.h"
+#include "lib/implementations/RLCommandHandler.h"
 #include "lib/LibCEC.h"
 #include "lib/CECTypeUtils.h"
 #include "lib/platform/util/timeutils.h"
@@ -136,6 +137,10 @@ bool CCECBusDevice::ReplaceHandler(bool bActivateSource /* = true */)
         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;
         default:
           m_handler = new CCECCommandHandler(this, iTransmitTimeout, iTransmitWait, iTransmitRetries, iActiveSourcePending);
           break;