History

Merge pull request #2573 from PhilipRosedale/master

Audio VU level meter to replace scope

AndrewMeadows committed 12 years ago

Commit ff211db2 parents 89cb1ad 7d12fce10 files · +217 −56Browse files

Showing the changes to interface/src/Menu.cpp (1 of 10 files). Show all

Unified · Split

interface/src/Menu.cpp+7−1
@@ -241,7 +241,7 @@ Menu::Menu() : · 240 unmodified lines
241 addDisabledActionAndSeparator(viewMenu, "Stats");241 addDisabledActionAndSeparator(viewMenu, "Stats");
242 addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Stats, Qt::Key_Slash);242 addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Stats, Qt::Key_Slash);
243 addActionToQMenuAndActionHash(viewMenu, MenuOption::Log, Qt::CTRL | Qt::Key_L, appInstance, SLOT(toggleLogDialog()));243 addActionToQMenuAndActionHash(viewMenu, MenuOption::Log, Qt::CTRL | Qt::Key_L, appInstance, SLOT(toggleLogDialog()));
244 addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Oscilloscope, 0, true);244 addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Oscilloscope, 0, false);
245 addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Bandwidth, 0, true);245 addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Bandwidth, 0, true);
246 addActionToQMenuAndActionHash(viewMenu, MenuOption::BandwidthDetails, 0, this, SLOT(bandwidthDetails()));246 addActionToQMenuAndActionHash(viewMenu, MenuOption::BandwidthDetails, 0, this, SLOT(bandwidthDetails()));
247 addActionToQMenuAndActionHash(viewMenu, MenuOption::OctreeStats, 0, this, SLOT(octreeStatsDetails()));247 addActionToQMenuAndActionHash(viewMenu, MenuOption::OctreeStats, 0, this, SLOT(octreeStatsDetails()));
@@ -360,6 +360,12 @@ Menu::Menu() : · 112 unmodified lines
360 false,360 false,
361 appInstance->getAudio(),361 appInstance->getAudio(),
362 SLOT(toggleMute()));362 SLOT(toggleMute()));
363 addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::AudioToneInjection,
364 0,
365 false,
366 appInstance->getAudio(),
367 SLOT(toggleToneInjection()));
368
363 369
364 addActionToQMenuAndActionHash(developerMenu, MenuOption::PasteToVoxel,370 addActionToQMenuAndActionHash(developerMenu, MenuOption::PasteToVoxel,
365 Qt::CTRL | Qt::SHIFT | Qt::Key_V,371 Qt::CTRL | Qt::SHIFT | Qt::Key_V,