Skip to content

Commit

Permalink
Fix skinsettingscontrol object type
Browse files Browse the repository at this point in the history
Add remaining skin controls
  • Loading branch information
ywwg committed Jan 30, 2022
1 parent c611f25 commit 6cacbea
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 2 deletions.
14 changes: 13 additions & 1 deletion src/coreservices.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@ void CoreServices::initialize(QApplication* pApp) {

// The following wmainmenubar controls must be created here so that controllers can bind to them
// on startup.
m_pSkinSettingsControl = std::make_unique<ControlPushButton>(
m_pSkinSettingsControl = std::make_unique<ControlObject>(
ConfigKey("[Master]", "skin_settings"));
m_pShowMicrophoneControl = std::make_unique<ControlPushButton>(
ConfigKey("[Microphone]", "show_microphone"));
Expand All @@ -437,6 +437,14 @@ void CoreServices::initialize(QApplication* pApp) {
ConfigKey("[Library]", "show_coverart"));
m_pMaximizeLibraryControl = std::make_unique<ControlPushButton>(
ConfigKey("[Master]", "maximize_library"));
m_pShowSamplersControl = std::make_unique<ControlPushButton>(
ConfigKey("[Samplers]", "show_samplers"));
m_pShowEffectRackControl = std::make_unique<ControlPushButton>(
ConfigKey("[EffectRack1]", "show"));
m_pShow4EffectUnitsControl = std::make_unique<ControlPushButton>(
ConfigKey("[Skin]", "show_4effectunits"));
m_pShowMixerControl = std::make_unique<ControlPushButton>(
ConfigKey("[Master]", "show_mixer"));

// Load tracks in args.qlMusicFiles (command line arguments) into player
// 1 and 2:
Expand Down Expand Up @@ -617,6 +625,10 @@ void CoreServices::finalize() {
m_pShowPreviewDeckControl.reset();
m_pShowCoverArtControl.reset();
m_pMaximizeLibraryControl.reset();
m_pShowSamplersControl.reset();
m_pShowEffectRackControl.reset();
m_pShow4EffectUnitsControl.reset();
m_pShowMixerControl.reset();

m_pControlIndicatorTimer.reset();

Expand Down
6 changes: 5 additions & 1 deletion src/coreservices.h
Original file line number Diff line number Diff line change
Expand Up @@ -152,12 +152,16 @@ class CoreServices : public QObject {
std::shared_ptr<mixxx::ScreensaverManager> m_pScreensaverManager;

std::unique_ptr<ControlPushButton> m_pTouchShift;
std::unique_ptr<ControlPushButton> m_pSkinSettingsControl;
std::unique_ptr<ControlObject> m_pSkinSettingsControl;
std::unique_ptr<ControlPushButton> m_pShowMicrophoneControl;
std::unique_ptr<ControlPushButton> m_pShowVinylControlControl;
std::unique_ptr<ControlPushButton> m_pShowPreviewDeckControl;
std::unique_ptr<ControlPushButton> m_pShowCoverArtControl;
std::unique_ptr<ControlPushButton> m_pMaximizeLibraryControl;
std::unique_ptr<ControlPushButton> m_pShowSamplersControl;
std::unique_ptr<ControlPushButton> m_pShowEffectRackControl;
std::unique_ptr<ControlPushButton> m_pShow4EffectUnitsControl;
std::unique_ptr<ControlPushButton> m_pShowMixerControl;

Timer m_runtime_timer;
const CmdlineArgs& m_cmdlineArgs;
Expand Down

0 comments on commit 6cacbea

Please sign in to comment.