Add customized string for 'no Music Available'

This commit is contained in:
twinaphex 2018-11-05 13:59:38 +01:00
parent 1116e9afda
commit 70ccbb6fb5
22 changed files with 87 additions and 9 deletions

View File

@ -3706,3 +3706,7 @@ MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHER,
"Higher") "Higher")
MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHEST, MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHEST,
"Highest") "Highest")
MSG_HASH(
MENU_ENUM_LABEL_VALUE_NO_MUSIC_AVAILABLE,
"No music available."
)

View File

@ -4725,3 +4725,7 @@ MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHER,
"Higher") "Higher")
MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHEST, MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHEST,
"Highest") "Highest")
MSG_HASH(
MENU_ENUM_LABEL_VALUE_NO_MUSIC_AVAILABLE,
"No music available."
)

View File

@ -3482,3 +3482,7 @@ MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHER,
"Higher") "Higher")
MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHEST, MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHEST,
"Highest") "Highest")
MSG_HASH(
MENU_ENUM_LABEL_VALUE_NO_MUSIC_AVAILABLE,
"No music available."
)

View File

@ -3618,3 +3618,7 @@ MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHER,
"Higher") "Higher")
MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHEST, MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHEST,
"Highest") "Highest")
MSG_HASH(
MENU_ENUM_LABEL_VALUE_NO_MUSIC_AVAILABLE,
"No music available."
)

View File

@ -7710,3 +7710,7 @@ MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHER,
"Higher") "Higher")
MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHEST, MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHEST,
"Highest") "Highest")
MSG_HASH(
MENU_ENUM_LABEL_VALUE_NO_MUSIC_AVAILABLE,
"No music available."
)

View File

@ -3357,3 +3357,7 @@ MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHER,
"Higher") "Higher")
MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHEST, MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHEST,
"Highest") "Highest")
MSG_HASH(
MENU_ENUM_LABEL_VALUE_NO_MUSIC_AVAILABLE,
"No music available."
)

View File

@ -7647,3 +7647,7 @@ MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHER,
"Higher") "Higher")
MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHEST, MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHEST,
"Highest") "Highest")
MSG_HASH(
MENU_ENUM_LABEL_VALUE_NO_MUSIC_AVAILABLE,
"No music available."
)

View File

@ -3516,3 +3516,7 @@ MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHER,
"Higher") "Higher")
MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHEST, MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHEST,
"Highest") "Highest")
MSG_HASH(
MENU_ENUM_LABEL_VALUE_NO_MUSIC_AVAILABLE,
"No music available."
)

View File

@ -3576,3 +3576,7 @@ MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHER,
"Higher") "Higher")
MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHEST, MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHEST,
"Highest") "Highest")
MSG_HASH(
MENU_ENUM_LABEL_VALUE_NO_MUSIC_AVAILABLE,
"No music available."
)

View File

@ -4025,3 +4025,7 @@ MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHER,
"Higher") "Higher")
MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHEST, MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHEST,
"Highest") "Highest")
MSG_HASH(
MENU_ENUM_LABEL_VALUE_NO_MUSIC_AVAILABLE,
"No music available."
)

View File

@ -3477,3 +3477,7 @@ MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHER,
"Higher") "Higher")
MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHEST, MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHEST,
"Highest") "Highest")
MSG_HASH(
MENU_ENUM_LABEL_VALUE_NO_MUSIC_AVAILABLE,
"No music available."
)

View File

@ -1727,3 +1727,5 @@ MSG_HASH(MENU_ENUM_LABEL_RESET_TO_DEFAULT_CONFIG,
"reset_to_default_config") "reset_to_default_config")
MSG_HASH(MENU_ENUM_LABEL_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME, MSG_HASH(MENU_ENUM_LABEL_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME,
"menu_use_preferred_system_color_theme") "menu_use_preferred_system_color_theme")
MSG_HASH(MENU_ENUM_LABEL_NO_MUSIC_AVAILABLE,
"no_music")

View File

@ -3363,3 +3363,7 @@ MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHER,
"Hoger") "Hoger")
MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHEST, MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHEST,
"Hoogst") "Hoogst")
MSG_HASH(
MENU_ENUM_LABEL_VALUE_NO_MUSIC_AVAILABLE,
"Geen muziek beschikbaar."
)

View File

@ -3779,3 +3779,7 @@ MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHER,
"Higher") "Higher")
MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHEST, MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHEST,
"Highest") "Highest")
MSG_HASH(
MENU_ENUM_LABEL_VALUE_NO_MUSIC_AVAILABLE,
"No music available."
)

View File

@ -7741,3 +7741,7 @@ MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHER,
"Higher") "Higher")
MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHEST, MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHEST,
"Highest") "Highest")
MSG_HASH(
MENU_ENUM_LABEL_VALUE_NO_MUSIC_AVAILABLE,
"No music available."
)

View File

