diff options
| author | Marquise Stein <themagnificentmrb@gmail.com> | 2020-10-28 06:05:10 -0700 |
|---|---|---|
| committer | Garrett Brown <themagnificentmrb@gmail.com> | 2020-10-29 16:43:00 -0700 |
| commit | dc6414ad3189ea47d68c5752841a2828071c323a (patch) | |
| tree | 12803cd06bb4a6db0453c6e8fdc53040186cd045 | |
| parent | 6860a815b42d750553d0d4d61dd4d3f0462449d9 (diff) | |
Peripherals: Clang-format files
| -rw-r--r-- | xbmc/peripherals/addons/PeripheralAddon.cpp | 6 | ||||
| -rw-r--r-- | xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 7 | ||||
| -rw-r--r-- | xbmc/peripherals/devices/PeripheralCecAdapter.h | 5 |
3 files changed, 12 insertions, 6 deletions
diff --git a/xbmc/peripherals/addons/PeripheralAddon.cpp b/xbmc/peripherals/addons/PeripheralAddon.cpp index 8a9a942231..fcf8f4abd8 100644 --- a/xbmc/peripherals/addons/PeripheralAddon.cpp +++ b/xbmc/peripherals/addons/PeripheralAddon.cpp @@ -598,7 +598,7 @@ bool CPeripheralAddon::MapFeature(const CPeripheral* device, feature.ToStruct(addonFeature); LogError(retVal = m_struct.toAddon->map_features(&m_struct, &joystickStruct, - strControllerId.c_str(), 1, &addonFeature), + strControllerId.c_str(), 1, &addonFeature), "MapFeatures()"); kodi::addon::Joystick::FreeStruct(joystickStruct); @@ -629,7 +629,7 @@ bool CPeripheralAddon::GetIgnoredPrimitives(const CPeripheral* device, Primitive JOYSTICK_DRIVER_PRIMITIVE* pPrimitives = nullptr; LogError(retVal = m_struct.toAddon->get_ignored_primitives(&m_struct, &joystickStruct, - &primitiveCount, &pPrimitives), + &primitiveCount, &pPrimitives), "GetIgnoredPrimitives()"); kodi::addon::Joystick::FreeStruct(joystickStruct); @@ -671,7 +671,7 @@ bool CPeripheralAddon::SetIgnoredPrimitives(const CPeripheral* device, const unsigned int primitiveCount = static_cast<unsigned int>(primitives.size()); LogError(retVal = m_struct.toAddon->set_ignored_primitives(&m_struct, &joystickStruct, - primitiveCount, addonPrimitives), + primitiveCount, addonPrimitives), "SetIgnoredPrimitives()"); kodi::addon::Joystick::FreeStruct(joystickStruct); diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp index 160b13bcf5..d1ed1cfc98 100644 --- a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp +++ b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp @@ -97,8 +97,11 @@ void CPeripheralCecAdapter::ResetMembers(void) m_lastKeypress = 0; m_lastChange = VOLUME_CHANGE_NONE; m_iExitCode = EXITCODE_QUIT; - m_bIsMuted = false; //! @todo fetch the correct initial value when system audiostatus is - //! implemented in libCEC + + //! @todo fetch the correct initial value when system audiostatus is + //! implemented in libCEC + m_bIsMuted = false; + m_bGoingToStandby = false; m_bIsRunning = false; m_bDeviceRemoved = false; diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.h b/xbmc/peripherals/devices/PeripheralCecAdapter.h index ff57305d48..78ac76aeaf 100644 --- a/xbmc/peripherals/devices/PeripheralCecAdapter.h +++ b/xbmc/peripherals/devices/PeripheralCecAdapter.h @@ -89,7 +89,10 @@ public: CPeripheralBus* bus); ~CPeripheralCecAdapter(void) override; - void Announce(ANNOUNCEMENT::AnnouncementFlag flag, const std::string& sender, const std::string& message, const CVariant &data) override; + void Announce(ANNOUNCEMENT::AnnouncementFlag flag, + const std::string& sender, + const std::string& message, + const CVariant& data) override; // audio control bool HasAudioControl(void); |