mirrors/vanilla
1
0
Fork 0
mirror of https://github.com/vanilla-wiiu/vanilla.git synced 2025-01-22 16:21:48 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

don't block when using vanilla_start

Browse source
This commit is contained in:
MattKC 2024-10-14 00:52:57 -07:00
parent 42223f55e9
commit 92b5ffb5b1
2 changed files with 33 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/backend.cpp
View file

@ -70,7 +70,7 @@ int Backend::syncInternal(uint16_t code)
void Backend::connectToConsole() void Backend::connectToConsole()
{ {
QtConcurrent::run(&Backend::connectInternal, this); connectInternal();
} }
int Backend::connectInternal() int Backend::connectInternal()

43
lib/vanilla.c
View file

@ -15,26 +15,47 @@
pthread_mutex_t main_mutex = PTHREAD_MUTEX_INITIALIZER; pthread_mutex_t main_mutex = PTHREAD_MUTEX_INITIALIZER;
int vanilla_start(vanilla_event_handler_t event_handler, void *context) struct gamepad_data_t
{
vanilla_event_handler_t event_handler;
void *context;
uint32_t server_address;
};
void *start_gamepad(void *arg)
{
struct gamepad_data_t *data = (struct gamepad_data_t *) arg;
connect_as_gamepad_internal(data->event_handler, data->context, data->server_address);
free(data);
pthread_mutex_unlock(&main_mutex);
return 0;
}
int vanilla_start_internal(vanilla_event_handler_t event_handler, void *context, uint32_t server_address)
{ {
if (pthread_mutex_trylock(&main_mutex) == 0) { if (pthread_mutex_trylock(&main_mutex) == 0) {
int r = connect_as_gamepad_internal(event_handler, context, 0); pthread_t other;
pthread_mutex_unlock(&main_mutex);
return r; struct gamepad_data_t *data = malloc(sizeof(struct gamepad_data_t));
data->event_handler = event_handler;
data->context = context;
data->server_address = server_address;
pthread_create(&other, NULL, start_gamepad, data);
return VANILLA_SUCCESS;
} else { } else {
return VANILLA_ERROR; return VANILLA_ERROR;
} }
} }
int vanilla_start(vanilla_event_handler_t event_handler, void *context)
{
return vanilla_start_internal(event_handler, context, 0);
}
int vanilla_start_udp(vanilla_event_handler_t event_handler, void *context, uint32_t server_address) int vanilla_start_udp(vanilla_event_handler_t event_handler, void *context, uint32_t server_address)
{ {
if (pthread_mutex_trylock(&main_mutex) == 0) { return vanilla_start_internal(event_handler, context, server_address);
int r = connect_as_gamepad_internal(event_handler, context, server_address);
pthread_mutex_unlock(&main_mutex);
return r;
} else {
return VANILLA_ERROR;
}
} }
void vanilla_stop() void vanilla_stop()