all repos — mgba @ eb51195769bc4dab28efba9762405082504b9cd4

mGBA Game Boy Advance Emulator

Qt: Move FPS target options to A/V menu
Jeffrey Pfau jeffrey@endrift.com
Sat, 15 Nov 2014 00:28:54 -0800
commit

eb51195769bc4dab28efba9762405082504b9cd4

parent

5988b4ad2ed10c4193307816d0d07ee96eeb9ee8

1 files changed, 14 insertions(+), 12 deletions(-)

jump to
M src/platform/qt/Window.cppsrc/platform/qt/Window.cpp

@@ -356,18 +356,6 @@ connect(frameAdvance, SIGNAL(triggered()), m_controller, SLOT(frameAdvance()));

m_gameActions.append(frameAdvance); emulationMenu->addAction(frameAdvance); - QMenu* target = emulationMenu->addMenu("FPS target"); - ConfigOption* fpsTargetOption = m_config->addOption("fpsTarget"); - fpsTargetOption->connect([this](const QVariant& value) { emit fpsTargetChanged(value.toInt()); }); - fpsTargetOption->addValue(tr("15"), 15, target); - fpsTargetOption->addValue(tr("30"), 30, target); - fpsTargetOption->addValue(tr("45"), 45, target); - fpsTargetOption->addValue(tr("60"), 60, target); - fpsTargetOption->addValue(tr("90"), 90, target); - fpsTargetOption->addValue(tr("120"), 120, target); - fpsTargetOption->addValue(tr("240"), 240, target); - m_config->updateOption("fpsTarget"); - emulationMenu->addSeparator(); QAction* turbo = new QAction(tr("T&urbo"), emulationMenu);

@@ -439,6 +427,20 @@ buffers->addValue(tr("1024"), 1024, buffersMenu);

buffers->addValue(tr("2048"), 2048, buffersMenu); buffers->addValue(tr("4096"), 4096, buffersMenu); m_config->updateOption("audioBuffers"); + + avMenu->addSeparator(); + + QMenu* target = avMenu->addMenu("FPS target"); + ConfigOption* fpsTargetOption = m_config->addOption("fpsTarget"); + fpsTargetOption->connect([this](const QVariant& value) { emit fpsTargetChanged(value.toInt()); }); + fpsTargetOption->addValue(tr("15"), 15, target); + fpsTargetOption->addValue(tr("30"), 30, target); + fpsTargetOption->addValue(tr("45"), 45, target); + fpsTargetOption->addValue(tr("60"), 60, target); + fpsTargetOption->addValue(tr("90"), 90, target); + fpsTargetOption->addValue(tr("120"), 120, target); + fpsTargetOption->addValue(tr("240"), 240, target); + m_config->updateOption("fpsTarget"); #if defined(USE_PNG) || defined(USE_FFMPEG) avMenu->addSeparator();