mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-18 05:43:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

(WiiU) Buildfixes

Browse Source
This commit is contained in:
twinaphex 2020-07-23 18:00:57 +02:00
parent bf542c22d0
commit a01380f847
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
audio/drivers/wiiu_audio.c
View File

@ -187,7 +187,8 @@ static bool ax_audio_start(void* data, bool is_shutdown)
/* Set back to playing on enough buffered data */ /* Set back to playing on enough buffered data */
if (ax->written > AX_AUDIO_SAMPLE_LOAD) if (ax->written > AX_AUDIO_SAMPLE_LOAD)
{ {
AXSetMultiVoiceCurrentOffset(ax->mvoice, ax_audio_limit(ax->pos - ax->written)); AXSetMultiVoiceCurrentOffset(ax->mvoice,
ax_audio_limit(ax->pos - ax->written));
AXSetMultiVoiceState(ax->mvoice, AX_VOICE_STATE_PLAYING); AXSetMultiVoiceState(ax->mvoice, AX_VOICE_STATE_PLAYING);
} }
@ -206,9 +207,12 @@ static ssize_t ax_audio_write(void* data, const void* buf, size_t size)
return 0; return 0;
if (count > AX_AUDIO_MAX_FREE) if (count > AX_AUDIO_MAX_FREE)
count = AX_AUDIO_MAX_FREE; count = AX_AUDIO_MAX_FREE;
count_avail = ((ax->written > AX_AUDIO_MAX_FREE) ? 0 : (AX_AUDIO_MAX_FREE - ax->written)); count_avail = (
(ax->written > AX_AUDIO_MAX_FREE)
? 0
: (AX_AUDIO_MAX_FREE - ax->written));
if (ax->nonblock) if (ax->nonblock)
{ {
@ -301,24 +305,17 @@ static void ax_audio_set_nonblock_state(void* data, bool state)
ax->nonblock = state; ax->nonblock = state;
} }
static bool ax_audio_use_float(void* data) static bool ax_audio_use_float(void* data) { return false; }
{
(void)data;
return false;
}
static size_t ax_audio_write_avail(void* data) static size_t ax_audio_write_avail(void* data)
{ {
ax_audio_t* ax = (ax_audio_t*)data; ax_audio_t* ax = (ax_audio_t*)data;
size_t ret = AX_AUDIO_COUNT - ax->written; size_t ret = AX_AUDIO_COUNT - ax->written;
return (ret < AX_AUDIO_SAMPLE_COUNT ? 0 : ret); return (ret < AX_AUDIO_SAMPLE_COUNT ? 0 : ret);
} }
static size_t ax_audio_buffer_size(void* data) static size_t ax_audio_buffer_size(void* data)
{ {
(void)data;
return AX_AUDIO_COUNT; return AX_AUDIO_COUNT;
} }
@ -335,6 +332,6 @@ audio_driver_t audio_ax =
"AX", "AX",
NULL, /* device_list_new */ NULL, /* device_list_new */
NULL, /* device_list_free */ NULL, /* device_list_free */
NULL, /* write_avail */ ax_audio_write_avail,
NULL, /* buffer_size */ ax_audio_buffer_size,
}; };

4
input/include/hid_driver.h
View File

@ -58,8 +58,8 @@ struct hid_driver
hid_instance.os_driver_data, pad, state) hid_instance.os_driver_data, pad, state)
#define HID_BUTTON(pad, key) hid_instance.os_driver->button( \ #define HID_BUTTON(pad, key) hid_instance.os_driver->button( \
hid_instance.os_driver_data, pad, key) hid_instance.os_driver_data, pad, key)
#define HID_AXIS(pad, axis) hid_instance.os_driver->axis( \ #define HID_AXIS(pad, a) hid_instance.os_driver->axis( \
hid_instance.os_driver_data, pad, axis) hid_instance.os_driver_data, pad, (a))
#define HID_PAD_NAME(pad) \ #define HID_PAD_NAME(pad) \
hid_instance.os_driver->name(hid_instance.os_driver_data, pad) hid_instance.os_driver->name(hid_instance.os_driver_data, pad)
#define HID_SET_PROTOCOL(pad, protocol) \ #define HID_SET_PROTOCOL(pad, protocol) \