dominic/Tactility
1
0
Fork 0
mirror of https://github.com/ByteWelder/Tactility.git synced 2026-02-18 19:03:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for enums

Browse Source
This commit is contained in:
Ken Van Hoeylandt 2025-06-08 14:58:58 +02:00
parent a170dfe8a9
commit ea88165b08
4 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TactilityC/Include/tt_app.h
View File

@ -18,7 +18,7 @@ BundleHandle _Nullable tt_app_get_parameters(AppHandle handle);
* @param[in] result the result state to set * @param[in] result the result state to set
* @param[in] bundle the result bundle to set * @param[in] bundle the result bundle to set
*/ */
void tt_app_set_result(AppHandle handle, Result result, BundleHandle _Nullable bundle); void tt_app_set_result(AppHandle handle, AppResult result, BundleHandle _Nullable bundle);
/** @return true if a result was set for this app context */ /** @return true if a result was set for this app context */
bool tt_app_has_result(AppHandle handle); bool tt_app_has_result(AppHandle handle);

12
TactilityC/Include/tt_app_manifest.h
View File

@ -9,14 +9,14 @@ extern "C" {
/** Important: These values must map to tt::app::Result values exactly */ /** Important: These values must map to tt::app::Result values exactly */
typedef enum { typedef enum {
AppResultOk = 0, APP_RESULT_OK = 0,
AppResultCancelled = 1, APP_RESULT_CANCELLED = 1,
AppResultError = 2 APP_RESULT_ERROR = 2
} Result; } AppResult;
typedef void* AppHandle; typedef void* AppHandle;
typedef unsigned int LaunchId; typedef unsigned int AppLaunchId;
/** Important: These function types must map to t::app types exactly */ /** Important: These function types must map to t::app types exactly */
typedef void* (*AppCreateData)(); typedef void* (*AppCreateData)();
@ -25,7 +25,7 @@ typedef void (*AppOnCreate)(AppHandle app, void* _Nullable data);
typedef void (*AppOnDestroy)(AppHandle app, void* _Nullable data); typedef void (*AppOnDestroy)(AppHandle app, void* _Nullable data);
typedef void (*AppOnShow)(AppHandle app, void* _Nullable data, lv_obj_t* parent); typedef void (*AppOnShow)(AppHandle app, void* _Nullable data, lv_obj_t* parent);
typedef void (*AppOnHide)(AppHandle app, void* _Nullable data); typedef void (*AppOnHide)(AppHandle app, void* _Nullable data);
typedef void (*AppOnResult)(AppHandle app, void* _Nullable data, LaunchId launchId, Result result, BundleHandle resultData); typedef void (*AppOnResult)(AppHandle app, void* _Nullable data, AppLaunchId launchId, AppResult result, BundleHandle resultData);
typedef struct { typedef struct {
/** The application's human-readable name */ /** The application's human-readable name */

8
TactilityC/Source/tt_app.cpp
View File

@ -10,9 +10,9 @@ BundleHandle _Nullable tt_app_get_parameters(AppHandle handle) {
return (BundleHandle)HANDLE_AS_APP_CONTEXT(handle)->getParameters().get(); return (BundleHandle)HANDLE_AS_APP_CONTEXT(handle)->getParameters().get();
} }
void tt_app_set_result(AppHandle handle, Result result, BundleHandle _Nullable bundle) { void tt_app_set_result(AppHandle handle, AppResult result, BundleHandle _Nullable bundle) {
auto shared_bundle = std::unique_ptr<tt::Bundle>((tt::Bundle*)bundle); auto shared_bundle = std::unique_ptr<tt::Bundle>(static_cast<tt::Bundle*>(bundle));
HANDLE_AS_APP_CONTEXT(handle)->getApp()->setResult((tt::app::Result)result, std::move(shared_bundle)); HANDLE_AS_APP_CONTEXT(handle)->getApp()->setResult(static_cast<tt::app::Result>(result), std::move(shared_bundle));
} }
bool tt_app_has_result(AppHandle handle) { bool tt_app_has_result(AppHandle handle) {
@ -24,7 +24,7 @@ void tt_app_start(const char* appId) {
} }
void tt_app_start_with_bundle(const char* appId, BundleHandle parameters) { void tt_app_start_with_bundle(const char* appId, BundleHandle parameters) {
tt::app::start(appId, std::shared_ptr<tt::Bundle>((tt::Bundle*)parameters)); tt::app::start(appId, std::shared_ptr<tt::Bundle>(static_cast<tt::Bundle*>(parameters)));
} }
void tt_app_stop() { void tt_app_stop() {

2
TactilityC/Source/tt_timer.cpp
View File

@ -7,7 +7,6 @@ struct TimerWrapper {
extern "C" { extern "C" {
TimerHandle tt_timer_alloc(TimerType type, TimerCallback callback, void* callbackContext) { TimerHandle tt_timer_alloc(TimerType type, TimerCallback callback, void* callbackContext) {
auto wrapper = std::make_shared<TimerWrapper>(); auto wrapper = std::make_shared<TimerWrapper>();
wrapper->timer = std::make_unique<tt::Timer>((tt::Timer::Type)type, [callback, callbackContext](){ callback(callbackContext); }); wrapper->timer = std::make_unique<tt::Timer>((tt::Timer::Type)type, [callback, callbackContext](){ callback(callbackContext); });
@ -54,4 +53,3 @@ void tt_timer_set_thread_priority(TimerHandle handle, ThreadPriority priority) {
} }
} }