Add sublabels

This commit is contained in:
twinaphex 2016-11-21 07:40:54 +01:00
parent ae06e712eb
commit ef11d95be9
3 changed files with 39 additions and 3 deletions

View File

@ -2060,3 +2060,7 @@ MSG_HASH(MSG_VIEWPORT_SIZE_CALCULATION_FAILED,
"Viewport size calculation failed! Will continue using raw data. This will probably not work right ...") "Viewport size calculation failed! Will continue using raw data. This will probably not work right ...")
MSG_HASH(MSG_VIRTUAL_DISK_TRAY, MSG_HASH(MSG_VIRTUAL_DISK_TRAY,
"virtual disk tray.") "virtual disk tray.")
MSG_HASH(MENU_ENUM_SUBLABEL_AUDIO_LATENCY,
"Desired audio latency in milliseconds. Might not be honored if the audio driver can't provide given latency.")
MSG_HASH(MENU_ENUM_SUBLABEL_AUDIO_MUTE,
"Mute/unmute audio.")

View File

@ -435,6 +435,28 @@ static int action_bind_sublabel_video_shared_context(
return 0; return 0;
} }
static int action_bind_sublabel_audio_latency(
file_list_t *list,
unsigned type, unsigned i,
const char *label, const char *path,
char *s, size_t len)
{
strlcpy(s, msg_hash_to_str(MENU_ENUM_SUBLABEL_AUDIO_LATENCY), len);
return 0;
}
static int action_bind_sublabel_audio_mute(
file_list_t *list,
unsigned type, unsigned i,
const char *label, const char *path,
char *s, size_t len)
{
strlcpy(s, msg_hash_to_str(MENU_ENUM_SUBLABEL_AUDIO_MUTE), len);
return 0;
}
int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs, int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs,
const char *path, const char *label, unsigned type, size_t idx) const char *path, const char *label, unsigned type, size_t idx)
{ {
@ -447,6 +469,12 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs,
{ {
switch (cbs->enum_idx) switch (cbs->enum_idx)
{ {
case MENU_ENUM_LABEL_AUDIO_MUTE:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_audio_mute);
break;
case MENU_ENUM_LABEL_AUDIO_LATENCY:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_audio_latency);
break;
case MENU_ENUM_LABEL_VIDEO_SHARED_CONTEXT: case MENU_ENUM_LABEL_VIDEO_SHARED_CONTEXT:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_video_shared_context); BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_video_shared_context);
break; break;

View File

@ -1120,27 +1120,31 @@ enum msg_hash_enums
MENU_ENUM_LABEL_AUDIO_ENABLE, MENU_ENUM_LABEL_AUDIO_ENABLE,
MENU_ENUM_LABEL_AUDIO_SYNC, MENU_ENUM_LABEL_AUDIO_SYNC,
MENU_ENUM_LABEL_AUDIO_VOLUME, MENU_ENUM_LABEL_AUDIO_VOLUME,
MENU_ENUM_LABEL_AUDIO_LATENCY,
MENU_ENUM_LABEL_AUDIO_RATE_CONTROL_DELTA, MENU_ENUM_LABEL_AUDIO_RATE_CONTROL_DELTA,
MENU_ENUM_LABEL_AUDIO_MAX_TIMING_SKEW, MENU_ENUM_LABEL_AUDIO_MAX_TIMING_SKEW,
MENU_ENUM_LABEL_AUDIO_DEVICE, MENU_ENUM_LABEL_AUDIO_DEVICE,
MENU_ENUM_LABEL_AUDIO_BLOCK_FRAMES, MENU_ENUM_LABEL_AUDIO_BLOCK_FRAMES,
MENU_ENUM_LABEL_AUDIO_MUTE,
MENU_ENUM_LABEL_AUDIO_OUTPUT_RATE, MENU_ENUM_LABEL_AUDIO_OUTPUT_RATE,
MENU_ENUM_LABEL_AUDIO_DSP_PLUGIN, MENU_ENUM_LABEL_AUDIO_DSP_PLUGIN,
MENU_ENUM_LABEL_AUDIO_MUTE,
MENU_ENUM_LABEL_VALUE_AUDIO_MUTE, MENU_ENUM_LABEL_VALUE_AUDIO_MUTE,
MENU_ENUM_SUBLABEL_AUDIO_MUTE,
MENU_ENUM_LABEL_VALUE_AUDIO_OUTPUT_RATE, MENU_ENUM_LABEL_VALUE_AUDIO_OUTPUT_RATE,
MENU_ENUM_LABEL_VALUE_AUDIO_DSP_PLUGIN, MENU_ENUM_LABEL_VALUE_AUDIO_DSP_PLUGIN,
MENU_ENUM_LABEL_VALUE_AUDIO_BLOCK_FRAMES, MENU_ENUM_LABEL_VALUE_AUDIO_BLOCK_FRAMES,
MENU_ENUM_LABEL_VALUE_AUDIO_ENABLE, MENU_ENUM_LABEL_VALUE_AUDIO_ENABLE,
MENU_ENUM_LABEL_VALUE_AUDIO_SYNC, MENU_ENUM_LABEL_VALUE_AUDIO_SYNC,
MENU_ENUM_LABEL_VALUE_AUDIO_VOLUME, MENU_ENUM_LABEL_VALUE_AUDIO_VOLUME,
MENU_ENUM_LABEL_VALUE_AUDIO_LATENCY,
MENU_ENUM_LABEL_VALUE_AUDIO_RATE_CONTROL_DELTA, MENU_ENUM_LABEL_VALUE_AUDIO_RATE_CONTROL_DELTA,
MENU_ENUM_LABEL_VALUE_AUDIO_MAX_TIMING_SKEW, MENU_ENUM_LABEL_VALUE_AUDIO_MAX_TIMING_SKEW,
MENU_ENUM_LABEL_VALUE_AUDIO_DEVICE, MENU_ENUM_LABEL_VALUE_AUDIO_DEVICE,
MENU_ENUM_LABEL_AUDIO_LATENCY,
MENU_ENUM_LABEL_VALUE_AUDIO_LATENCY,
MENU_ENUM_SUBLABEL_AUDIO_LATENCY,
MENU_ENUM_LABEL_SAVE_STATE, MENU_ENUM_LABEL_SAVE_STATE,
MENU_ENUM_LABEL_VALUE_LOAD_STATE, MENU_ENUM_LABEL_VALUE_LOAD_STATE,
MENU_ENUM_LABEL_VALUE_UNDO_LOAD_STATE, MENU_ENUM_LABEL_VALUE_UNDO_LOAD_STATE,