devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Revert "FS#13429: Add a freeform "player name" configuration setting"

Browse source 
This reverts commit 2bb9323de8.

Reason for revert:superseded g#6154

Change-Id: I59250be7ecc6a08698be3429dc02a85272fcb9da
This commit is contained in:
William Wilgus 2024-12-07 23:00:35 -05:00
parent 44bfffd7c5
commit bcc8c608e5
3 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
apps/settings.h
View file

@ -811,7 +811,6 @@ struct user_settings
#ifdef HAVE_REMOTE_LCD #ifdef HAVE_REMOTE_LCD
unsigned char remote_ui_vp_config[64]; /* viewport string for the remote lists */ unsigned char remote_ui_vp_config[64]; /* viewport string for the remote lists */
#endif #endif
char player_name[64]; /* Name of the local player */
struct compressor_settings compressor_settings; struct compressor_settings compressor_settings;

6
apps/settings_list.c
View file

@ -998,7 +998,7 @@ const struct settings_list settings[] = {
play_frequency, LANG_FREQUENCY, 0, "playback frequency", "auto", play_frequency, LANG_FREQUENCY, 0, "playback frequency", "auto",
UNIT_KHZ, formatter_freq_unit_0_is_auto, UNIT_KHZ, formatter_freq_unit_0_is_auto,
getlang_freq_unit_0_is_auto, getlang_freq_unit_0_is_auto,
playback_frequency_callback, playback_frequency_callback,
#if HAVE_PLAY_FREQ >= 192 #if HAVE_PLAY_FREQ >= 192
7,0,SAMPR_44,SAMPR_48,SAMPR_88,SAMPR_96,SAMPR_176,SAMPR_192), 7,0,SAMPR_44,SAMPR_48,SAMPR_88,SAMPR_96,SAMPR_176,SAMPR_192),
#elif HAVE_PLAY_FREQ >= 96 #elif HAVE_PLAY_FREQ >= 96
@ -1888,7 +1888,7 @@ const struct settings_list settings[] = {
#ifdef HAVE_BACKLIGHT #ifdef HAVE_BACKLIGHT
CHOICE_SETTING(0, backlight_on_button_hold, CHOICE_SETTING(0, backlight_on_button_hold,
LANG_BACKLIGHT_ON_BUTTON_HOLD, LANG_BACKLIGHT_ON_BUTTON_HOLD,
#ifdef HAS_BUTTON_HOLD #ifdef HAS_BUTTON_HOLD
1, 1,
#else #else
0, 0,
@ -2222,8 +2222,6 @@ const struct settings_list settings[] = {
VIEWPORT_SETTING(remote_ui_vp_config, "remote ui viewport"), VIEWPORT_SETTING(remote_ui_vp_config, "remote ui viewport"),
#endif #endif
TEXT_SETTING(F_THEMESETTING, player_name, "player name", "", NULL, NULL),
#ifdef HAVE_MORSE_INPUT #ifdef HAVE_MORSE_INPUT
OFFON_SETTING(0, morse_input, LANG_MORSE_INPUT, false, "morse input", NULL), OFFON_SETTING(0, morse_input, LANG_MORSE_INPUT, false, "morse input", NULL),
#endif #endif

1
manual/appendix/config_file_options.tex
View file

@ -385,7 +385,6 @@
clear settings on hold clear settings on hold
& off, on & N/A\\ & off, on & N/A\\
}% }%
player name & freeform text, defaults to an empty string & N/A\\
\bottomrule \bottomrule
\end{longtable} \end{longtable}
\end{center} \end{center}