Skip to content

Commit

Permalink
Revert "Create wmainmenubar controls in coreservices so they are avai…
Browse files Browse the repository at this point in the history
…lable to controllers on startup"
  • Loading branch information
ywwg authored Feb 4, 2022
1 parent 1b0eb33 commit 8ea0c3d
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 25 deletions.
24 changes: 0 additions & 24 deletions src/coreservices.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -423,28 +423,6 @@ void CoreServices::initialize(QApplication* pApp) {

m_pTouchShift = std::make_unique<ControlPushButton>(ConfigKey("[Controls]", "touch_shift"));

// The following UI controls must be created here so that controllers can bind to them
// on startup.
m_uiControls.clear();
const std::vector<ConfigKey> uiKeys = {
ConfigKey("[Master]", "skin_settings"),
ConfigKey("[Microphone]", "show_microphone"),
ConfigKey(VINYL_PREF_KEY, "show_vinylcontrol"),
ConfigKey("[PreviewDeck]", "show_previewdeck"),
ConfigKey("[Library]", "show_coverart"),
ConfigKey("[Master]", "maximize_library"),
ConfigKey("[Samplers]", "show_samplers"),
ConfigKey("[EffectRack1]", "show"),
ConfigKey("[Skin]", "show_4effectunits"),
ConfigKey("[Master]", "show_mixer"),
};

m_uiControls.reserve(uiKeys.size());
for (const auto& key : uiKeys) {
m_uiControls.emplace_back(std::make_unique<ControlPushButton>(key));
m_uiControls.back()->setButtonMode(ControlPushButton::TOGGLE);
}

// Load tracks in args.qlMusicFiles (command line arguments) into player
// 1 and 2:
const QList<QString>& musicFiles = m_cmdlineArgs.getMusicFiles();
Expand Down Expand Up @@ -619,8 +597,6 @@ void CoreServices::finalize() {

m_pTouchShift.reset();

m_uiControls.clear();

m_pControlIndicatorTimer.reset();

t.elapsed(true);
Expand Down
1 change: 0 additions & 1 deletion src/coreservices.h
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,6 @@ class CoreServices : public QObject {

std::shared_ptr<mixxx::ScreensaverManager> m_pScreensaverManager;

std::vector<std::unique_ptr<ControlPushButton>> m_uiControls;
std::unique_ptr<ControlPushButton> m_pTouchShift;

Timer m_runtime_timer;
Expand Down

0 comments on commit 8ea0c3d

Please sign in to comment.