plex-home-theater/trunk/plex-libcec.patch

   1 diff -rupN plex-home-theater-public-1.4.1.469-47a90f01.orig/system/peripherals.xml plex-home-theater-public-1.4.1.469-47a90f01/system/peripherals.xml
   2 --- plex-home-theater-public-1.4.1.469-47a90f01.orig/system/peripherals.xml     2015-07-22 11:09:33.213307552 +0200
   3 +++ plex-home-theater-public-1.4.1.469-47a90f01/system/peripherals.xml  2015-07-22 11:09:47.349594239 +0200
   4 @@ -28,7 +28,7 @@
   5      <setting key="device_type" type="int" value="1" configurable="0" />
   6      <setting key="wake_devices_advanced" type="string" value="" configurable="0" />
   7      <setting key="standby_devices_advanced" type="string" value="" configurable="0" />
   8 -    <setting key="double_tap_timeout_ms" type="int" min="0" value="2000" configurable="0" />
   9 +    <setting key="double_tap_timeout_ms" type="int" min="0" value="300" configurable="0" />
  10    </peripheral>
  11
  12    <peripheral vendor_product="2548:1001,2548:1002" bus="usb" name="Pulse-Eight CEC Adapter" mapTo="cec">
  13 diff -rupN plex-home-theater-public-1.4.1.469-47a90f01.orig/xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp plex-home-theater-public-1.4.1.469-47a90f01/xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp
  14 --- plex-home-theater-public-1.4.1.469-47a90f01.orig/xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp  2015-07-22 11:09:32.826651274 +0200
  15 +++ plex-home-theater-public-1.4.1.469-47a90f01/xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp       2015-07-22 11:09:47.349594239 +0200
  16 @@ -101,6 +101,8 @@ bool CPeripheralBusCEC::PerformDeviceSca
  17        break;
  18      case ADAPTERTYPE_RPI:
  19        result.m_mappedBusType = PERIPHERAL_BUS_RPI;
  20 +      // the Pi's adapter cannot be removed, no need to rescan
  21 +      m_bNeedsPolling = false;
  22        break;
  23      default:
  24        break;
  25 diff -rupN plex-home-theater-public-1.4.1.469-47a90f01.orig/xbmc/peripherals/devices/PeripheralCecAdapter.cpp plex-home-theater-public-1.4.1.469-47a90f01/xbmc/peripherals/devices/PeripheralCecAdapter.cpp
  26 --- plex-home-theater-public-1.4.1.469-47a90f01.orig/xbmc/peripherals/devices/PeripheralCecAdapter.cpp  2015-07-22 11:09:32.826651274 +0200
  27 +++ plex-home-theater-public-1.4.1.469-47a90f01/xbmc/peripherals/devices/PeripheralCecAdapter.cpp       2015-07-22 11:13:05.310907421 +0200
  28 @@ -282,7 +283,7 @@ bool CPeripheralCecAdapter::InitialiseFe
  29      }
  30      else
  31      {
  32 -      CLog::Log(LOGDEBUG, "%s - using libCEC v%s", __FUNCTION__, m_cecAdapter->ToString((cec_server_version)m_configuration.serverVersion));
  33 +      CLog::Log(LOGDEBUG, "%s - using libCEC v%s", __FUNCTION__, m_cecAdapter->ToString((cec_version)m_configuration.serverVersion));
  34        SetVersionInfo(m_configuration);
  35      }
  36
  37 @@ -295,7 +296,7 @@ bool CPeripheralCecAdapter::InitialiseFe
  38
  39  void CPeripheralCecAdapter::SetVersionInfo(const libcec_configuration &configuration)
  40  {
  41 -  m_strVersionInfo.Format("libCEC %s - firmware v%d", m_cecAdapter->ToString((cec_server_version)configuration.serverVersion), configuration.iFirmwareVersion);
  42 +  m_strVersionInfo.Format("libCEC %s - firmware v%d", m_cecAdapter->ToString((cec_version)configuration.serverVersion), configuration.iFirmwareVersion);
  43
  44    // append firmware build date
  45    if (configuration.iFirmwareBuildDate != CEC_FW_BUILD_UNKNOWN)
  46 @@ -1303,7 +1304,7 @@ void CPeripheralCecAdapter::SetConfigura
  47  void CPeripheralCecAdapter::SetConfigurationFromSettings(void)
  48  {
  49    // use the same client version as libCEC version
  50 -  m_configuration.clientVersion = CEC_CLIENT_VERSION_CURRENT;
  51 +  m_configuration.clientVersion = LIBCEC_VERSION_CURRENT;
  52
  53    // device name 'XBMC'
  54    snprintf(m_configuration.strDeviceName, 13, "%s", GetSettingString("device_name").c_str());
  55 @@ -1379,7 +1380,7 @@ void CPeripheralCecAdapter::SetConfigura
  56    m_configuration.bShutdownOnStandby = iStandbyAction == 13005 ? 1 : 0;
  57
  58    // double tap prevention timeout in ms
  59 -  m_configuration.iDoubleTapTimeoutMs = GetSettingInt("double_tap_timeout_ms");
  60 +  m_configuration.iDoubleTapTimeout50Ms = GetSettingInt("double_tap_timeout_ms") / 50;
  61  }
  62
  63  void CPeripheralCecAdapter::ReadLogicalAddresses(const CStdString &strString, cec_logical_addresses &addresses)