Max
/
SameBoy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed input callbacks when no debugger is included

This commit is contained in:
Lior Halphon 2017-10-12 19:16:33 +03:00
parent dcadfc37f4
commit a50aa2486b
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Core/gb.c
View File

@ -44,18 +44,17 @@ void GB_log(GB_gameboy_t *gb, const char *fmt, ...)
va_end(args); va_end(args);
} }
#ifndef DISABLE_DEBUGGER
static char *default_input_callback(GB_gameboy_t *gb) static char *default_input_callback(GB_gameboy_t *gb)
{ {
char *expression = NULL; char *expression = NULL;
size_t size = 0; size_t size = 0;
#ifndef __LIBRETRO__
if (getline(&expression, &size, stdin) == -1) { if (getline(&expression, &size, stdin) == -1) {
/* The user doesn't have STDIN or used ^D. We make sure the program keeps running. */ /* The user doesn't have STDIN or used ^D. We make sure the program keeps running. */
GB_set_async_input_callback(gb, NULL); /* Disable async input */ GB_set_async_input_callback(gb, NULL); /* Disable async input */
return strdup("c"); return strdup("c");
} }
#endif
if (!expression) { if (!expression) {
return strdup(""); return strdup("");
@ -85,6 +84,7 @@ static char *default_async_input_callback(GB_gameboy_t *gb)
#endif #endif
return NULL; return NULL;
} }
#endif
void GB_init(GB_gameboy_t *gb) void GB_init(GB_gameboy_t *gb)
{ {
@ -92,8 +92,10 @@ void GB_init(GB_gameboy_t *gb)
gb->ram = malloc(gb->ram_size = 0x2000); gb->ram = malloc(gb->ram_size = 0x2000);
gb->vram = malloc(gb->vram_size = 0x2000); gb->vram = malloc(gb->vram_size = 0x2000);
#ifndef DISABLE_DEBUGGER
gb->input_callback = default_input_callback; gb->input_callback = default_input_callback;
gb->async_input_callback = default_async_input_callback; gb->async_input_callback = default_async_input_callback;
#endif
gb->cartridge_type = &GB_cart_defs[0]; // Default cartridge type gb->cartridge_type = &GB_cart_defs[0]; // Default cartridge type
GB_reset(gb); GB_reset(gb);
@ -106,8 +108,10 @@ void GB_init_cgb(GB_gameboy_t *gb)
gb->vram = malloc(gb->vram_size = 0x2000 * 2); gb->vram = malloc(gb->vram_size = 0x2000 * 2);
gb->is_cgb = true; gb->is_cgb = true;
#ifndef DISABLE_DEBUGGER
gb->input_callback = default_input_callback; gb->input_callback = default_input_callback;
gb->async_input_callback = default_async_input_callback; gb->async_input_callback = default_async_input_callback;
#endif
gb->cartridge_type = &GB_cart_defs[0]; // Default cartridge type gb->cartridge_type = &GB_cart_defs[0]; // Default cartridge type
GB_reset(gb); GB_reset(gb);
@ -326,17 +330,22 @@ void GB_set_log_callback(GB_gameboy_t *gb, GB_log_callback_t callback)
void GB_set_input_callback(GB_gameboy_t *gb, GB_input_callback_t callback) void GB_set_input_callback(GB_gameboy_t *gb, GB_input_callback_t callback)
{ {
#ifndef DISABLE_DEBUGGER
if (gb->input_callback == default_input_callback) { if (gb->input_callback == default_input_callback) {
gb->async_input_callback = NULL; gb->async_input_callback = NULL;
} }
gb->input_callback = callback; gb->input_callback = callback;
#endif
} }
void GB_set_async_input_callback(GB_gameboy_t *gb, GB_input_callback_t callback) void GB_set_async_input_callback(GB_gameboy_t *gb, GB_input_callback_t callback)
{ {
#ifndef DISABLE_DEBUGGER
gb->async_input_callback = callback; gb->async_input_callback = callback;
#endif
} }
void GB_set_rgb_encode_callback(GB_gameboy_t *gb, GB_rgb_encode_callback_t callback) void GB_set_rgb_encode_callback(GB_gameboy_t *gb, GB_rgb_encode_callback_t callback)
{ {
if (!gb->rgb_encode_callback && !gb->is_cgb) { if (!gb->rgb_encode_callback && !gb->is_cgb) {