From ea77fbbd383af113ed51532e2a8fd6f756295ff3 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Wed, 2 May 2018 23:42:39 +0200 Subject: [PATCH] Increase max streams from 8 to 16 --- audio/audio_driver.c | 2 +- audio/audio_driver.h | 2 +- menu/menu_driver.h | 19 +++++++++++-------- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/audio/audio_driver.c b/audio/audio_driver.c index 255dc092fe..93e4950aae 100644 --- a/audio/audio_driver.c +++ b/audio/audio_driver.c @@ -204,7 +204,7 @@ audio_mixer_stream_t *audio_driver_mixer_get_stream(unsigned i) const char *audio_driver_mixer_get_stream_name(unsigned i) { if (i > (AUDIO_MIXER_MAX_STREAMS-1)) - return NULL; + return "N/A"; if (!string_is_empty(audio_mixer_streams[i].name)) return audio_mixer_streams[i].name; return "N/A"; diff --git a/audio/audio_driver.h b/audio/audio_driver.h index bf81dbff11..a2cdad4f41 100644 --- a/audio/audio_driver.h +++ b/audio/audio_driver.h @@ -35,7 +35,7 @@ RETRO_BEGIN_DECLS #define AUDIO_MAX_RATIO 16 -#define AUDIO_MIXER_MAX_STREAMS 8 +#define AUDIO_MIXER_MAX_STREAMS 16 enum audio_action { diff --git a/menu/menu_driver.h b/menu/menu_driver.h index 86c69d0fcd..cca2d9f435 100644 --- a/menu/menu_driver.h +++ b/menu/menu_driver.h @@ -32,6 +32,7 @@ #include "menu_input.h" #include "menu_entries.h" +#include "../audio/audio_driver.h" #include "../gfx/video_driver.h" #include "../file_path_special.h" #include "../gfx/font_driver.h" @@ -131,6 +132,8 @@ enum rarch_menu_ctl_state MENU_NAVIGATION_CTL_GET_SCROLL_ACCEL }; +#define MENU_SETTINGS_AUDIO_MIXER_MAX_STREAMS (AUDIO_MIXER_MAX_STREAMS-1) + enum menu_settings_type { MENU_SETTINGS_NONE = FILE_TYPE_LAST + 1, @@ -189,22 +192,22 @@ enum menu_settings_type MENU_SETTINGS_CORE_DISK_OPTIONS_DISK_CYCLE_TRAY_STATUS, MENU_SETTINGS_AUDIO_MIXER_STREAM_BEGIN, - MENU_SETTINGS_AUDIO_MIXER_STREAM_END = MENU_SETTINGS_AUDIO_MIXER_STREAM_BEGIN + 7, + MENU_SETTINGS_AUDIO_MIXER_STREAM_END = MENU_SETTINGS_AUDIO_MIXER_STREAM_BEGIN + MENU_SETTINGS_AUDIO_MIXER_MAX_STREAMS, MENU_SETTINGS_AUDIO_MIXER_STREAM_ACTIONS_BEGIN, - MENU_SETTINGS_AUDIO_MIXER_STREAM_ACTIONS_END = MENU_SETTINGS_AUDIO_MIXER_STREAM_ACTIONS_BEGIN + 7, + MENU_SETTINGS_AUDIO_MIXER_STREAM_ACTIONS_END = MENU_SETTINGS_AUDIO_MIXER_STREAM_ACTIONS_BEGIN + MENU_SETTINGS_AUDIO_MIXER_MAX_STREAMS, MENU_SETTINGS_AUDIO_MIXER_STREAM_ACTIONS_STOP_BEGIN, - MENU_SETTINGS_AUDIO_MIXER_STREAM_ACTIONS_STOP_END = MENU_SETTINGS_AUDIO_MIXER_STREAM_ACTIONS_STOP_BEGIN + 7, + MENU_SETTINGS_AUDIO_MIXER_STREAM_ACTIONS_STOP_END = MENU_SETTINGS_AUDIO_MIXER_STREAM_ACTIONS_STOP_BEGIN + MENU_SETTINGS_AUDIO_MIXER_MAX_STREAMS, MENU_SETTINGS_AUDIO_MIXER_STREAM_ACTIONS_REMOVE_BEGIN, - MENU_SETTINGS_AUDIO_MIXER_STREAM_ACTIONS_REMOVE_END = MENU_SETTINGS_AUDIO_MIXER_STREAM_ACTIONS_REMOVE_BEGIN + 7, + MENU_SETTINGS_AUDIO_MIXER_STREAM_ACTIONS_REMOVE_END = MENU_SETTINGS_AUDIO_MIXER_STREAM_ACTIONS_REMOVE_BEGIN + MENU_SETTINGS_AUDIO_MIXER_MAX_STREAMS, MENU_SETTINGS_AUDIO_MIXER_STREAM_ACTIONS_PLAY_BEGIN, - MENU_SETTINGS_AUDIO_MIXER_STREAM_ACTIONS_PLAY_END = MENU_SETTINGS_AUDIO_MIXER_STREAM_ACTIONS_PLAY_BEGIN + 7, + MENU_SETTINGS_AUDIO_MIXER_STREAM_ACTIONS_PLAY_END = MENU_SETTINGS_AUDIO_MIXER_STREAM_ACTIONS_PLAY_BEGIN + MENU_SETTINGS_AUDIO_MIXER_MAX_STREAMS, MENU_SETTINGS_AUDIO_MIXER_STREAM_ACTIONS_PLAY_LOOPED_BEGIN, - MENU_SETTINGS_AUDIO_MIXER_STREAM_ACTIONS_PLAY_LOOPED_END = MENU_SETTINGS_AUDIO_MIXER_STREAM_ACTIONS_PLAY_LOOPED_BEGIN + 7, + MENU_SETTINGS_AUDIO_MIXER_STREAM_ACTIONS_PLAY_LOOPED_END = MENU_SETTINGS_AUDIO_MIXER_STREAM_ACTIONS_PLAY_LOOPED_BEGIN + MENU_SETTINGS_AUDIO_MIXER_MAX_STREAMS, MENU_SETTINGS_AUDIO_MIXER_STREAM_ACTIONS_PLAY_SEQUENTIAL_BEGIN, - MENU_SETTINGS_AUDIO_MIXER_STREAM_ACTIONS_PLAY_SEQUENTIAL_END = MENU_SETTINGS_AUDIO_MIXER_STREAM_ACTIONS_PLAY_SEQUENTIAL_BEGIN + 7, + MENU_SETTINGS_AUDIO_MIXER_STREAM_ACTIONS_PLAY_SEQUENTIAL_END = MENU_SETTINGS_AUDIO_MIXER_STREAM_ACTIONS_PLAY_SEQUENTIAL_BEGIN + MENU_SETTINGS_AUDIO_MIXER_MAX_STREAMS, MENU_SETTINGS_AUDIO_MIXER_STREAM_ACTIONS_VOLUME_BEGIN, - MENU_SETTINGS_AUDIO_MIXER_STREAM_ACTIONS_VOLUME_END = MENU_SETTINGS_AUDIO_MIXER_STREAM_ACTIONS_VOLUME_BEGIN + 7, + MENU_SETTINGS_AUDIO_MIXER_STREAM_ACTIONS_VOLUME_END = MENU_SETTINGS_AUDIO_MIXER_STREAM_ACTIONS_VOLUME_BEGIN + MENU_SETTINGS_AUDIO_MIXER_MAX_STREAMS, MENU_SETTINGS_BIND_BEGIN, MENU_SETTINGS_BIND_LAST = MENU_SETTINGS_BIND_BEGIN + RARCH_ANALOG_RIGHT_Y_MINUS, MENU_SETTINGS_BIND_ALL_LAST = MENU_SETTINGS_BIND_BEGIN + RARCH_MENU_TOGGLE,