diff --git a/src/core/fullscreenui_settings.cpp b/src/core/fullscreenui_settings.cpp index f946920fb..15faad844 100644 --- a/src/core/fullscreenui_settings.cpp +++ b/src/core/fullscreenui_settings.cpp @@ -2577,8 +2577,7 @@ void FullscreenUI::DrawConsoleSettingsPage() static constexpr const std::array cdrom_read_speeds = { FSUI_NSTR("None (Double Speed)"), FSUI_NSTR("2x (Quad Speed)"), FSUI_NSTR("3x (6x Speed)"), FSUI_NSTR("4x (8x Speed)"), FSUI_NSTR("5x (10x Speed)"), FSUI_NSTR("6x (12x Speed)"), - FSUI_NSTR("7x (14x Speed)"), FSUI_NSTR("8x (16x Speed)"), FSUI_NSTR("9x (18x Speed)"), - FSUI_NSTR("10x (20x Speed)"), FSUI_NSTR("Maximum"), + FSUI_NSTR("Maximum (Safer)"), }; static constexpr const std::array cdrom_seek_speeds = { @@ -2588,14 +2587,10 @@ void FullscreenUI::DrawConsoleSettingsPage() FSUI_NSTR("4x"), FSUI_NSTR("5x"), FSUI_NSTR("6x"), - FSUI_NSTR("7x"), - FSUI_NSTR("8x"), - FSUI_NSTR("9x"), - FSUI_NSTR("10x"), - FSUI_NSTR("Maximum"), + FSUI_NSTR("Maximum (Safer)"), }; - static constexpr std::array cdrom_read_seek_speed_values = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 0}; + static constexpr std::array cdrom_read_seek_speed_values = {1, 2, 3, 4, 5, 6, 0}; SettingsInterface* const bsi = GetEditingSettingsInterface(); const bool game_settings = IsEditingGameSettings(bsi); diff --git a/src/core/fullscreenui_strings.h b/src/core/fullscreenui_strings.h index f6a688890..32f4538e4 100644 --- a/src/core/fullscreenui_strings.h +++ b/src/core/fullscreenui_strings.h @@ -31,7 +31,6 @@ TRANSLATE_NOOP("FullscreenUI", "10 Frames"); TRANSLATE_NOOP("FullscreenUI", "100% [60 FPS (NTSC) / 50 FPS (PAL)]"); TRANSLATE_NOOP("FullscreenUI", "1000% [600 FPS (NTSC) / 500 FPS (PAL)]"); TRANSLATE_NOOP("FullscreenUI", "10x"); -TRANSLATE_NOOP("FullscreenUI", "10x (20x Speed)"); TRANSLATE_NOOP("FullscreenUI", "11x"); TRANSLATE_NOOP("FullscreenUI", "125% [75 FPS (NTSC) / 62 FPS (PAL)]"); TRANSLATE_NOOP("FullscreenUI", "12x"); @@ -77,17 +76,13 @@ TRANSLATE_NOOP("FullscreenUI", "7 Frames"); TRANSLATE_NOOP("FullscreenUI", "70% [42 FPS (NTSC) / 35 FPS (PAL)]"); TRANSLATE_NOOP("FullscreenUI", "700% [420 FPS (NTSC) / 350 FPS (PAL)]"); TRANSLATE_NOOP("FullscreenUI", "7x"); -TRANSLATE_NOOP("FullscreenUI", "7x (14x Speed)"); TRANSLATE_NOOP("FullscreenUI", "8 Frames"); TRANSLATE_NOOP("FullscreenUI", "80% [48 FPS (NTSC) / 40 FPS (PAL)]"); TRANSLATE_NOOP("FullscreenUI", "800% [480 FPS (NTSC) / 400 FPS (PAL)]"); TRANSLATE_NOOP("FullscreenUI", "8x"); -TRANSLATE_NOOP("FullscreenUI", "8x (16x Speed)"); TRANSLATE_NOOP("FullscreenUI", "9 Frames"); TRANSLATE_NOOP("FullscreenUI", "90% [54 FPS (NTSC) / 45 FPS (PAL)]"); TRANSLATE_NOOP("FullscreenUI", "900% [540 FPS (NTSC) / 450 FPS (PAL)]"); -TRANSLATE_NOOP("FullscreenUI", "9x"); -TRANSLATE_NOOP("FullscreenUI", "9x (18x Speed)"); TRANSLATE_NOOP("FullscreenUI", "9x (for 4K)"); TRANSLATE_NOOP("FullscreenUI", ""); TRANSLATE_NOOP("FullscreenUI", ""); @@ -458,7 +453,7 @@ TRANSLATE_NOOP("FullscreenUI", "Logs messages to the console window."); TRANSLATE_NOOP("FullscreenUI", "Logs messages to the debug console where supported."); TRANSLATE_NOOP("FullscreenUI", "Macro Button {}"); TRANSLATE_NOOP("FullscreenUI", "Makes games run closer to their console framerate, at a small cost to performance."); -TRANSLATE_NOOP("FullscreenUI", "Maximum"); +TRANSLATE_NOOP("FullscreenUI", "Maximum (Safer)"); TRANSLATE_NOOP("FullscreenUI", "Maximum Read Speedup Cycles"); TRANSLATE_NOOP("FullscreenUI", "Maximum Seek Speedup Cycles"); TRANSLATE_NOOP("FullscreenUI", "Memory Card Busy"); diff --git a/src/duckstation-qt/consolesettingswidget.cpp b/src/duckstation-qt/consolesettingswidget.cpp index 55d6d4e9b..8973f82fb 100644 --- a/src/duckstation-qt/consolesettingswidget.cpp +++ b/src/duckstation-qt/consolesettingswidget.cpp @@ -16,7 +16,7 @@ #include "moc_consolesettingswidget.cpp" -static constexpr const int CDROM_SPEEDUP_VALUES[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 0}; +static constexpr const int CDROM_SPEEDUP_VALUES[] = {1, 2, 3, 4, 5, 6, 0}; ConsoleSettingsWidget::ConsoleSettingsWidget(SettingsWindow* dialog, QWidget* parent) : QWidget(parent), m_dialog(dialog) diff --git a/src/duckstation-qt/consolesettingswidget.ui b/src/duckstation-qt/consolesettingswidget.ui index 6c431e661..d1ad806a4 100644 --- a/src/duckstation-qt/consolesettingswidget.ui +++ b/src/duckstation-qt/consolesettingswidget.ui @@ -213,27 +213,7 @@ - 7x (14x Speed) - - - - - 8x (16x Speed) - - - - - 9x (18x Speed) - - - - - 10x (20x Speed) - - - - - Maximum + Maximum (Safer) @@ -282,27 +262,7 @@ - 7x - - - - - 8x - - - - - 9x - - - - - 10x - - - - - Maximum + Maximum (Safer)