From e9b788558834e8a5c81d946589ca29318eadde5d Mon Sep 17 00:00:00 2001 From: Maschell Date: Mon, 30 Dec 2024 13:30:21 +0100 Subject: [PATCH] Hold duration is now measured in ms instead of frames --- include/buttoncombo/defines.h | 2 +- include/buttoncombo/manager.h | 4 ++-- source/utils.cpp | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/buttoncombo/defines.h b/include/buttoncombo/defines.h index 419265e..c868223 100644 --- a/include/buttoncombo/defines.h +++ b/include/buttoncombo/defines.h @@ -150,7 +150,7 @@ typedef struct ButtonComboModule_ButtonComboOptions { typedef struct ButtonComboModule_ButtonComboInfoEx { ButtonComboModule_ComboType type; ButtonComboModule_ButtonComboOptions basicCombo; - uint32_t optionalHoldForXFrames; + uint32_t optionalHoldForXMs; } ButtonComboModule_ButtonComboInfoEx; typedef struct ButtonComboModule_ComboOptions { diff --git a/include/buttoncombo/manager.h b/include/buttoncombo/manager.h index df31f47..29cd321 100644 --- a/include/buttoncombo/manager.h +++ b/include/buttoncombo/manager.h @@ -59,7 +59,7 @@ ButtonComboModule_Error ButtonComboModule_AddButtonComboSimplePressDown(const ch ButtonComboModule_Error ButtonComboModule_AddButtonComboSimpleHold(const char *label, ButtonComboModule_Buttons buttonCombo, - uint32_t holdDurationInFrames, + uint32_t holdDurationInMs, ButtonComboModule_ComboCallback callback, void *context, ButtonComboModule_ComboHandle *handleOut); @@ -103,7 +103,7 @@ ButtonComboModule_Error ButtonComboModule_UpdateButtonCombo(ButtonComboModule_Co ButtonComboModule_ComboStatus *outStatus); ButtonComboModule_Error ButtonComboModule_UpdateHoldDuration(ButtonComboModule_ComboHandle handle, - uint32_t holdDurationInFrames); + uint32_t holdDurationInMs); ButtonComboModule_Error ButtonComboModule_GetButtonComboMeta(ButtonComboModule_ComboHandle handle, ButtonComboModule_MetaOptionsOut *outOptions); diff --git a/source/utils.cpp b/source/utils.cpp index 9d7c027..d46f0b3 100644 --- a/source/utils.cpp +++ b/source/utils.cpp @@ -16,7 +16,7 @@ static ButtonComboModule_Error (*sBCMUpdateButtonComboMeta)(ButtonComboModule_Co static ButtonComboModule_Error (*sBCMUpdateButtonComboCallback)(ButtonComboModule_ComboHandle handle, const ButtonComboModule_CallbackOptions *options) = nullptr; static ButtonComboModule_Error (*sBCMUpdateControllerMask)(ButtonComboModule_ComboHandle handle, ButtonComboModule_ControllerTypes controllerMask, ButtonComboModule_ComboStatus *outStatus) = nullptr; static ButtonComboModule_Error (*sBCMUpdateButtonCombo)(ButtonComboModule_ComboHandle handle, ButtonComboModule_Buttons combo, ButtonComboModule_ComboStatus *outStatus) = nullptr; -static ButtonComboModule_Error (*sBCMUpdateHoldDuration)(ButtonComboModule_ComboHandle handle, uint32_t holdDurationInFrames) = nullptr; +static ButtonComboModule_Error (*sBCMUpdateHoldDuration)(ButtonComboModule_ComboHandle handle, uint32_t holdDurationInMs) = nullptr; static ButtonComboModule_Error (*sBCMGetButtonComboMeta)(ButtonComboModule_ComboHandle handle, ButtonComboModule_MetaOptionsOut *outOptions) = nullptr; static ButtonComboModule_Error (*sBCMGetButtonComboCallback)(ButtonComboModule_ComboHandle handle, ButtonComboModule_CallbackOptions *outOptions) = nullptr; static ButtonComboModule_Error (*sBCMGetButtonComboInfoEx)(ButtonComboModule_ComboHandle handle, ButtonComboModule_ButtonComboInfoEx *outOptions) = nullptr; @@ -210,7 +210,7 @@ ButtonComboModule_Error ButtonComboModule_AddButtonComboSimplePressDown( ButtonComboModule_Error ButtonComboModule_AddButtonComboSimpleHold( const char *label, const ButtonComboModule_Buttons buttonCombo, - const uint32_t holdDurationInFrames, + const uint32_t holdDurationInMs, const ButtonComboModule_ComboCallback callback, void *context, ButtonComboModule_ComboHandle *outHandle, @@ -219,7 +219,7 @@ ButtonComboModule_Error ButtonComboModule_AddButtonComboSimpleHold( options.buttonComboOptions.type = BUTTON_COMBO_MODULE_TYPE_HOLD; options.buttonComboOptions.basicCombo.combo = buttonCombo; options.buttonComboOptions.basicCombo.controllerMask = BUTTON_COMBO_MODULE_CONTROLLER_ALL; - options.buttonComboOptions.optionalHoldForXFrames = holdDurationInFrames; + options.buttonComboOptions.optionalHoldForXMs = holdDurationInMs; return ButtonComboModule_AddButtonCombo(&options, outHandle, outStatus); } @@ -340,7 +340,7 @@ ButtonComboModule_Error ButtonComboModule_UpdateButtonCombo(const ButtonComboMod } ButtonComboModule_Error ButtonComboModule_UpdateHoldDuration(const ButtonComboModule_ComboHandle handle, - const uint32_t holdDurationInFrames) { + const uint32_t holdDurationInMs) { if (sButtonComboModuleVersion == BUTTON_COMBO_MODULE_API_VERSION_ERROR) { return BUTTON_COMBO_MODULE_ERROR_LIB_UNINITIALIZED; } @@ -352,7 +352,7 @@ ButtonComboModule_Error ButtonComboModule_UpdateHoldDuration(const ButtonComboMo return BUTTON_COMBO_MODULE_ERROR_INVALID_ARGUMENT; } - return sBCMUpdateHoldDuration(handle, holdDurationInFrames); + return sBCMUpdateHoldDuration(handle, holdDurationInMs); } ButtonComboModule_Error ButtonComboModule_GetButtonComboMeta(const ButtonComboModule_ComboHandle handle,