From 965149d425d3be54ed7dd25b30c82c72939d0e6d Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 3 May 2018 01:47:52 +0200 Subject: [PATCH] Add sublabels for mixer actions --- intl/msg_hash_ar.h | 12 +++++++ intl/msg_hash_chs.h | 12 +++++++ intl/msg_hash_cht.h | 12 +++++++ intl/msg_hash_de.h | 12 +++++++ intl/msg_hash_eo.h | 12 +++++++ intl/msg_hash_es.h | 12 +++++++ intl/msg_hash_fr.h | 12 +++++++ intl/msg_hash_it.h | 12 +++++++ intl/msg_hash_ja.h | 12 +++++++ intl/msg_hash_ko.h | 12 +++++++ intl/msg_hash_nl.h | 12 +++++++ intl/msg_hash_pl.h | 12 +++++++ intl/msg_hash_pt_br.h | 12 +++++++ intl/msg_hash_pt_pt.h | 12 +++++++ intl/msg_hash_ru.h | 12 +++++++ intl/msg_hash_us.h | 12 +++++++ intl/msg_hash_vn.h | 12 +++++++ menu/cbs/menu_cbs_sublabel.c | 62 ++++++++++++++++++++++++++++++++---- msg_hash.h | 6 ++++ 19 files changed, 265 insertions(+), 7 deletions(-) diff --git a/intl/msg_hash_ar.h b/intl/msg_hash_ar.h index 6ce1b3ec76..9a1ce25588 100644 --- a/intl/msg_hash_ar.h +++ b/intl/msg_hash_ar.h @@ -3473,3 +3473,15 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_QUICK_MENU_OVERRIDE_OPTIONS, "Configuration Override options") MSG_HASH(MENU_ENUM_SUBLABEL_QUICK_MENU_OVERRIDE_OPTIONS, "Options for overriding the global configuration.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY, + "Will start playback of the audio stream. Once finished, it will remove the current audio stream from memory.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY_LOOPED, + "Will start playback of the audio stream. Once finished, it will loop and play the track again from the beginning.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY_SEQUENTIAL, + "Will start playback of the audio stream. Once finished, it will jump to the next audio stream in sequential order and repeat this behavior. Useful as an album playback mode.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_STOP, + "This will stop playback of the audio stream, but not remove it from memory. You can start playing it again by selecting 'Play'.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_REMOVE, + "This will stop playback of the audio stream and remove it entirely from memory.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_VOLUME, + "Adjust the volume of the audio stream.") diff --git a/intl/msg_hash_chs.h b/intl/msg_hash_chs.h index 4e88ae3fe5..aea216c503 100644 --- a/intl/msg_hash_chs.h +++ b/intl/msg_hash_chs.h @@ -3259,3 +3259,15 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_QUICK_MENU_OVERRIDE_OPTIONS, "Configuration Override options") MSG_HASH(MENU_ENUM_SUBLABEL_QUICK_MENU_OVERRIDE_OPTIONS, "Options for overriding the global configuration.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY, + "Will start playback of the audio stream. Once finished, it will remove the current audio stream from memory.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY_LOOPED, + "Will start playback of the audio stream. Once finished, it will loop and play the track again from the beginning.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY_SEQUENTIAL, + "Will start playback of the audio stream. Once finished, it will jump to the next audio stream in sequential order and repeat this behavior. Useful as an album playback mode.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_STOP, + "This will stop playback of the audio stream, but not remove it from memory. You can start playing it again by selecting 'Play'.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_REMOVE, + "This will stop playback of the audio stream and remove it entirely from memory.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_VOLUME, + "Adjust the volume of the audio stream.") diff --git a/intl/msg_hash_cht.h b/intl/msg_hash_cht.h index d3887aa01b..ff446707cc 100644 --- a/intl/msg_hash_cht.h +++ b/intl/msg_hash_cht.h @@ -3251,3 +3251,15 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_QUICK_MENU_OVERRIDE_OPTIONS, "Configuration Override options") MSG_HASH(MENU_ENUM_SUBLABEL_QUICK_MENU_OVERRIDE_OPTIONS, "Options for overriding the global configuration.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY, + "Will start playback of the audio stream. Once finished, it will remove the current audio stream from memory.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY_LOOPED, + "Will start playback of the audio stream. Once finished, it will loop and play the track again from the beginning.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY_SEQUENTIAL, + "Will start playback of the audio stream. Once finished, it will jump to the next audio stream in sequential order and repeat this behavior. Useful as an album playback mode.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_STOP, + "This will stop playback of the audio stream, but not remove it from memory. You can start playing it again by selecting 'Play'.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_REMOVE, + "This will stop playback of the audio stream and remove it entirely from memory.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_VOLUME, + "Adjust the volume of the audio stream.") diff --git a/intl/msg_hash_de.h b/intl/msg_hash_de.h index f85cea240e..a3a6e21664 100644 --- a/intl/msg_hash_de.h +++ b/intl/msg_hash_de.h @@ -3365,3 +3365,15 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_QUICK_MENU_OVERRIDE_OPTIONS, "Configuration Override options") MSG_HASH(MENU_ENUM_SUBLABEL_QUICK_MENU_OVERRIDE_OPTIONS, "Options for overriding the global configuration.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY, + "Will start playback of the audio stream. Once finished, it will remove the current audio stream from memory.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY_LOOPED, + "Will start playback of the audio stream. Once finished, it will loop and play the track again from the beginning.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY_SEQUENTIAL, + "Will start playback of the audio stream. Once finished, it will jump to the next audio stream in sequential order and repeat this behavior. Useful as an album playback mode.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_STOP, + "This will stop playback of the audio stream, but not remove it from memory. You can start playing it again by selecting 'Play'.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_REMOVE, + "This will stop playback of the audio stream and remove it entirely from memory.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_VOLUME, + "Adjust the volume of the audio stream.") diff --git a/intl/msg_hash_eo.h b/intl/msg_hash_eo.h index c732920321..3baa38287a 100644 --- a/intl/msg_hash_eo.h +++ b/intl/msg_hash_eo.h @@ -3124,3 +3124,15 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_QUICK_MENU_OVERRIDE_OPTIONS, "Configuration Override options") MSG_HASH(MENU_ENUM_SUBLABEL_QUICK_MENU_OVERRIDE_OPTIONS, "Options for overriding the global configuration.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY, + "Will start playback of the audio stream. Once finished, it will remove the current audio stream from memory.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY_LOOPED, + "Will start playback of the audio stream. Once finished, it will loop and play the track again from the beginning.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY_SEQUENTIAL, + "Will start playback of the audio stream. Once finished, it will jump to the next audio stream in sequential order and repeat this behavior. Useful as an album playback mode.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_STOP, + "This will stop playback of the audio stream, but not remove it from memory. You can start playing it again by selecting 'Play'.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_REMOVE, + "This will stop playback of the audio stream and remove it entirely from memory.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_VOLUME, + "Adjust the volume of the audio stream.") diff --git a/intl/msg_hash_es.h b/intl/msg_hash_es.h index ee1b4b033e..63b57fe18d 100644 --- a/intl/msg_hash_es.h +++ b/intl/msg_hash_es.h @@ -5857,3 +5857,15 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_QUICK_MENU_OVERRIDE_OPTIONS, "Configuration Override options") MSG_HASH(MENU_ENUM_SUBLABEL_QUICK_MENU_OVERRIDE_OPTIONS, "Options for overriding the global configuration.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY, + "Will start playback of the audio stream. Once finished, it will remove the current audio stream from memory.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY_LOOPED, + "Will start playback of the audio stream. Once finished, it will loop and play the track again from the beginning.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY_SEQUENTIAL, + "Will start playback of the audio stream. Once finished, it will jump to the next audio stream in sequential order and repeat this behavior. Useful as an album playback mode.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_STOP, + "This will stop playback of the audio stream, but not remove it from memory. You can start playing it again by selecting 'Play'.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_REMOVE, + "This will stop playback of the audio stream and remove it entirely from memory.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_VOLUME, + "Adjust the volume of the audio stream.") diff --git a/intl/msg_hash_fr.h b/intl/msg_hash_fr.h index cbc07698b1..134e8a48bb 100644 --- a/intl/msg_hash_fr.h +++ b/intl/msg_hash_fr.h @@ -3289,3 +3289,15 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_QUICK_MENU_OVERRIDE_OPTIONS, "Configuration Override options") MSG_HASH(MENU_ENUM_SUBLABEL_QUICK_MENU_OVERRIDE_OPTIONS, "Options for overriding the global configuration.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY, + "Will start playback of the audio stream. Once finished, it will remove the current audio stream from memory.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY_LOOPED, + "Will start playback of the audio stream. Once finished, it will loop and play the track again from the beginning.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY_SEQUENTIAL, + "Will start playback of the audio stream. Once finished, it will jump to the next audio stream in sequential order and repeat this behavior. Useful as an album playback mode.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_STOP, + "This will stop playback of the audio stream, but not remove it from memory. You can start playing it again by selecting 'Play'.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_REMOVE, + "This will stop playback of the audio stream and remove it entirely from memory.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_VOLUME, + "Adjust the volume of the audio stream.") diff --git a/intl/msg_hash_it.h b/intl/msg_hash_it.h index d072048855..00575698f3 100644 --- a/intl/msg_hash_it.h +++ b/intl/msg_hash_it.h @@ -3347,3 +3347,15 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_QUICK_MENU_OVERRIDE_OPTIONS, "Configuration Override options") MSG_HASH(MENU_ENUM_SUBLABEL_QUICK_MENU_OVERRIDE_OPTIONS, "Options for overriding the global configuration.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY, + "Will start playback of the audio stream. Once finished, it will remove the current audio stream from memory.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY_LOOPED, + "Will start playback of the audio stream. Once finished, it will loop and play the track again from the beginning.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY_SEQUENTIAL, + "Will start playback of the audio stream. Once finished, it will jump to the next audio stream in sequential order and repeat this behavior. Useful as an album playback mode.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_STOP, + "This will stop playback of the audio stream, but not remove it from memory. You can start playing it again by selecting 'Play'.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_REMOVE, + "This will stop playback of the audio stream and remove it entirely from memory.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_VOLUME, + "Adjust the volume of the audio stream.") diff --git a/intl/msg_hash_ja.h b/intl/msg_hash_ja.h index 43bc28061b..7ef0fd2ef1 100644 --- a/intl/msg_hash_ja.h +++ b/intl/msg_hash_ja.h @@ -3501,3 +3501,15 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_QUICK_MENU_OVERRIDE_OPTIONS, "Configuration Override options") MSG_HASH(MENU_ENUM_SUBLABEL_QUICK_MENU_OVERRIDE_OPTIONS, "Options for overriding the global configuration.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY, + "Will start playback of the audio stream. Once finished, it will remove the current audio stream from memory.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY_LOOPED, + "Will start playback of the audio stream. Once finished, it will loop and play the track again from the beginning.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY_SEQUENTIAL, + "Will start playback of the audio stream. Once finished, it will jump to the next audio stream in sequential order and repeat this behavior. Useful as an album playback mode.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_STOP, + "This will stop playback of the audio stream, but not remove it from memory. You can start playing it again by selecting 'Play'.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_REMOVE, + "This will stop playback of the audio stream and remove it entirely from memory.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_VOLUME, + "Adjust the volume of the audio stream.") diff --git a/intl/msg_hash_ko.h b/intl/msg_hash_ko.h index f3ec45dbf7..57ef44af3d 100644 --- a/intl/msg_hash_ko.h +++ b/intl/msg_hash_ko.h @@ -3250,3 +3250,15 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_QUICK_MENU_OVERRIDE_OPTIONS, "Configuration Override options") MSG_HASH(MENU_ENUM_SUBLABEL_QUICK_MENU_OVERRIDE_OPTIONS, "Options for overriding the global configuration.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY, + "Will start playback of the audio stream. Once finished, it will remove the current audio stream from memory.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY_LOOPED, + "Will start playback of the audio stream. Once finished, it will loop and play the track again from the beginning.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY_SEQUENTIAL, + "Will start playback of the audio stream. Once finished, it will jump to the next audio stream in sequential order and repeat this behavior. Useful as an album playback mode.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_STOP, + "This will stop playback of the audio stream, but not remove it from memory. You can start playing it again by selecting 'Play'.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_REMOVE, + "This will stop playback of the audio stream and remove it entirely from memory.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_VOLUME, + "Adjust the volume of the audio stream.") diff --git a/intl/msg_hash_nl.h b/intl/msg_hash_nl.h index 654b6e3183..932f756d8c 100644 --- a/intl/msg_hash_nl.h +++ b/intl/msg_hash_nl.h @@ -3126,3 +3126,15 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_QUICK_MENU_OVERRIDE_OPTIONS, "Configuration Override options") MSG_HASH(MENU_ENUM_SUBLABEL_QUICK_MENU_OVERRIDE_OPTIONS, "Options for overriding the global configuration.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY, + "Will start playback of the audio stream. Once finished, it will remove the current audio stream from memory.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY_LOOPED, + "Will start playback of the audio stream. Once finished, it will loop and play the track again from the beginning.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY_SEQUENTIAL, + "Will start playback of the audio stream. Once finished, it will jump to the next audio stream in sequential order and repeat this behavior. Useful as an album playback mode.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_STOP, + "This will stop playback of the audio stream, but not remove it from memory. You can start playing it again by selecting 'Play'.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_REMOVE, + "This will stop playback of the audio stream and remove it entirely from memory.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_VOLUME, + "Adjust the volume of the audio stream.") diff --git a/intl/msg_hash_pl.h b/intl/msg_hash_pl.h index d7cd7b0333..6bf1d0817f 100644 --- a/intl/msg_hash_pl.h +++ b/intl/msg_hash_pl.h @@ -3485,3 +3485,15 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_QUICK_MENU_OVERRIDE_OPTIONS, "Configuration Override options") MSG_HASH(MENU_ENUM_SUBLABEL_QUICK_MENU_OVERRIDE_OPTIONS, "Options for overriding the global configuration.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY, + "Will start playback of the audio stream. Once finished, it will remove the current audio stream from memory.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY_LOOPED, + "Will start playback of the audio stream. Once finished, it will loop and play the track again from the beginning.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY_SEQUENTIAL, + "Will start playback of the audio stream. Once finished, it will jump to the next audio stream in sequential order and repeat this behavior. Useful as an album playback mode.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_STOP, + "This will stop playback of the audio stream, but not remove it from memory. You can start playing it again by selecting 'Play'.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_REMOVE, + "This will stop playback of the audio stream and remove it entirely from memory.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_VOLUME, + "Adjust the volume of the audio stream.") diff --git a/intl/msg_hash_pt_br.h b/intl/msg_hash_pt_br.h index d0a0402f14..5d7041b640 100644 --- a/intl/msg_hash_pt_br.h +++ b/intl/msg_hash_pt_br.h @@ -3650,3 +3650,15 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_QUICK_MENU_OVERRIDE_OPTIONS, "Configuration Override options") MSG_HASH(MENU_ENUM_SUBLABEL_QUICK_MENU_OVERRIDE_OPTIONS, "Options for overriding the global configuration.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY, + "Will start playback of the audio stream. Once finished, it will remove the current audio stream from memory.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY_LOOPED, + "Will start playback of the audio stream. Once finished, it will loop and play the track again from the beginning.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY_SEQUENTIAL, + "Will start playback of the audio stream. Once finished, it will jump to the next audio stream in sequential order and repeat this behavior. Useful as an album playback mode.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_STOP, + "This will stop playback of the audio stream, but not remove it from memory. You can start playing it again by selecting 'Play'.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_REMOVE, + "This will stop playback of the audio stream and remove it entirely from memory.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_VOLUME, + "Adjust the volume of the audio stream.") diff --git a/intl/msg_hash_pt_pt.h b/intl/msg_hash_pt_pt.h index 47df648239..8ca7e52eec 100644 --- a/intl/msg_hash_pt_pt.h +++ b/intl/msg_hash_pt_pt.h @@ -3224,3 +3224,15 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_QUICK_MENU_OVERRIDE_OPTIONS, "Configuration Override options") MSG_HASH(MENU_ENUM_SUBLABEL_QUICK_MENU_OVERRIDE_OPTIONS, "Options for overriding the global configuration.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY, + "Will start playback of the audio stream. Once finished, it will remove the current audio stream from memory.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY_LOOPED, + "Will start playback of the audio stream. Once finished, it will loop and play the track again from the beginning.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY_SEQUENTIAL, + "Will start playback of the audio stream. Once finished, it will jump to the next audio stream in sequential order and repeat this behavior. Useful as an album playback mode.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_STOP, + "This will stop playback of the audio stream, but not remove it from memory. You can start playing it again by selecting 'Play'.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_REMOVE, + "This will stop playback of the audio stream and remove it entirely from memory.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_VOLUME, + "Adjust the volume of the audio stream.") diff --git a/intl/msg_hash_ru.h b/intl/msg_hash_ru.h index 9afeba9632..ff64b49ab4 100644 --- a/intl/msg_hash_ru.h +++ b/intl/msg_hash_ru.h @@ -3308,3 +3308,15 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_QUICK_MENU_OVERRIDE_OPTIONS, "Configuration Override options") MSG_HASH(MENU_ENUM_SUBLABEL_QUICK_MENU_OVERRIDE_OPTIONS, "Options for overriding the global configuration.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY, + "Will start playback of the audio stream. Once finished, it will remove the current audio stream from memory.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY_LOOPED, + "Will start playback of the audio stream. Once finished, it will loop and play the track again from the beginning.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY_SEQUENTIAL, + "Will start playback of the audio stream. Once finished, it will jump to the next audio stream in sequential order and repeat this behavior. Useful as an album playback mode.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_STOP, + "This will stop playback of the audio stream, but not remove it from memory. You can start playing it again by selecting 'Play'.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_REMOVE, + "This will stop playback of the audio stream and remove it entirely from memory.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_VOLUME, + "Adjust the volume of the audio stream.") diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index 959baa0e31..c658e3e9b5 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -3650,3 +3650,15 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_QUICK_MENU_OVERRIDE_OPTIONS, "Configuration Override options") MSG_HASH(MENU_ENUM_SUBLABEL_QUICK_MENU_OVERRIDE_OPTIONS, "Options for overriding the global configuration.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY, + "Will start playback of the audio stream. Once finished, it will remove the current audio stream from memory.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY_LOOPED, + "Will start playback of the audio stream. Once finished, it will loop and play the track again from the beginning.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY_SEQUENTIAL, + "Will start playback of the audio stream. Once finished, it will jump to the next audio stream in sequential order and repeat this behavior. Useful as an album playback mode.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_STOP, + "This will stop playback of the audio stream, but not remove it from memory. You can start playing it again by selecting 'Play'.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_REMOVE, + "This will stop playback of the audio stream and remove it entirely from memory.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_VOLUME, + "Adjust the volume of the audio stream.") diff --git a/intl/msg_hash_vn.h b/intl/msg_hash_vn.h index 7632670027..d02b9b8217 100644 --- a/intl/msg_hash_vn.h +++ b/intl/msg_hash_vn.h @@ -3281,3 +3281,15 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_QUICK_MENU_OVERRIDE_OPTIONS, "Configuration Override options") MSG_HASH(MENU_ENUM_SUBLABEL_QUICK_MENU_OVERRIDE_OPTIONS, "Options for overriding the global configuration.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY, + "Will start playback of the audio stream. Once finished, it will remove the current audio stream from memory.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY_LOOPED, + "Will start playback of the audio stream. Once finished, it will loop and play the track again from the beginning.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY_SEQUENTIAL, + "Will start playback of the audio stream. Once finished, it will jump to the next audio stream in sequential order and repeat this behavior. Useful as an album playback mode.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_STOP, + "This will stop playback of the audio stream, but not remove it from memory. You can start playing it again by selecting 'Play'.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_REMOVE, + "This will stop playback of the audio stream and remove it entirely from memory.") +MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_VOLUME, + "Adjust the volume of the audio stream.") diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c index 4788e5bc07..95cfef2909 100644 --- a/menu/cbs/menu_cbs_sublabel.c +++ b/menu/cbs/menu_cbs_sublabel.c @@ -49,6 +49,18 @@ return 0; \ } +default_sublabel_macro(menu_action_sublabel_setting_audio_mixer_stream_play, + MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY) +default_sublabel_macro(menu_action_sublabel_setting_audio_mixer_stream_play_looped, + MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY_LOOPED) +default_sublabel_macro(menu_action_sublabel_setting_audio_mixer_stream_play_sequential, + MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY_SEQUENTIAL) +default_sublabel_macro(menu_action_sublabel_setting_audio_mixer_stream_stop, + MENU_ENUM_SUBLABEL_MIXER_ACTION_STOP) +default_sublabel_macro(menu_action_sublabel_setting_audio_mixer_stream_remove, + MENU_ENUM_SUBLABEL_MIXER_ACTION_REMOVE) +default_sublabel_macro(menu_action_sublabel_setting_audio_mixer_stream_volume, + MENU_ENUM_SUBLABEL_MIXER_ACTION_VOLUME) default_sublabel_macro(action_bind_sublabel_quick_menu_override_options, MENU_ENUM_SUBLABEL_QUICK_MENU_OVERRIDE_OPTIONS) default_sublabel_macro(action_bind_sublabel_crt_switchres, MENU_ENUM_SUBLABEL_CRT_SWITCH_RESOLUTION) default_sublabel_macro(action_bind_sublabel_crt_switchres_super, MENU_ENUM_SUBLABEL_CRT_SWITCH_RESOLUTION_SUPER) @@ -444,13 +456,7 @@ static int action_bind_sublabel_remap_kbd_sublabel( const char *label, const char *path, char *s, size_t len) { - unsigned offset; - settings_t *settings = config_get_ptr(); - - if (!settings) - return 0; - - offset = type / ((MENU_SETTINGS_INPUT_DESC_KBD_END - + unsigned offset = type / ((MENU_SETTINGS_INPUT_DESC_KBD_END - (MENU_SETTINGS_INPUT_DESC_KBD_END - MENU_SETTINGS_INPUT_DESC_KBD_BEGIN))) - 1; @@ -579,6 +585,48 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs, { BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_remap_kbd_sublabel); } + else if (type >= MENU_SETTINGS_AUDIO_MIXER_STREAM_ACTIONS_PLAY_BEGIN + && type <= MENU_SETTINGS_AUDIO_MIXER_STREAM_ACTIONS_PLAY_END) + { + BIND_ACTION_SUBLABEL(cbs, + menu_action_sublabel_setting_audio_mixer_stream_play); + return 0; + } + else if (type >= MENU_SETTINGS_AUDIO_MIXER_STREAM_ACTIONS_PLAY_LOOPED_BEGIN + && type <= MENU_SETTINGS_AUDIO_MIXER_STREAM_ACTIONS_PLAY_LOOPED_END) + { + BIND_ACTION_SUBLABEL(cbs, + menu_action_sublabel_setting_audio_mixer_stream_play_looped); + return 0; + } + else if (type >= MENU_SETTINGS_AUDIO_MIXER_STREAM_ACTIONS_PLAY_SEQUENTIAL_BEGIN + && type <= MENU_SETTINGS_AUDIO_MIXER_STREAM_ACTIONS_PLAY_SEQUENTIAL_END) + { + BIND_ACTION_SUBLABEL(cbs, + menu_action_sublabel_setting_audio_mixer_stream_play_sequential); + return 0; + } + else if (type >= MENU_SETTINGS_AUDIO_MIXER_STREAM_ACTIONS_REMOVE_BEGIN + && type <= MENU_SETTINGS_AUDIO_MIXER_STREAM_ACTIONS_REMOVE_END) + { + BIND_ACTION_SUBLABEL(cbs, + menu_action_sublabel_setting_audio_mixer_stream_remove); + return 0; + } + else if (type >= MENU_SETTINGS_AUDIO_MIXER_STREAM_ACTIONS_STOP_BEGIN + && type <= MENU_SETTINGS_AUDIO_MIXER_STREAM_ACTIONS_STOP_END) + { + BIND_ACTION_SUBLABEL(cbs, + menu_action_sublabel_setting_audio_mixer_stream_stop); + return 0; + } + else if (type >= MENU_SETTINGS_AUDIO_MIXER_STREAM_ACTIONS_VOLUME_BEGIN + && type <= MENU_SETTINGS_AUDIO_MIXER_STREAM_ACTIONS_VOLUME_END) + { + BIND_ACTION_SUBLABEL(cbs, + menu_action_sublabel_setting_audio_mixer_stream_volume); + return 0; + } if (type >= MENU_SETTINGS_INPUT_DESC_BEGIN && type <= MENU_SETTINGS_INPUT_DESC_END) diff --git a/msg_hash.h b/msg_hash.h index 10e543d826..9429cc7cca 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -1761,6 +1761,12 @@ enum msg_hash_enums MENU_ENUM_LABEL_CB_UPDATE_SHADERS_SLANG, /* Sublabels */ + MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY, + MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY_LOOPED, + MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY_SEQUENTIAL, + MENU_ENUM_SUBLABEL_MIXER_ACTION_STOP, + MENU_ENUM_SUBLABEL_MIXER_ACTION_REMOVE, + MENU_ENUM_SUBLABEL_MIXER_ACTION_VOLUME, MENU_ENUM_SUBLABEL_INFORMATION_LIST_LIST, MENU_ENUM_SUBLABEL_SERVICES_SETTINGS,