Merge pull request #2637 from dagwieers/rescan-interval

Raise USB and CEC rescan interval to 5 seconds

diff --cc xbmc/peripherals/bus/PeripheralBus.cpp
index e952f2e,f0219f1..15e3d8c
--- 1/xbmc/peripherals/bus/PeripheralBus.cpp
--- 2/xbmc/peripherals/bus/PeripheralBus.cpp
+++ b/xbmc/peripherals/bus/PeripheralBus.cpp
@@@ -27,10 -27,10 +27,10 @@@
  using namespace std;
  using namespace PERIPHERALS;
  
- #define PERIPHERAL_DEFAULT_RESCAN_INTERVAL 1000
+ #define PERIPHERAL_DEFAULT_RESCAN_INTERVAL 5000
  
 -CPeripheralBus::CPeripheralBus(CPeripherals *manager, PeripheralBusType type) :
 -    CThread("PeripheralBus"),
 +CPeripheralBus::CPeripheralBus(const CStdString &threadname, CPeripherals *manager, PeripheralBusType type) :
 +    CThread(threadname),
      m_iRescanTime(PERIPHERAL_DEFAULT_RESCAN_INTERVAL),
      m_bInitialised(false),
      m_bIsStarted(false),

diff --cc xbmc/peripherals/bus/PeripheralBus.h
Simple merge

diff --cc xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp
Simple merge