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
241241 addDisabledActionAndSeparator(viewMenu, "Stats");
242242 addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Stats, Qt::Key_Slash);
243243 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);
245245 addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Bandwidth, 0, true);
246246 addActionToQMenuAndActionHash(viewMenu, MenuOption::BandwidthDetails, 0, this, SLOT(bandwidthDetails()));
247247 addActionToQMenuAndActionHash(viewMenu, MenuOption::OctreeStats, 0, this, SLOT(octreeStatsDetails()));
@@ -360,6 +360,12 @@ Menu::Menu() : · 112 unmodified lines
360360 false,
361361 appInstance->getAudio(),
362362 SLOT(toggleMute()));
363+ addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::AudioToneInjection,
364+ 0,
365+ false,
366+ appInstance->getAudio(),
367+ SLOT(toggleToneInjection()));
368+
363369
364370 addActionToQMenuAndActionHash(developerMenu, MenuOption::PasteToVoxel,
365371 Qt::CTRL | Qt::SHIFT | Qt::Key_V,