diff options
| author | William Wilgus <me.theuser@yahoo.com> | 2024-12-07 23:00:35 -0500 |
|---|---|---|
| committer | William Wilgus <me.theuser@yahoo.com> | 2024-12-07 23:02:22 -0500 |
| commit | bcc8c608e5cc321eec35b916bad2b338de6e0197 (patch) | |
| tree | 5d4fa3d4b6f4df21c856d9051f0e84cbe15ef698 | |
| parent | 44bfffd7c5c443068eb739410df00fe8d76fd8dd (diff) | |
| download | rockbox-bcc8c608e5.tar.gz rockbox-bcc8c608e5.zip | |
Revert "FS#13429: Add a freeform "player name" configuration setting"
This reverts commit 2bb9323de8e4edc0a04ccf7ccf61e3026b5ef847.
Reason for revert:superseded g#6154
Change-Id: I59250be7ecc6a08698be3429dc02a85272fcb9da
| -rw-r--r-- | apps/settings.h | 1 | ||||
| -rw-r--r-- | apps/settings_list.c | 6 | ||||
| -rw-r--r-- | manual/appendix/config_file_options.tex | 1 |
3 files changed, 2 insertions, 6 deletions
diff --git a/apps/settings.h b/apps/settings.h index 4f43c4f771..54c7b62236 100644 --- a/apps/settings.h +++ b/apps/settings.h @@ -811,7 +811,6 @@ struct user_settings #ifdef HAVE_REMOTE_LCD unsigned char remote_ui_vp_config[64]; /* viewport string for the remote lists */ #endif - char player_name[64]; /* Name of the local player */ struct compressor_settings compressor_settings; diff --git a/apps/settings_list.c b/apps/settings_list.c index 6275b4d119..ccc754f6d8 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c @@ -998,7 +998,7 @@ const struct settings_list settings[] = { play_frequency, LANG_FREQUENCY, 0, "playback frequency", "auto", UNIT_KHZ, formatter_freq_unit_0_is_auto, getlang_freq_unit_0_is_auto, - playback_frequency_callback, + playback_frequency_callback, #if HAVE_PLAY_FREQ >= 192 7,0,SAMPR_44,SAMPR_48,SAMPR_88,SAMPR_96,SAMPR_176,SAMPR_192), #elif HAVE_PLAY_FREQ >= 96 @@ -1888,7 +1888,7 @@ const struct settings_list settings[] = { #ifdef HAVE_BACKLIGHT CHOICE_SETTING(0, backlight_on_button_hold, LANG_BACKLIGHT_ON_BUTTON_HOLD, -#ifdef HAS_BUTTON_HOLD +#ifdef HAS_BUTTON_HOLD 1, #else 0, @@ -2222,8 +2222,6 @@ const struct settings_list settings[] = { VIEWPORT_SETTING(remote_ui_vp_config, "remote ui viewport"), #endif - TEXT_SETTING(F_THEMESETTING, player_name, "player name", "", NULL, NULL), - #ifdef HAVE_MORSE_INPUT OFFON_SETTING(0, morse_input, LANG_MORSE_INPUT, false, "morse input", NULL), #endif diff --git a/manual/appendix/config_file_options.tex b/manual/appendix/config_file_options.tex index cb31068964..e6bfa0704b 100644 --- a/manual/appendix/config_file_options.tex +++ b/manual/appendix/config_file_options.tex @@ -385,7 +385,6 @@ clear settings on hold & off, on & N/A\\ }% - player name & freeform text, defaults to an empty string & N/A\\ \bottomrule \end{longtable} \end{center} |