@ -3443,3 +3443,7 @@ MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHER,
"Higher") "Higher")
MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHEST, MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHEST,
"Highest") "Highest")
MSG_HASH(
MENU_ENUM_LABEL_VALUE_NO_MUSIC_AVAILABLE,
"No music available."
)

View File

@ -3646,3 +3646,7 @@ MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHER,
"Higher") "Higher")
MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHEST, MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHEST,
"Highest") "Highest")
MSG_HASH(
MENU_ENUM_LABEL_VALUE_NO_MUSIC_AVAILABLE,
"No music available."
)

View File

@ -7741,3 +7741,7 @@ MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHER,
"Higher") "Higher")
MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHEST, MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHEST,
"Highest") "Highest")
MSG_HASH(
MENU_ENUM_LABEL_VALUE_NO_MUSIC_AVAILABLE,
"No music available."
)

View File

@ -3516,3 +3516,7 @@ MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHER,
"Higher") "Higher")
MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHEST, MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHEST,
"Highest") "Highest")
MSG_HASH(
MENU_ENUM_LABEL_VALUE_NO_MUSIC_AVAILABLE,
"No music available."
)

View File

@ -1377,6 +1377,7 @@ static int menu_displaylist_parse_playlist(menu_displaylist_info_t *info,
else else
menu_entries_append_enum(info->list, label, menu_entries_append_enum(info->list, label,
path, MENU_ENUM_LABEL_PLAYLIST_ENTRY, FILE_TYPE_RPL_ENTRY, 0, i); path, MENU_ENUM_LABEL_PLAYLIST_ENTRY, FILE_TYPE_RPL_ENTRY, 0, i);
info->count++;
free(path_copy); free(path_copy);
free(fill_buf); free(fill_buf);
@ -4052,18 +4053,14 @@ static void menu_displaylist_parse_playlist_generic(
int *ret) int *ret)
{ {
playlist_t *playlist = NULL; playlist_t *playlist = NULL;
char *path_playlist = NULL;
menu_displaylist_set_new_playlist(menu, playlist_path); menu_displaylist_set_new_playlist(menu, playlist_path);
playlist = playlist_get_cached(); playlist = playlist_get_cached();
path_playlist = strdup(playlist_name);
if (playlist) if (playlist)
*ret = menu_displaylist_parse_playlist(info, *ret = menu_displaylist_parse_playlist(info,
playlist, path_playlist, true); playlist, playlist_name, true);
free(path_playlist);
} }
#ifdef HAVE_NETWORKING #ifdef HAVE_NETWORKING
@ -4762,19 +4759,23 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, menu_displaylist
case DISPLAYLIST_MUSIC_HISTORY: case DISPLAYLIST_MUSIC_HISTORY:
{ {
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
info->count = 0;
if (settings->bools.history_list_enable) if (settings->bools.history_list_enable)
menu_displaylist_parse_playlist_generic(menu, info, menu_displaylist_parse_playlist_generic(menu, info,
"music_history", "music_history",
settings->paths.path_content_music_history, settings->paths.path_content_music_history,
&ret); &ret);
else
if (info->count == 0)
{ {
menu_entries_append_enum(info->list, menu_entries_append_enum(info->list,
msg_hash_to_str( msg_hash_to_str(
MENU_ENUM_LABEL_VALUE_NO_HISTORY_AVAILABLE), MENU_ENUM_LABEL_VALUE_NO_MUSIC_AVAILABLE),
msg_hash_to_str(MENU_ENUM_LABEL_NO_HISTORY_AVAILABLE), msg_hash_to_str(MENU_ENUM_LABEL_NO_MUSIC_AVAILABLE),
MENU_ENUM_LABEL_NO_HISTORY_AVAILABLE, MENU_ENUM_LABEL_NO_MUSIC_AVAILABLE,
MENU_INFO_MESSAGE, 0, 0); MENU_INFO_MESSAGE, 0, 0);
info->need_push_no_playlist_entries = false;
ret = 0; ret = 0;
} }
} }

View File

@ -206,6 +206,8 @@ typedef struct menu_displaylist_info
/* does the navigation index need to be cleared to 0 (first entry) ? */ /* does the navigation index need to be cleared to 0 (first entry) ? */
bool need_navigation_clear; bool need_navigation_clear;
unsigned count;
char *path; char *path;
char *path_b; char *path_b;
char *path_c; char *path_c;

View File

@ -438,6 +438,7 @@ enum msg_hash_enums
MENU_LABEL(FILTER_BY_CURRENT_CORE), MENU_LABEL(FILTER_BY_CURRENT_CORE),
MENU_LABEL(NO_HISTORY_AVAILABLE), MENU_LABEL(NO_HISTORY_AVAILABLE),
MENU_LABEL(NO_MUSIC_AVAILABLE),
MENU_ENUM_LABEL_DISCORD_IN_MENU, MENU_ENUM_LABEL_DISCORD_IN_MENU,
MENU_ENUM_LABEL_VALUE_DISCORD_IN_MENU, MENU_ENUM_LABEL_VALUE_DISCORD_IN_MENU,