The-Homebrew-Cloud/WiiUPluginSystem
2
0
Fork 0
mirror of https://github.com/wiiu-env/WiiUPluginSystem.git synced 2025-03-10 02:17:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

ButtonComboAPI: Fix function name of WUPSButtonComboAPI_AddButtonComboPressDownEx, update docs

Browse Source
This commit is contained in:
Maschell 2025-01-25 12:13:55 +01:00
parent 983616af90
commit cdb573b847
2 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
include/wups/button_combo/api.h
View File

@ -85,21 +85,21 @@ WUPSButtonCombo_Error WUPSButtonComboAPI_AddButtonCombo(const WUPSButtonCombo_Co
* @param outStatus (optional) The status of the combo will be stored here. Only if the status is WUPS_BUTTON_COMBO_COMBO_STATUS_VALID the combo is valid. Can be NULL. * @param outStatus (optional) The status of the combo will be stored here. Only if the status is WUPS_BUTTON_COMBO_COMBO_STATUS_VALID the combo is valid. Can be NULL.
* @return Returns WUPS_BUTTON_COMBO_ERROR_SUCCESS on success. Please check the outStatus as well. * @return Returns WUPS_BUTTON_COMBO_ERROR_SUCCESS on success. Please check the outStatus as well.
*/ */
WUPSButtonCombo_Error WUPSButtonComboAPI_AddButtonComboPressEx(const char *label, WUPSButtonCombo_Error WUPSButtonComboAPI_AddButtonComboPressDownEx(const char *label,
WUPSButtonCombo_ControllerTypes controllerMask, WUPSButtonCombo_ControllerTypes controllerMask,
WUPSButtonCombo_Buttons combo, WUPSButtonCombo_Buttons combo,
WUPSButtonCombo_ComboCallback callback, WUPSButtonCombo_ComboCallback callback,
void *context, void *context,
bool observer, bool observer,
WUPSButtonCombo_ComboHandle *outHandle, WUPSButtonCombo_ComboHandle *outHandle,
WUPSButtonCombo_ComboStatus *outStatus); WUPSButtonCombo_ComboStatus *outStatus);
/** /**
* Wrapper for `WUPSButtonComboAPI_AddButtonComboPressDown` with * Wrapper for `WUPSButtonComboAPI_AddButtonComboPressDownEx` with
* - `observer` set to "true" * - `observer` set to "true"
* - `controllerMask` set to "WUPS_BUTTON_COMBO_CONTROLLER_ALL" * - `controllerMask` set to "WUPS_BUTTON_COMBO_CONTROLLER_ALL"
* *
* See: @WUPSButtonComboAPI_AddButtonComboPressEx for more information. * See: @WUPSButtonComboAPI_AddButtonComboPressDownEx for more information.
*/ */
WUPSButtonCombo_Error WUPSButtonComboAPI_AddButtonComboPressDown(const char *label, WUPSButtonCombo_Error WUPSButtonComboAPI_AddButtonComboPressDown(const char *label,
WUPSButtonCombo_Buttons combo, WUPSButtonCombo_Buttons combo,
@ -109,11 +109,11 @@ WUPSButtonCombo_Error WUPSButtonComboAPI_AddButtonComboPressDown(const char *lab
WUPSButtonCombo_ComboStatus *outStatus); WUPSButtonCombo_ComboStatus *outStatus);
/** /**
* Wrapper for `WUPSButtonComboAPI_AddButtonComboPressDownObserver` with * Wrapper for `WUPSButtonComboAPI_AddButtonComboPressDownEx` with
* - `observer` set to "true" * - `observer` set to "true"
* - `controllerMask` set to "WUPS_BUTTON_COMBO_CONTROLLER_ALL" * - `controllerMask` set to "WUPS_BUTTON_COMBO_CONTROLLER_ALL"
* *
* See: @WUPSButtonComboAPI_AddButtonComboPressEx for more information. * See: @WUPSButtonComboAPI_AddButtonComboPressDownEx for more information.
*/ */
WUPSButtonCombo_Error WUPSButtonComboAPI_AddButtonComboPressDownObserver(const char *label, WUPSButtonCombo_Error WUPSButtonComboAPI_AddButtonComboPressDownObserver(const char *label,
WUPSButtonCombo_Buttons combo, WUPSButtonCombo_Buttons combo,
@ -150,11 +150,11 @@ WUPSButtonCombo_Error WUPSButtonComboAPI_AddButtonComboHoldEx(const char *label,
WUPSButtonCombo_ComboStatus *outStatus); WUPSButtonCombo_ComboStatus *outStatus);
/** /**
* Wrapper for `WUPSButtonComboAPI_AddButtonComboPressDownObserver` with * Wrapper for `WUPSButtonComboAPI_AddButtonComboHoldEx` with
* - `observer` set to "false" * - `observer` set to "false"
* - `controllerMask` set to "WUPS_BUTTON_COMBO_CONTROLLER_ALL" * - `controllerMask` set to "WUPS_BUTTON_COMBO_CONTROLLER_ALL"
* *
* See: @WUPSButtonComboAPI_AddButtonComboPressEx for more information. * See: @WUPSButtonComboAPI_AddButtonComboHoldEx for more information.
*/ */
WUPSButtonCombo_Error WUPSButtonComboAPI_AddButtonComboHold(const char *label, WUPSButtonCombo_Error WUPSButtonComboAPI_AddButtonComboHold(const char *label,
WUPSButtonCombo_Buttons combo, WUPSButtonCombo_Buttons combo,
@ -165,12 +165,11 @@ WUPSButtonCombo_Error WUPSButtonComboAPI_AddButtonComboHold(const char *label,
WUPSButtonCombo_ComboStatus *outStatus); WUPSButtonCombo_ComboStatus *outStatus);
/** /**
* Wrapper for `WUPSButtonComboAPI_AddButtonComboPressDownObserver` with * Wrapper for `WUPSButtonComboAPI_AddButtonComboHoldEx` with
* - `observer` set to "true" * - `observer` set to "true"
* - `controllerMask` set to "WUPS_BUTTON_COMBO_CONTROLLER_ALL" * - `controllerMask` set to "WUPS_BUTTON_COMBO_CONTROLLER_ALL"
* *
* See: @WUPSButtonComboAPI_AddButtonComboPressEx for more information. * See: @WUPSButtonComboAPI_AddButtonComboHoldEx for more information.
*
*/ */
WUPSButtonCombo_Error WUPSButtonComboAPI_AddButtonComboHoldObserver(const char *label, WUPSButtonCombo_Error WUPSButtonComboAPI_AddButtonComboHoldObserver(const char *label,
WUPSButtonCombo_Buttons combo, WUPSButtonCombo_Buttons combo,

20
libraries/libwups/button_combo.cpp
View File

@ -123,14 +123,14 @@ WUPSButtonCombo_Error WUPSButtonComboAPI_AddButtonCombo(const WUPSButtonCombo_Co
} }
WUPSButtonCombo_Error WUPSButtonComboAPI_AddButtonComboPressEx(const char *label, WUPSButtonCombo_Error WUPSButtonComboAPI_AddButtonComboPressDownEx(const char *label,
const WUPSButtonCombo_ControllerTypes controllerMask, const WUPSButtonCombo_ControllerTypes controllerMask,
const WUPSButtonCombo_Buttons combo, const WUPSButtonCombo_Buttons combo,
const WUPSButtonCombo_ComboCallback callback, const WUPSButtonCombo_ComboCallback callback,
void *context, void *context,
const bool observer, const bool observer,
WUPSButtonCombo_ComboHandle *outHandle, WUPSButtonCombo_ComboHandle *outHandle,
WUPSButtonCombo_ComboStatus *outStatus) { WUPSButtonCombo_ComboStatus *outStatus) {
WUPSButtonCombo_ComboOptions options = {}; WUPSButtonCombo_ComboOptions options = {};
options.metaOptions.label = label; options.metaOptions.label = label;
options.callbackOptions = {.callback = callback, .context = context}; options.callbackOptions = {.callback = callback, .context = context};
@ -148,7 +148,7 @@ WUPSButtonCombo_Error WUPSButtonComboAPI_AddButtonComboPressDown(const char *lab
void *context, void *context,
WUPSButtonCombo_ComboHandle *outHandle, WUPSButtonCombo_ComboHandle *outHandle,
WUPSButtonCombo_ComboStatus *outStatus) { WUPSButtonCombo_ComboStatus *outStatus) {
return WUPSButtonComboAPI_AddButtonComboPressEx(label, WUPS_BUTTON_COMBO_CONTROLLER_ALL, combo, callback, context, false, outHandle, outStatus); return WUPSButtonComboAPI_AddButtonComboPressDownEx(label, WUPS_BUTTON_COMBO_CONTROLLER_ALL, combo, callback, context, false, outHandle, outStatus);
} }
WUPSButtonCombo_Error WUPSButtonComboAPI_AddButtonComboPressDownObserver(const char *label, WUPSButtonCombo_Error WUPSButtonComboAPI_AddButtonComboPressDownObserver(const char *label,
@ -157,7 +157,7 @@ WUPSButtonCombo_Error WUPSButtonComboAPI_AddButtonComboPressDownObserver(const c
void *context, void *context,
WUPSButtonCombo_ComboHandle *outHandle, WUPSButtonCombo_ComboHandle *outHandle,
WUPSButtonCombo_ComboStatus *outStatus) { WUPSButtonCombo_ComboStatus *outStatus) {
return WUPSButtonComboAPI_AddButtonComboPressEx(label, WUPS_BUTTON_COMBO_CONTROLLER_ALL, combo, callback, context, true, outHandle, outStatus); return WUPSButtonComboAPI_AddButtonComboPressDownEx(label, WUPS_BUTTON_COMBO_CONTROLLER_ALL, combo, callback, context, true, outHandle, outStatus);
} }
WUPSButtonCombo_Error WUPSButtonComboAPI_AddButtonComboHoldEx(const char *label, WUPSButtonCombo_Error WUPSButtonComboAPI_AddButtonComboHoldEx(const char *label,