mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-26 09:35:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Wii) implement audio controll rate settings

Browse Source 
have left/right act as page up/down in file browser
change "Start" to reset values in settings
This commit is contained in:
Toad King 2012-07-18 20:38:09 -04:00
parent 64260b8d33
commit f9d72f583e
5 changed files with 101 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
console/console_settings.c
View File

@ -35,7 +35,20 @@ void rarch_settings_change(unsigned setting)
g_console.aspect_ratio_index++; g_console.aspect_ratio_index++;
break; break;
case S_AUDIO_MUTE: case S_AUDIO_MUTE:
g_extern.audio_data.mute = !g_extern.audio_data.mute; g_extern.audio_data.mute = !g_extern.audio_data.mute;
break;
case S_AUDIO_CONTROL_RATE_DECREMENT:
if (g_settings.audio.rate_control_delta > 0.0)
g_settings.audio.rate_control_delta -= 0.001;
if (g_settings.audio.rate_control_delta == 0.0)
g_settings.audio.rate_control = false;
else
g_settings.audio.rate_control = true;
break;
case S_AUDIO_CONTROL_RATE_INCREMENT:
if (g_settings.audio.rate_control_delta < 0.2)
g_settings.audio.rate_control_delta += 0.001;
g_settings.audio.rate_control = true;
break; break;
case S_FRAME_ADVANCE: case S_FRAME_ADVANCE:
g_console.frame_advance_enable = true; g_console.frame_advance_enable = true;
@ -68,11 +81,11 @@ void rarch_settings_change(unsigned setting)
} }
break; break;
case S_RESOLUTION_NEXT: case S_RESOLUTION_NEXT:
if (g_console.current_resolution_index + 1 < g_console.supported_resolutions_count) if (g_console.current_resolution_index + 1 < g_console.supported_resolutions_count)
{ {
g_console.current_resolution_index++; g_console.current_resolution_index++;
g_console.current_resolution_id = g_console.supported_resolutions[g_console.current_resolution_index]; g_console.current_resolution_id = g_console.supported_resolutions[g_console.current_resolution_index];
} }
break; break;
case S_QUIT: case S_QUIT:
g_console.menu_enable = false; g_console.menu_enable = false;
@ -139,7 +152,7 @@ void rarch_settings_change(unsigned setting)
break; break;
case S_TRIPLE_BUFFERING: case S_TRIPLE_BUFFERING:
g_console.triple_buffering_enable = !g_console.triple_buffering_enable; g_console.triple_buffering_enable = !g_console.triple_buffering_enable;
break; break;
} }
} }
@ -151,7 +164,16 @@ void rarch_settings_default(unsigned setting)
g_console.aspect_ratio_index = ASPECT_RATIO_4_3; g_console.aspect_ratio_index = ASPECT_RATIO_4_3;
break; break;
case S_DEF_AUDIO_MUTE: case S_DEF_AUDIO_MUTE:
g_extern.audio_data.mute = false; g_extern.audio_data.mute = false;
break;
case S_DEF_AUDIO_CONTROL_RATE:
#ifdef GEKKO
g_settings.audio.rate_control_delta = 0.004;
g_settings.audio.rate_control = true;
#else
g_settings.audio.rate_control_delta = 0.0;
g_settings.audio.rate_control = false;
#endif
break; break;
case S_DEF_HW_TEXTURE_FILTER: case S_DEF_HW_TEXTURE_FILTER:
g_settings.video.smooth = 1; g_settings.video.smooth = 1;
@ -163,7 +185,7 @@ void rarch_settings_default(unsigned setting)
g_console.overscan_amount = 0.0f; g_console.overscan_amount = 0.0f;
g_console.overscan_enable = false; g_console.overscan_enable = false;
break; break;
case S_DEF_ROTATION: case S_DEF_ROTATION:
g_console.screen_orientation = ORIENTATION_NORMAL; g_console.screen_orientation = ORIENTATION_NORMAL;
break; break;
case S_DEF_THROTTLE: case S_DEF_THROTTLE:
@ -215,19 +237,19 @@ void rarch_settings_msg(unsigned setting, unsigned delay)
case S_MSG_NOT_IMPLEMENTED: case S_MSG_NOT_IMPLEMENTED:
snprintf(str, sizeof(str), "TODO - Not yet implemented."); snprintf(str, sizeof(str), "TODO - Not yet implemented.");
break; break;
case S_MSG_RESIZE_SCREEN: case S_MSG_RESIZE_SCREEN:
snprintf(str, sizeof(str), "INFO - Resize the screen by moving around the two analog sticks.\nPress [RetroPad X] to reset to default values, and [RetroPad A] to go back.\nTo select the resized screen mode, set Aspect Ratio to: 'Custom'."); snprintf(str, sizeof(str), "INFO - Resize the screen by moving around the two analog sticks.\nPress [RetroPad X] to reset to default values, and [RetroPad A] to go back.\nTo select the resized screen mode, set Aspect Ratio to: 'Custom'.");
break; break;
case S_MSG_RESTART_RARCH: case S_MSG_RESTART_RARCH:
snprintf(str, sizeof(str), "INFO - You need to restart RetroArch for this change to take effect."); snprintf(str, sizeof(str), "INFO - You need to restart RetroArch for this change to take effect.");
break; break;
case S_MSG_SELECT_LIBRETRO_CORE: case S_MSG_SELECT_LIBRETRO_CORE:
snprintf(str, sizeof(str), "INFO - Select a Libretro core from the menu by pressing [RetroPad B]."); snprintf(str, sizeof(str), "INFO - Select a Libretro core from the menu by pressing [RetroPad B].");
break; break;
case S_MSG_SELECT_SHADER: case S_MSG_SELECT_SHADER:
snprintf(str, sizeof(str), "INFO - Select a shader from the menu by pressing [RetroPad A]."); snprintf(str, sizeof(str), "INFO - Select a shader from the menu by pressing [RetroPad A].");
break; break;
case S_MSG_SHADER_LOADING_SUCCEEDED: case S_MSG_SHADER_LOADING_SUCCEEDED:
snprintf(str, sizeof(str), "INFO - Shader successfully loaded."); snprintf(str, sizeof(str), "INFO - Shader successfully loaded.");
break; break;
} }
@ -250,26 +272,26 @@ void rarch_settings_create_menu_item_label(char * str, unsigned setting, size_t
case S_LBL_ASPECT_RATIO: case S_LBL_ASPECT_RATIO:
snprintf(str, size, "Aspect Ratio: %s", aspectratio_lut[g_console.aspect_ratio_index].name); snprintf(str, size, "Aspect Ratio: %s", aspectratio_lut[g_console.aspect_ratio_index].name);
break; break;
case S_LBL_SHADER: case S_LBL_SHADER:
snprintf(str, size, "Shader #1: %s", g_settings.video.cg_shader_path); snprintf(str, size, "Shader #1: %s", g_settings.video.cg_shader_path);
break; break;
case S_LBL_SHADER_2: case S_LBL_SHADER_2:
snprintf(str, size, "Shader #2: %s", g_settings.video.second_pass_shader); snprintf(str, size, "Shader #2: %s", g_settings.video.second_pass_shader);
break; break;
case S_LBL_RARCH_VERSION: case S_LBL_RARCH_VERSION:
snprintf(str, size, "RetroArch %s", PACKAGE_VERSION); snprintf(str, size, "RetroArch %s", PACKAGE_VERSION);
break; break;
case S_LBL_SCALE_FACTOR: case S_LBL_SCALE_FACTOR:
snprintf(str, size, "Scale Factor: %f (X) / %f (Y)", g_settings.video.fbo_scale_x, g_settings.video.fbo_scale_y); snprintf(str, size, "Scale Factor: %f (X) / %f (Y)", g_settings.video.fbo_scale_x, g_settings.video.fbo_scale_y);
break; break;
case S_LBL_ROTATION: case S_LBL_ROTATION:
snprintf(str, size, "Rotation: %s", rotation_lut[g_console.screen_orientation]); snprintf(str, size, "Rotation: %s", rotation_lut[g_console.screen_orientation]);
break; break;
case S_LBL_LOAD_STATE_SLOT: case S_LBL_LOAD_STATE_SLOT:
snprintf(str, size, "Load State #%d", g_extern.state_slot); snprintf(str, size, "Load State #%d", g_extern.state_slot);
break; break;
case S_LBL_SAVE_STATE_SLOT: case S_LBL_SAVE_STATE_SLOT:
snprintf(str, size, "Save State #%d", g_extern.state_slot); snprintf(str, size, "Save State #%d", g_extern.state_slot);
break; break;
} }
} }

