Skip to content

Hold duration is now measured in ms instead of frames #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Maschell merged 1 commit into from
Dec 30, 2024
Merged

Hold duration is now measured in ms instead of frames #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/buttoncombo/defines.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions include/buttoncombo/manager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
10 changes: 5 additions & 5 deletions source/utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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,
Expand All @@ -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);
}
Expand Down Expand Up @@ -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;
}
Expand All @@ -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,
Expand Down