3
console/console_settings.h
View File

@ -32,6 +32,8 @@ enum
S_ASPECT_RATIO_DECREMENT = 0, S_ASPECT_RATIO_DECREMENT = 0,
S_ASPECT_RATIO_INCREMENT, S_ASPECT_RATIO_INCREMENT,
S_AUDIO_MUTE, S_AUDIO_MUTE,
S_AUDIO_CONTROL_RATE_DECREMENT,
S_AUDIO_CONTROL_RATE_INCREMENT,
S_FRAME_ADVANCE, S_FRAME_ADVANCE,
S_HW_TEXTURE_FILTER, S_HW_TEXTURE_FILTER,
S_HW_TEXTURE_FILTER_2, S_HW_TEXTURE_FILTER_2,
@ -61,6 +63,7 @@ enum
{ {
S_DEF_ASPECT_RATIO = 0, S_DEF_ASPECT_RATIO = 0,
S_DEF_AUDIO_MUTE, S_DEF_AUDIO_MUTE,
S_DEF_AUDIO_CONTROL_RATE,
S_DEF_HW_TEXTURE_FILTER, S_DEF_HW_TEXTURE_FILTER,
S_DEF_HW_TEXTURE_FILTER_2, S_DEF_HW_TEXTURE_FILTER_2,
S_DEF_OVERSCAN, S_DEF_OVERSCAN,

6
wii/frontend/main.c
View File

@ -119,6 +119,12 @@ static bool get_rom_path(rgui_handle_t *rgui)
action = RGUI_ACTION_UP; action = RGUI_ACTION_UP;
else if (trigger_state & (1 << RETRO_DEVICE_ID_JOYPAD_DOWN)) else if (trigger_state & (1 << RETRO_DEVICE_ID_JOYPAD_DOWN))
action = RGUI_ACTION_DOWN; action = RGUI_ACTION_DOWN;
else if (trigger_state & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT))
action = RGUI_ACTION_LEFT;
else if (trigger_state & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT))
action = RGUI_ACTION_RIGHT;
else if (trigger_state & (1 << RETRO_DEVICE_ID_JOYPAD_START))
action = RGUI_ACTION_START;
else if (trigger_state & (1 << RETRO_DEVICE_ID_JOYPAD_SELECT) && !first) // don't catch start+select+l+r when exiting else if (trigger_state & (1 << RETRO_DEVICE_ID_JOYPAD_SELECT) && !first) // don't catch start+select+l+r when exiting
action = RGUI_ACTION_SETTINGS; action = RGUI_ACTION_SETTINGS;

67
wii/frontend/rgui.c
View File

@ -42,7 +42,7 @@ struct rgui_handle
rgui_list_t *path_stack; rgui_list_t *path_stack;
rgui_list_t *folder_buf; rgui_list_t *folder_buf;
size_t directory_ptr; int directory_ptr;
bool need_refresh; bool need_refresh;
rgui_mode_t mode; rgui_mode_t mode;
@ -209,32 +209,33 @@ static void render_text(rgui_handle_t *rgui, size_t begin, size_t end)
rgui_list_at(rgui->folder_buf, i, &path, &type, NULL); rgui_list_at(rgui->folder_buf, i, &path, &type, NULL);
char message[TERM_WIDTH + 1]; char message[TERM_WIDTH + 1];
char *type_str; char type_str[TERM_WIDTH + 1];
int w; int w = 18;
switch (type) switch (type)
{ {
case RGUI_FILE_PLAIN: case RGUI_FILE_PLAIN:
type_str = "(FILE)"; snprintf(type_str, sizeof(type_str), "(FILE)");
w = 6; w = 6;
break; break;
case RGUI_FILE_DIRECTORY: case RGUI_FILE_DIRECTORY:
type_str = "(DIR)"; snprintf(type_str, sizeof(type_str), "(DIR)");
w = 5; w = 5;
break; break;
case RGUI_FILE_DEVICE: case RGUI_FILE_DEVICE:
type_str = "(DEV)"; snprintf(type_str, sizeof(type_str), "(DEV)");
w = 5; w = 5;
break; break;
case RGUI_SETTINGS_VIDEO_FILTER: case RGUI_SETTINGS_VIDEO_FILTER:
type_str = g_settings.video.smooth ? "Bilinear filtering" : "Point filtering"; snprintf(type_str, sizeof(type_str), g_settings.video.smooth ? "Bilinear filtering" : "Point filtering");
w = 18;
break; break;
case RGUI_SETTINGS_AUDIO_MUTE: case RGUI_SETTINGS_AUDIO_MUTE:
type_str = g_extern.audio_data.mute ? "ON" : "OFF"; snprintf(type_str, sizeof(type_str), g_extern.audio_data.mute ? "ON" : "OFF");
w = 18; break;
case RGUI_SETTINGS_AUDIO_CONTROL_RATE:
snprintf(type_str, sizeof(type_str), "%.3f", g_settings.audio.rate_control_delta);
break; break;
default: default:
type_str = ""; type_str[0] = 0;
w = 0; w = 0;
break; break;
} }
@ -287,19 +288,29 @@ static void render_messagebox(rgui_handle_t *rgui, const char *message)
free(msg); free(msg);
} }
static void rgui_settings_toggle_setting(rgui_file_type_t setting) static void rgui_settings_toggle_setting(rgui_file_type_t setting, rgui_action_t action)
{ {
switch (setting) switch (setting)
{ {
/*case RGUI_SETTINGS_VIDEO_STRETCH:
break;*/
case RGUI_SETTINGS_VIDEO_FILTER: case RGUI_SETTINGS_VIDEO_FILTER:
rarch_settings_change(S_HW_TEXTURE_FILTER); if (action == RGUI_ACTION_START)
rarch_settings_default(S_DEF_HW_TEXTURE_FILTER);
else
rarch_settings_change(S_HW_TEXTURE_FILTER);
break; break;
case RGUI_SETTINGS_AUDIO_MUTE: case RGUI_SETTINGS_AUDIO_MUTE:
rarch_settings_change(S_AUDIO_MUTE); if (action == RGUI_ACTION_START)
rarch_settings_default(S_DEF_AUDIO_MUTE);
else
rarch_settings_change(S_AUDIO_MUTE);
break;
case RGUI_SETTINGS_AUDIO_CONTROL_RATE:
if (action == RGUI_ACTION_START)
rarch_settings_default(S_DEF_AUDIO_CONTROL_RATE);
else if (action == RGUI_ACTION_LEFT)
rarch_settings_change(S_AUDIO_CONTROL_RATE_DECREMENT);
else if (action == RGUI_ACTION_RIGHT)
rarch_settings_change(S_AUDIO_CONTROL_RATE_INCREMENT);
break; break;
default: default:
break; break;
@ -312,6 +323,7 @@ static void rgui_settings_populate_entries(rgui_handle_t *rgui)
rgui_list_push(rgui->folder_buf, "Hardware filtering", RGUI_SETTINGS_VIDEO_FILTER, 0); rgui_list_push(rgui->folder_buf, "Hardware filtering", RGUI_SETTINGS_VIDEO_FILTER, 0);
rgui_list_push(rgui->folder_buf, "Mute Audio", RGUI_SETTINGS_AUDIO_MUTE, 0); rgui_list_push(rgui->folder_buf, "Mute Audio", RGUI_SETTINGS_AUDIO_MUTE, 0);
rgui_list_push(rgui->folder_buf, "Audio Control Rate", RGUI_SETTINGS_AUDIO_CONTROL_RATE, 0);
} }
static bool rgui_settings_iterate(rgui_handle_t *rgui, rgui_action_t action) static bool rgui_settings_iterate(rgui_handle_t *rgui, rgui_action_t action)
@ -332,19 +344,20 @@ static bool rgui_settings_iterate(rgui_handle_t *rgui, rgui_action_t action)
rgui->directory_ptr = 0; rgui->directory_ptr = 0;
break; break;
case RGUI_ACTION_LEFT:
case RGUI_ACTION_CANCEL: case RGUI_ACTION_CANCEL:
case RGUI_ACTION_SETTINGS: case RGUI_ACTION_SETTINGS:
rgui->mode = RGUI_FILEBROWSER; rgui->mode = RGUI_FILEBROWSER;
return true; return true;
break; break;
case RGUI_ACTION_LEFT:
case RGUI_ACTION_RIGHT: case RGUI_ACTION_RIGHT:
case RGUI_ACTION_OK: case RGUI_ACTION_OK:
case RGUI_ACTION_START:
{ {
rgui_file_type_t type; rgui_file_type_t type;
rgui_list_at(rgui->folder_buf, rgui->directory_ptr, NULL, &type, NULL); rgui_list_at(rgui->folder_buf, rgui->directory_ptr, NULL, &type, NULL);
rgui_settings_toggle_setting(type); rgui_settings_toggle_setting(type, action);
break; break;
} }
@ -404,6 +417,19 @@ const char *rgui_iterate(rgui_handle_t *rgui, rgui_action_t action)
break; break;
case RGUI_ACTION_LEFT: case RGUI_ACTION_LEFT:
if (rgui->directory_ptr - 8 > 0)
rgui->directory_ptr -= 8;
else
rgui->directory_ptr = 0;
break;
case RGUI_ACTION_RIGHT:
if (rgui->directory_ptr + 8 < rgui_list_size(rgui->folder_buf))
rgui->directory_ptr += 8;
else
rgui->directory_ptr = rgui_list_size(rgui->folder_buf) - 1;
break;
case RGUI_ACTION_CANCEL: case RGUI_ACTION_CANCEL:
if (rgui_list_size(rgui->path_stack) > 1) if (rgui_list_size(rgui->path_stack) > 1)
{ {
@ -415,7 +441,6 @@ const char *rgui_iterate(rgui_handle_t *rgui, rgui_action_t action)
} }
break; break;
case RGUI_ACTION_RIGHT:
case RGUI_ACTION_OK: case RGUI_ACTION_OK:
{ {
if (rgui_list_size(rgui->folder_buf) == 0) if (rgui_list_size(rgui->folder_buf) == 0)

5
wii/frontend/rgui.h
View File

@ -32,9 +32,9 @@ typedef enum
RGUI_FILE_DEVICE, RGUI_FILE_DEVICE,
// settings options are done here too // settings options are done here too
//RGUI_SETTINGS_VIDEO_STRETCH,
RGUI_SETTINGS_VIDEO_FILTER, RGUI_SETTINGS_VIDEO_FILTER,
RGUI_SETTINGS_AUDIO_MUTE RGUI_SETTINGS_AUDIO_MUTE,
RGUI_SETTINGS_AUDIO_CONTROL_RATE
} rgui_file_type_t; } rgui_file_type_t;
typedef enum typedef enum
@ -47,6 +47,7 @@ typedef enum
RGUI_ACTION_CANCEL, RGUI_ACTION_CANCEL,
RGUI_ACTION_REFRESH, RGUI_ACTION_REFRESH,
RGUI_ACTION_SETTINGS, RGUI_ACTION_SETTINGS,
RGUI_ACTION_START,
RGUI_ACTION_NOOP RGUI_ACTION_NOOP
} rgui_action_t; } rgui_action_t;