Menu
▾
▴
[OMPT-svn-commit] OpenMPT r21690 - trunk/OpenMPT/mptrack
|
From: <sv...@op...> - 2024-09-23 13:04:28
|
Author: sagamusix Date: Mon Sep 23 15:04:20 2024 New Revision: 21690 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21690 Log: [Ref] Remove resource.h inclusion from various header files. Modified: trunk/OpenMPT/mptrack/ChannelManagerDlg.cpp trunk/OpenMPT/mptrack/Mod2wave.cpp trunk/OpenMPT/mptrack/Modedit.cpp trunk/OpenMPT/mptrack/Mpdlgs.cpp trunk/OpenMPT/mptrack/Mpdlgs.h trunk/OpenMPT/mptrack/PatternEditorDialogs.cpp trunk/OpenMPT/mptrack/PatternEditorDialogs.h trunk/OpenMPT/mptrack/PatternFindReplaceDlg.cpp trunk/OpenMPT/mptrack/PatternFindReplaceDlg.h trunk/OpenMPT/mptrack/SampleEditorDialogs.cpp trunk/OpenMPT/mptrack/SampleEditorDialogs.h trunk/OpenMPT/mptrack/TrackerSettings.cpp trunk/OpenMPT/mptrack/UpdateCheck.cpp trunk/OpenMPT/mptrack/View_gen.cpp trunk/OpenMPT/mptrack/View_gen.h trunk/OpenMPT/mptrack/dlg_misc.cpp trunk/OpenMPT/mptrack/dlg_misc.h Modified: trunk/OpenMPT/mptrack/ChannelManagerDlg.cpp ============================================================================== --- trunk/OpenMPT/mptrack/ChannelManagerDlg.cpp Mon Sep 23 14:24:15 2024 (r21689) +++ trunk/OpenMPT/mptrack/ChannelManagerDlg.cpp Mon Sep 23 15:04:20 2024 (r21690) @@ -13,6 +13,7 @@ #include "Mainfrm.h" #include "Moddoc.h" #include "MPTrackUtil.h" +#include "resource.h" #include "UpdateHints.h" #include "../common/mptStringBuffer.h" Modified: trunk/OpenMPT/mptrack/Mod2wave.cpp ============================================================================== --- trunk/OpenMPT/mptrack/Mod2wave.cpp Mon Sep 23 14:24:15 2024 (r21689) +++ trunk/OpenMPT/mptrack/Mod2wave.cpp Mon Sep 23 15:04:20 2024 (r21690) @@ -15,6 +15,7 @@ #include "Mpdlgs.h" #include "Mptrack.h" #include "Reporting.h" +#include "resource.h" #include "Sndfile.h" #include "WAVTools.h" #include "../common/Dither.h" Modified: trunk/OpenMPT/mptrack/Modedit.cpp ============================================================================== --- trunk/OpenMPT/mptrack/Modedit.cpp Mon Sep 23 14:24:15 2024 (r21689) +++ trunk/OpenMPT/mptrack/Modedit.cpp Mon Sep 23 15:04:20 2024 (r21690) @@ -16,6 +16,7 @@ #include "Moddoc.h" #include "Mptrack.h" #include "Reporting.h" +#include "resource.h" #include "TrackerSettings.h" #include "../common/misc_util.h" #include "../common/mptFileIO.h" Modified: trunk/OpenMPT/mptrack/Mpdlgs.cpp ============================================================================== --- trunk/OpenMPT/mptrack/Mpdlgs.cpp Mon Sep 23 14:24:15 2024 (r21689) +++ trunk/OpenMPT/mptrack/Mpdlgs.cpp Mon Sep 23 15:04:20 2024 (r21690) @@ -17,6 +17,7 @@ #include "Moddoc.h" #include "Mptrack.h" #include "Reporting.h" +#include "resource.h" #include "Sndfile.h" #include "WindowMessages.h" #include "../common/Dither.h" @@ -1025,6 +1026,10 @@ } +COptionsMixer::COptionsMixer() : CPropertyPage{IDD_OPTIONS_MIXER} {} + + + BOOL COptionsMixer::OnInitDialog() { CPropertyPage::OnInitDialog(); @@ -1327,25 +1332,25 @@ #ifndef NO_EQ // EQ ON_WM_VSCROLL() - ON_COMMAND(IDC_CHECK3, &COptionsPlayer::OnSettingsChanged) - ON_COMMAND(IDC_BUTTON1, &COptionsPlayer::OnEqUser1) - ON_COMMAND(IDC_BUTTON2, &COptionsPlayer::OnEqUser2) - ON_COMMAND(IDC_BUTTON3, &COptionsPlayer::OnEqUser3) - ON_COMMAND(IDC_BUTTON4, &COptionsPlayer::OnEqUser4) - ON_COMMAND(IDC_BUTTON5, &COptionsPlayer::OnSavePreset) - ON_COMMAND_RANGE(ID_EQSLIDER_BASE, ID_EQSLIDER_BASE + MAX_EQ_BANDS, &COptionsPlayer::OnSliderMenu) - ON_COMMAND_RANGE(ID_EQMENU_BASE, ID_EQMENU_BASE + EQ_MAX_FREQS, &COptionsPlayer::OnSliderFreq) + ON_COMMAND(IDC_CHECK3, &COptionsPlayer::OnSettingsChanged) + ON_COMMAND(IDC_BUTTON1, &COptionsPlayer::OnEqUser1) + ON_COMMAND(IDC_BUTTON2, &COptionsPlayer::OnEqUser2) + ON_COMMAND(IDC_BUTTON3, &COptionsPlayer::OnEqUser3) + ON_COMMAND(IDC_BUTTON4, &COptionsPlayer::OnEqUser4) + ON_COMMAND(IDC_BUTTON5, &COptionsPlayer::OnSavePreset) + ON_COMMAND_RANGE(ID_EQSLIDER_BASE, ID_EQSLIDER_BASE + MAX_EQ_BANDS, &COptionsPlayer::OnSliderMenu) + ON_COMMAND_RANGE(ID_EQMENU_BASE, ID_EQMENU_BASE + EQ_MAX_FREQS, &COptionsPlayer::OnSliderFreq) #endif // !NO_EQ // DSP ON_WM_HSCROLL() - ON_CBN_SELCHANGE(IDC_COMBO2, &COptionsPlayer::OnSettingsChanged) - ON_COMMAND(IDC_CHECK1, &COptionsPlayer::OnSettingsChanged) - ON_COMMAND(IDC_CHECK2, &COptionsPlayer::OnSettingsChanged) - ON_COMMAND(IDC_CHECK4, &COptionsPlayer::OnSettingsChanged) - ON_COMMAND(IDC_CHECK5, &COptionsPlayer::OnSettingsChanged) - ON_COMMAND(IDC_CHECK6, &COptionsPlayer::OnSettingsChanged) - ON_COMMAND(IDC_CHECK7, &COptionsPlayer::OnSettingsChanged) + ON_CBN_SELCHANGE(IDC_COMBO2, &COptionsPlayer::OnSettingsChanged) + ON_COMMAND(IDC_CHECK1, &COptionsPlayer::OnSettingsChanged) + ON_COMMAND(IDC_CHECK2, &COptionsPlayer::OnSettingsChanged) + ON_COMMAND(IDC_CHECK4, &COptionsPlayer::OnSettingsChanged) + ON_COMMAND(IDC_CHECK5, &COptionsPlayer::OnSettingsChanged) + ON_COMMAND(IDC_CHECK6, &COptionsPlayer::OnSettingsChanged) + ON_COMMAND(IDC_CHECK7, &COptionsPlayer::OnSettingsChanged) END_MESSAGE_MAP() @@ -1364,6 +1369,14 @@ } +COptionsPlayer::COptionsPlayer() : CPropertyPage{IDD_OPTIONS_PLAYER} +#ifndef NO_EQ + , m_EQPreset(TrackerSettings::Instance().m_EqSettings) +#endif +{ +} + + BOOL COptionsPlayer::OnInitDialog() { CPropertyPage::OnInitDialog(); @@ -1725,6 +1738,14 @@ } +CMidiSetupDlg::CMidiSetupDlg(DWORD flags, UINT device) + : CPropertyPage{IDD_OPTIONS_MIDI} + , m_dwMidiSetup{flags} + , m_nMidiDevice{device} +{ +} + + BOOL CMidiSetupDlg::OnInitDialog() { CPropertyPage::OnInitDialog(); Modified: trunk/OpenMPT/mptrack/Mpdlgs.h ============================================================================== --- trunk/OpenMPT/mptrack/Mpdlgs.h Mon Sep 23 14:24:15 2024 (r21689) +++ trunk/OpenMPT/mptrack/Mpdlgs.h Mon Sep 23 15:04:20 2024 (r21690) @@ -10,10 +10,10 @@ #pragma once -#include "resource.h" +#include "openmpt/all/BuildSettings.hpp" + #include "TrackerSettings.h" #include "../sounddsp/EQ.h" -#include "openmpt/all/BuildSettings.hpp" #include "openmpt/sounddevice/SoundDevice.hpp" OPENMPT_NAMESPACE_BEGIN @@ -111,9 +111,7 @@ bool m_initialized = false; public: - COptionsMixer() - : CPropertyPage(IDD_OPTIONS_MIXER) - {} + COptionsMixer(); protected: void UpdateRamping(); @@ -145,7 +143,7 @@ UINT m_nSliderNo; short int m_x, m_y; public: - CEQSlider() {} + CEQSlider() = default; void Init(UINT nID, UINT n, CWnd *parent); BOOL PreTranslateMessage(MSG *pMsg); }; @@ -169,11 +167,7 @@ #endif // !NO_EQ public: - COptionsPlayer() : CPropertyPage(IDD_OPTIONS_PLAYER) -#ifndef NO_EQ - , m_EQPreset(TrackerSettings::Instance().m_EqSettings) -#endif - { } + COptionsPlayer(); protected: BOOL OnInitDialog() override; @@ -185,10 +179,10 @@ #ifndef NO_EQ afx_msg void OnVScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar); - afx_msg void OnEqUser1() { LoadEQPreset(TrackerSettings::Instance().m_EqUserPresets[0]); }; - afx_msg void OnEqUser2() { LoadEQPreset(TrackerSettings::Instance().m_EqUserPresets[1]); }; - afx_msg void OnEqUser3() { LoadEQPreset(TrackerSettings::Instance().m_EqUserPresets[2]); }; - afx_msg void OnEqUser4() { LoadEQPreset(TrackerSettings::Instance().m_EqUserPresets[3]); }; + afx_msg void OnEqUser1() { LoadEQPreset(TrackerSettings::Instance().m_EqUserPresets[0]); }; + afx_msg void OnEqUser2() { LoadEQPreset(TrackerSettings::Instance().m_EqUserPresets[1]); }; + afx_msg void OnEqUser3() { LoadEQPreset(TrackerSettings::Instance().m_EqUserPresets[2]); }; + afx_msg void OnEqUser4() { LoadEQPreset(TrackerSettings::Instance().m_EqUserPresets[3]); }; afx_msg void OnSavePreset(); afx_msg void OnSliderMenu(UINT); afx_msg void OnSliderFreq(UINT); @@ -213,11 +207,7 @@ CComboBox m_InputDevice, m_ATBehaviour, m_Quantize; public: - CMidiSetupDlg(DWORD d, UINT n) - : CPropertyPage(IDD_OPTIONS_MIDI) - , m_dwMidiSetup(d) - , m_nMidiDevice(n) - { } + CMidiSetupDlg(DWORD flags, UINT device); protected: BOOL OnInitDialog() override; Modified: trunk/OpenMPT/mptrack/PatternEditorDialogs.cpp ============================================================================== --- trunk/OpenMPT/mptrack/PatternEditorDialogs.cpp Mon Sep 23 14:24:15 2024 (r21689) +++ trunk/OpenMPT/mptrack/PatternEditorDialogs.cpp Mon Sep 23 15:04:20 2024 (r21690) @@ -16,6 +16,7 @@ #include "Moddoc.h" #include "Mptrack.h" #include "Reporting.h" +#include "resource.h" #include "TempoSwingDialog.h" #include "View_pat.h" #include "WindowMessages.h" @@ -131,6 +132,15 @@ ON_COMMAND(IDC_BUTTON1, &CPatternPropertiesDlg::OnTempoSwing) END_MESSAGE_MAP() + +CPatternPropertiesDlg::CPatternPropertiesDlg(CModDoc &modParent, PATTERNINDEX nPat, CWnd *parent) + : DialogBase{IDD_PATTERN_PROPERTIES, parent} + , modDoc{modParent} + , m_nPattern{nPat} +{ +} + + BOOL CPatternPropertiesDlg::OnInitDialog() { CComboBox *combo; @@ -1159,6 +1169,14 @@ } +CSplitKeyboardSettings::CSplitKeyboardSettings(CWnd *parent, CSoundFile &sf, SplitKeyboardSettings &settings) + : DialogBase{IDD_KEYBOARD_SPLIT, parent} + , sndFile{sf} + , m_Settings{settings} +{ +} + + BOOL CSplitKeyboardSettings::OnInitDialog() { if(sndFile.GetpModDoc() == nullptr) Modified: trunk/OpenMPT/mptrack/PatternEditorDialogs.h ============================================================================== --- trunk/OpenMPT/mptrack/PatternEditorDialogs.h Mon Sep 23 14:24:15 2024 (r21689) +++ trunk/OpenMPT/mptrack/PatternEditorDialogs.h Mon Sep 23 15:04:20 2024 (r21690) @@ -13,13 +13,12 @@ #include "openmpt/all/BuildSettings.hpp" #include "DialogBase.h" -#include "dlg_misc.h" // for keyboard control +#include "dlg_misc.h" // for keyboard control #include "ColorPickerButton.h" #include "EffectInfo.h" #include "PatternCursor.h" #include "PluginComboBox.h" #include "ResizableDialog.h" -#include "resource.h" #include "TrackerSettings.h" OPENMPT_NAMESPACE_BEGIN @@ -35,11 +34,7 @@ PATTERNINDEX m_nPattern; public: - CPatternPropertiesDlg(CModDoc &modParent, PATTERNINDEX nPat, CWnd *parent=NULL) - : DialogBase(IDD_PATTERN_PROPERTIES, parent) - , modDoc(modParent) - , m_nPattern(nPat) - { } + CPatternPropertiesDlg(CModDoc &modParent, PATTERNINDEX nPat, CWnd *parent = nullptr); protected: BOOL OnInitDialog() override; @@ -158,7 +153,7 @@ public: SplitKeyboardSettings &m_Settings; - CSplitKeyboardSettings(CWnd *parent, CSoundFile &sf, SplitKeyboardSettings &settings) : DialogBase(IDD_KEYBOARD_SPLIT, parent), sndFile(sf), m_Settings(settings) { } + CSplitKeyboardSettings(CWnd *parent, CSoundFile &sf, SplitKeyboardSettings &settings); protected: void DoDataExchange(CDataExchange* pDX) override; Modified: trunk/OpenMPT/mptrack/PatternFindReplaceDlg.cpp ============================================================================== --- trunk/OpenMPT/mptrack/PatternFindReplaceDlg.cpp Mon Sep 23 14:24:15 2024 (r21689) +++ trunk/OpenMPT/mptrack/PatternFindReplaceDlg.cpp Mon Sep 23 15:04:20 2024 (r21690) @@ -14,6 +14,7 @@ #include "DialogBase.h" #include "Mptrack.h" #include "PatternFindReplace.h" +#include "resource.h" #include "View_pat.h" #include "mpt/parse/parse.hpp" @@ -723,6 +724,13 @@ } +void CFindReplaceTab::OnVolCmdChanged() +{ + CheckOnChange(IDC_CHECK3); + UpdateVolumeList(); +}; + + void CFindReplaceTab::RelativeOrMultiplyPrompt(CComboBox &comboBox, FindReplace::ReplaceMode &action, int &value, int range, bool isHex) { int sel = comboBox.GetCurSel(); @@ -837,6 +845,13 @@ } +void CFindReplaceTab::OnEffectChanged() +{ + CheckOnChange(IDC_CHECK5); + UpdateParamList(); +}; + + void CFindReplaceTab::OnParamChanged() { CheckOnChange(IDC_CHECK6); @@ -913,6 +928,21 @@ } +void CFindReplaceTab::OnCheckNote() { CheckReplace(IDC_CHECK1); }; +void CFindReplaceTab::OnCheckInstr() { CheckReplace(IDC_CHECK2); }; +void CFindReplaceTab::OnCheckVolCmd() { CheckReplace(IDC_CHECK3); }; +void CFindReplaceTab::OnCheckVolume() { CheckReplace(IDC_CHECK4); }; +void CFindReplaceTab::OnCheckEffect() { CheckReplace(IDC_CHECK5); }; +void CFindReplaceTab::OnCheckParam() { CheckReplace(IDC_CHECK6); }; + + +void CFindReplaceTab::CheckReplace(int nIDButton) +{ + if(m_isReplaceTab && IsDlgButtonChecked(nIDButton)) + CheckDlgButton(IDC_CHECK7, BST_CHECKED); +}; + + void CFindReplaceTab::OnCheckChannelSearch() { if (!m_isReplaceTab) Modified: trunk/OpenMPT/mptrack/PatternFindReplaceDlg.h ============================================================================== --- trunk/OpenMPT/mptrack/PatternFindReplaceDlg.h Mon Sep 23 14:24:15 2024 (r21689) +++ trunk/OpenMPT/mptrack/PatternFindReplaceDlg.h Mon Sep 23 15:04:20 2024 (r21690) @@ -16,7 +16,6 @@ #include "PatternCursor.h" #include "PatternFindReplace.h" #include "PluginComboBox.h" -#include "resource.h" OPENMPT_NAMESPACE_BEGIN @@ -80,20 +79,20 @@ void CheckOnChange(int nIDButton) { CheckDlgButton(nIDButton, BST_CHECKED); CheckReplace(nIDButton); }; afx_msg void OnNoteChanged(); afx_msg void OnInstrChanged(); - afx_msg void OnVolCmdChanged() { CheckOnChange(IDC_CHECK3); UpdateVolumeList(); }; + afx_msg void OnVolCmdChanged(); afx_msg void OnVolumeChanged(); - afx_msg void OnEffectChanged() { CheckOnChange(IDC_CHECK5); UpdateParamList(); }; + afx_msg void OnEffectChanged(); afx_msg void OnParamChanged(); afx_msg void OnPCParamChanged(); // When a checkbox is checked, also check "Replace By". - afx_msg void OnCheckNote() { CheckReplace(IDC_CHECK1); }; - afx_msg void OnCheckInstr() { CheckReplace(IDC_CHECK2); }; - afx_msg void OnCheckVolCmd() { CheckReplace(IDC_CHECK3); }; - afx_msg void OnCheckVolume() { CheckReplace(IDC_CHECK4); }; - afx_msg void OnCheckEffect() { CheckReplace(IDC_CHECK5); }; - afx_msg void OnCheckParam() { CheckReplace(IDC_CHECK6); }; + afx_msg void OnCheckNote(); + afx_msg void OnCheckInstr(); + afx_msg void OnCheckVolCmd(); + afx_msg void OnCheckVolume(); + afx_msg void OnCheckEffect(); + afx_msg void OnCheckParam(); // Check "Replace By" - afx_msg void CheckReplace(int nIDButton) { if(m_isReplaceTab && IsDlgButtonChecked(nIDButton)) CheckDlgButton(IDC_CHECK7, BST_CHECKED); }; + afx_msg void CheckReplace(int nIDButton); afx_msg void OnCheckChannelSearch(); Modified: trunk/OpenMPT/mptrack/SampleEditorDialogs.cpp ============================================================================== --- trunk/OpenMPT/mptrack/SampleEditorDialogs.cpp Mon Sep 23 14:24:15 2024 (r21689) +++ trunk/OpenMPT/mptrack/SampleEditorDialogs.cpp Mon Sep 23 15:04:20 2024 (r21690) @@ -162,6 +162,20 @@ } +void CAmpDlg::EnableFadeIn() +{ + if(!m_locked) + CheckDlgButton(IDC_CHECK1, BST_CHECKED); +} + + +void CAmpDlg::EnableFadeOut() +{ + if(!m_locked) + CheckDlgButton(IDC_CHECK2, BST_CHECKED); +} + + ////////////////////////////////////////////////////////////// // Sample import dialog @@ -184,6 +198,13 @@ } +CRawSampleDlg::CRawSampleDlg(FileReader &file, CWnd *parent) + : DialogBase{IDD_LOADRAWSAMPLE, parent} + , m_file{file} +{ +} + + BOOL CRawSampleDlg::OnInitDialog() { DialogBase::OnInitDialog(); @@ -579,12 +600,20 @@ { DialogBase::DoDataExchange(pDX); //{{AFX_DATA_MAP(CSampleGridDlg) - DDX_Control(pDX, IDC_EDIT1, m_EditSegments); - DDX_Control(pDX, IDC_SPIN1, m_SpinSegments); + DDX_Control(pDX, IDC_EDIT1, m_EditSegments); + DDX_Control(pDX, IDC_SPIN1, m_SpinSegments); //}}AFX_DATA_MAP } +CSampleGridDlg::CSampleGridDlg(CWnd* parent, SmpLength nSegments, SmpLength nMaxSegments) + : DialogBase{IDD_SAMPLE_GRID_SIZE, parent} + , m_nSegments{nSegments} + , m_nMaxSegments{nMaxSegments} +{ +} + + BOOL CSampleGridDlg::OnInitDialog() { DialogBase::OnInitDialog(); @@ -613,9 +642,9 @@ BEGIN_MESSAGE_MAP(CSampleXFadeDlg, DialogBase) ON_WM_HSCROLL() - ON_COMMAND(IDC_RADIO1, &CSampleXFadeDlg::OnLoopTypeChanged) - ON_COMMAND(IDC_RADIO2, &CSampleXFadeDlg::OnLoopTypeChanged) - ON_EN_CHANGE(IDC_EDIT1, &CSampleXFadeDlg::OnFadeLengthChanged) + ON_COMMAND(IDC_RADIO1, &CSampleXFadeDlg::OnLoopTypeChanged) + ON_COMMAND(IDC_RADIO2, &CSampleXFadeDlg::OnLoopTypeChanged) + ON_EN_CHANGE(IDC_EDIT1, &CSampleXFadeDlg::OnFadeLengthChanged) ON_NOTIFY_EX(TTN_NEEDTEXT, 0, &CSampleXFadeDlg::OnToolTipText) END_MESSAGE_MAP() @@ -634,6 +663,12 @@ } +CSampleXFadeDlg::CSampleXFadeDlg(CWnd *parent, ModSample &sample) + : DialogBase{IDD_SAMPLE_XFADE, parent} + , m_sample{sample} +{ +} + BOOL CSampleXFadeDlg::OnInitDialog() { DialogBase::OnInitDialog(); @@ -761,6 +796,16 @@ ON_EN_SETFOCUS(IDC_EDIT1, &CResamplingDlg::OnFocusEdit) END_MESSAGE_MAP() + +CResamplingDlg::CResamplingDlg(CWnd *parent, uint32 frequency, ResamplingMode srcMode, bool resampleAll) + : DialogBase{IDD_RESAMPLE, parent} + , m_srcMode{srcMode} + , m_frequency{frequency} + , m_resampleAll{resampleAll} +{ +} + + BOOL CResamplingDlg::OnInitDialog() { DialogBase::OnInitDialog(); @@ -844,6 +889,12 @@ } +void CResamplingDlg::OnFocusEdit() +{ + CheckRadioButton(IDC_RADIO1, IDC_RADIO3, IDC_RADIO3); +} + + //////////////////////////////////////////////////////////////////////////////////////////// // Sample mix dialog Modified: trunk/OpenMPT/mptrack/SampleEditorDialogs.h ============================================================================== --- trunk/OpenMPT/mptrack/SampleEditorDialogs.h Mon Sep 23 14:24:15 2024 (r21689) +++ trunk/OpenMPT/mptrack/SampleEditorDialogs.h Mon Sep 23 15:04:20 2024 (r21690) @@ -15,7 +15,6 @@ #include "CDecimalSupport.h" #include "DialogBase.h" -#include "resource.h" #include "../common/FileReaderFwd.h" #include "../soundlib/SampleIO.h" #include "../tracklib/FadeLaws.h" @@ -54,8 +53,8 @@ void OnOK() override; void OnDestroy(); - afx_msg void EnableFadeIn() { if(!m_locked) CheckDlgButton(IDC_CHECK1, BST_CHECKED); } - afx_msg void EnableFadeOut() { if(!m_locked) CheckDlgButton(IDC_CHECK2, BST_CHECKED); } + afx_msg void EnableFadeIn(); + afx_msg void EnableFadeOut(); DECLARE_MESSAGE_MAP() }; @@ -87,9 +86,7 @@ void SetOffset(SmpLength offset) { m_offset = offset; } public: - CRawSampleDlg(FileReader &file, CWnd *parent = nullptr) - : DialogBase(IDD_LOADRAWSAMPLE, parent) - , m_file(file) {} + CRawSampleDlg(FileReader &file, CWnd *parent = nullptr); protected: void DoDataExchange(CDataExchange *pDX) override; @@ -163,7 +160,7 @@ CSpinButtonCtrl m_SpinSegments; public: - CSampleGridDlg(CWnd *parent, SmpLength nSegments, SmpLength nMaxSegments) : DialogBase(IDD_SAMPLE_GRID_SIZE, parent) { m_nSegments = nSegments; m_nMaxSegments = nMaxSegments; }; + CSampleGridDlg(CWnd *parent, SmpLength nSegments, SmpLength nMaxSegments); protected: void DoDataExchange(CDataExchange* pDX) override; @@ -193,9 +190,7 @@ bool m_editLocked = true; public: - CSampleXFadeDlg(CWnd *parent, ModSample &sample) - : DialogBase(IDD_SAMPLE_XFADE, parent) - , m_sample(sample) {} + CSampleXFadeDlg(CWnd *parent, ModSample &sample); SmpLength PercentToSamples(uint32 percent) const { return Util::muldivr_unsigned(percent, m_loopLength, 100000); } uint32 SamplesToPercent(SmpLength samples) const { return Util::muldivr_unsigned(samples, 100000, m_loopLength); } @@ -235,7 +230,7 @@ static bool m_updatePatterns; public: - CResamplingDlg(CWnd *parent, uint32 frequency, ResamplingMode srcMode, bool resampleAll) : DialogBase(IDD_RESAMPLE, parent), m_srcMode(srcMode), m_frequency(frequency), m_resampleAll(resampleAll) { }; + CResamplingDlg(CWnd *parent, uint32 frequency, ResamplingMode srcMode, bool resampleAll); uint32 GetFrequency() const { return m_frequency; } ResamplingMode GetFilter() const { return m_srcMode; } static ResamplingOption GetResamplingOption() { return m_lastChoice; } @@ -245,7 +240,7 @@ BOOL OnInitDialog() override; void OnOK() override; - afx_msg void OnFocusEdit() { CheckRadioButton(IDC_RADIO1, IDC_RADIO3, IDC_RADIO3); } + afx_msg void OnFocusEdit(); DECLARE_MESSAGE_MAP() }; Modified: trunk/OpenMPT/mptrack/TrackerSettings.cpp ============================================================================== --- trunk/OpenMPT/mptrack/TrackerSettings.cpp Mon Sep 23 14:24:15 2024 (r21689) +++ trunk/OpenMPT/mptrack/TrackerSettings.cpp Mon Sep 23 15:04:20 2024 (r21690) @@ -17,6 +17,7 @@ #include "Mpdlgs.h" #include "Mptrack.h" #include "PatternClipboard.h" +#include "resource.h" #include "TuningDialog.h" #include "UpdateCheck.h" #include "../common/ComponentManager.h" Modified: trunk/OpenMPT/mptrack/UpdateCheck.cpp ============================================================================== --- trunk/OpenMPT/mptrack/UpdateCheck.cpp Mon Sep 23 14:24:15 2024 (r21689) +++ trunk/OpenMPT/mptrack/UpdateCheck.cpp Mon Sep 23 15:04:20 2024 (r21690) @@ -18,6 +18,7 @@ #include "Mptrack.h" #include "ProgressDialog.h" #include "Reporting.h" +#include "resource.h" #include "TrackerSettings.h" #include "WindowMessages.h" #include "../common/misc_util.h" Modified: trunk/OpenMPT/mptrack/View_gen.cpp ============================================================================== --- trunk/OpenMPT/mptrack/View_gen.cpp Mon Sep 23 14:24:15 2024 (r21689) +++ trunk/OpenMPT/mptrack/View_gen.cpp Mon Sep 23 15:04:20 2024 (r21690) @@ -22,6 +22,7 @@ #include "Moddoc.h" #include "MoveFXSlotDialog.h" #include "Reporting.h" +#include "resource.h" #include "SelectPluginDialog.h" #include "../common/mptStringBuffer.h" #include "../soundlib/mod_specifications.h" @@ -170,6 +171,9 @@ } +CViewGlobals::CViewGlobals() : CFormView{IDD_VIEW_GLOBALS} { } + + CModDoc* CViewGlobals::GetDocument() const { return static_cast<CModDoc *>(m_pDocument); } void CViewGlobals::OnInitialUpdate() Modified: trunk/OpenMPT/mptrack/View_gen.h ============================================================================== --- trunk/OpenMPT/mptrack/View_gen.h Mon Sep 23 14:24:15 2024 (r21689) +++ trunk/OpenMPT/mptrack/View_gen.h Mon Sep 23 15:04:20 2024 (r21690) @@ -14,7 +14,6 @@ #include "openmpt/all/BuildSettings.hpp" #include "ColorPickerButton.h" #include "PluginComboBox.h" -#include "resource.h" #include "UpdateHints.h" #include "WindowMessages.h" #include "../soundlib/plugins/PluginStructs.h" @@ -56,7 +55,7 @@ enum {AdjustPattern = true, NoPatternAdjust = false}; protected: - CViewGlobals() : CFormView(IDD_VIEW_GLOBALS) { } + CViewGlobals(); DECLARE_SERIAL(CViewGlobals) public: Modified: trunk/OpenMPT/mptrack/dlg_misc.cpp ============================================================================== --- trunk/OpenMPT/mptrack/dlg_misc.cpp Mon Sep 23 14:24:15 2024 (r21689) +++ trunk/OpenMPT/mptrack/dlg_misc.cpp Mon Sep 23 15:04:20 2024 (r21690) @@ -16,6 +16,7 @@ #include "Moddoc.h" #include "Mptrack.h" #include "Reporting.h" +#include "resource.h" #include "TempoSwingDialog.h" #include "WindowMessages.h" #include "../common/mptStringBuffer.h" @@ -68,6 +69,13 @@ } +CModTypeDlg::CModTypeDlg(CSoundFile &sf, CWnd *parent) + : DialogBase{IDD_MODDOC_MODTYPE, parent} + , sndFile{sf} +{ +} + + BOOL CModTypeDlg::OnInitDialog() { DialogBase::OnInitDialog(); @@ -526,6 +534,14 @@ } +CLegacyPlaybackSettingsDlg::CLegacyPlaybackSettingsDlg(CWnd *parent, PlayBehaviourSet &playBehaviour, MODTYPE modType) + : ResizableDialog{IDD_LEGACY_PLAYBACK, parent} + , m_playBehaviour{playBehaviour} + , m_modType{modType} +{ +} + + BOOL CLegacyPlaybackSettingsDlg::OnInitDialog() { ResizableDialog::OnInitDialog(); @@ -750,6 +766,15 @@ END_MESSAGE_MAP() +CRemoveChannelsDlg::CRemoveChannelsDlg(CSoundFile &sf, CHANNELINDEX toRemove, bool showCancel, CWnd *parent) + : DialogBase{IDD_REMOVECHANNELS, parent} + , sndFile{sf} + , m_bKeepMask(sf.GetNumChannels(), true) + , m_nRemove{toRemove} + , m_ShowCancel{showCancel} +{ +} + BOOL CRemoveChannelsDlg::OnInitDialog() { @@ -1122,6 +1147,14 @@ } +CSampleMapDlg::CSampleMapDlg(CSoundFile &sf, INSTRUMENTINDEX nInstr, CWnd *parent) + : DialogBase{IDD_EDITSAMPLEMAP, parent} + , sndFile{sf} + , m_nInstrument{nInstr} +{ +} + + BOOL CSampleMapDlg::OnInitDialog() { DialogBase::OnInitDialog(); @@ -1243,39 +1276,37 @@ { const uint32 note = static_cast<uint32>(baseOctave * 12 + lParam); - if(mouseAction == mouseUnknown) + if(mouseAction == MouseAction::Unknown) { // Mouse down -> decide if we are going to set or remove notes - mouseAction = mouseSet; + mouseAction = MouseAction::Set; if(KeyboardMap[note] == sample) { - mouseAction = (KeyboardMap[note] == pIns->Keyboard[note]) ? mouseZero : mouseUnset; + mouseAction = (KeyboardMap[note] == pIns->Keyboard[note]) ? MouseAction::Zero : MouseAction::Unset; } } switch(mouseAction) { - case mouseUnknown: - case mouseSet: + case MouseAction::Unknown: + case MouseAction::Set: KeyboardMap[note] = sample; break; - case mouseUnset: + case MouseAction::Unset: KeyboardMap[note] = pIns->Keyboard[note]; break; - case mouseZero: + case MouseAction::Zero: if(KeyboardMap[note] == sample) - { KeyboardMap[note] = 0; - } break; } OnUpdateKeyboard(); } } + if(wParam == KBDNOTIFY_LBUTTONUP) - { - mouseAction = mouseUnknown; - } + mouseAction = MouseAction::Unknown; + SetDlgItemText(IDC_TEXT2, s); return 0; } @@ -1313,6 +1344,13 @@ END_MESSAGE_MAP() +CEditHistoryDlg::CEditHistoryDlg(CWnd *parent, CModDoc &modDoc) + : ResizableDialog{IDD_EDITHISTORY, parent} + , m_modDoc{modDoc} +{ +} + + BOOL CEditHistoryDlg::OnInitDialog() { ResizableDialog::OnInitDialog(); @@ -1391,6 +1429,21 @@ } +CInputDlg::CInputDlg(CWnd *parent, const TCHAR *desc, const TCHAR *defaultString, int32 maxLength, double minValDbl, double maxValDbl, double defaultDbl, int32 minValInt, int32 maxValInt, int32 defaultInt) + : DialogBase{IDD_INPUT, parent} + , m_description{desc} + , m_minValueDbl{minValDbl} + , m_maxValueDbl{maxValDbl} + , m_minValueInt{minValInt} + , m_maxValueInt{maxValInt} + , m_maxLength{maxLength} + , resultAsInt{defaultInt} + , resultAsDouble{defaultDbl} + , resultAsString{defaultString} +{ +} + + BOOL CInputDlg::OnInitDialog() { DialogBase::OnInitDialog(); Modified: trunk/OpenMPT/mptrack/dlg_misc.h ============================================================================== --- trunk/OpenMPT/mptrack/dlg_misc.h Mon Sep 23 14:24:15 2024 (r21689) +++ trunk/OpenMPT/mptrack/dlg_misc.h Mon Sep 23 15:04:20 2024 (r21690) @@ -15,7 +15,6 @@ #include "CDecimalSupport.h" #include "DialogBase.h" #include "ResizableDialog.h" -#include "resource.h" #include "../soundlib/Sndfile.h" OPENMPT_NAMESPACE_BEGIN @@ -40,7 +39,7 @@ bool initialized = false; public: - CModTypeDlg(CSoundFile &sf, CWnd *parent) : DialogBase(IDD_MODDOC_MODTYPE, parent), sndFile(sf) { } + CModTypeDlg(CSoundFile &sf, CWnd *parent); bool VerifyData(); void UpdateDialog(); void OnPTModeChanged(); @@ -74,12 +73,7 @@ MODTYPE m_modType; public: - CLegacyPlaybackSettingsDlg(CWnd *parent, PlayBehaviourSet &playBehaviour, MODTYPE modType) - : ResizableDialog{IDD_LEGACY_PLAYBACK, parent} - , m_playBehaviour{playBehaviour} - , m_modType{modType} - { - } + CLegacyPlaybackSettingsDlg(CWnd *parent, PlayBehaviourSet &playBehaviour, MODTYPE modType); PlayBehaviourSet GetPlayBehaviour() const { return m_playBehaviour; } @@ -105,14 +99,7 @@ bool m_ShowCancel; public: - CRemoveChannelsDlg(CSoundFile &sf, CHANNELINDEX toRemove, bool showCancel = true, CWnd *parent = nullptr) - : DialogBase{IDD_REMOVECHANNELS, parent} - , sndFile{sf} - , m_bKeepMask(sf.GetNumChannels(), true) - , m_nRemove{toRemove} - , m_ShowCancel{showCancel} - { - } + CRemoveChannelsDlg(CSoundFile &sf, CHANNELINDEX toRemove, bool showCancel = true, CWnd *parent = nullptr); protected: //{{AFX_VIRTUAL(CRemoveChannelsDlg) @@ -210,25 +197,25 @@ class CSampleMapDlg : public DialogBase { protected: - enum MouseAction + enum class MouseAction { - mouseUnknown, // Didn't mouse-down yet - mouseSet, // Set selected sample - mouseUnset, // Unset (revert to original keymap) - mouseZero, // Set to zero + Unknown, // Didn't mouse-down yet + Set, // Set selected sample + Unset, // Unset (revert to original keymap) + Zero, // Set to zero }; CKeyboardControl m_Keyboard; CComboBox m_CbnSample; CSliderCtrl m_SbOctave; + CSoundFile &sndFile; - INSTRUMENTINDEX m_nInstrument; + const INSTRUMENTINDEX m_nInstrument; SAMPLEINDEX KeyboardMap[NOTE_MAX]; - MouseAction mouseAction; + MouseAction mouseAction = MouseAction::Unknown; public: - CSampleMapDlg(CSoundFile &sf, INSTRUMENTINDEX nInstr, CWnd *parent=NULL) : DialogBase(IDD_EDITSAMPLEMAP, parent), sndFile(sf), mouseAction(mouseUnknown) - { m_nInstrument = nInstr; } + CSampleMapDlg(CSoundFile &sf, INSTRUMENTINDEX nInstr, CWnd *parent = nullptr); protected: void DoDataExchange(CDataExchange* pDX) override; @@ -252,8 +239,7 @@ CModDoc &m_modDoc; public: - CEditHistoryDlg(CWnd *parent, CModDoc &modDoc) - : ResizableDialog(IDD_EDITHISTORY, parent), m_modDoc(modDoc) {} + CEditHistoryDlg(CWnd *parent, CModDoc &modDoc); protected: BOOL OnInitDialog() override; @@ -270,40 +256,27 @@ protected: CNumberEdit m_edit; CSpinButtonCtrl m_spin; - CString m_description; - double m_minValueDbl = 0.0, m_maxValueDbl = 0.0; - int32 m_minValueInt = 0, m_maxValueInt = 0; - int32 m_maxLength = 0; + const CString m_description; + const double m_minValueDbl = 0.0, m_maxValueDbl = 0.0; + const int32 m_minValueInt = 0, m_maxValueInt = 0; + const int32 m_maxLength = 0; public: int32 resultAsInt = 0; double resultAsDouble = 0.0; CString resultAsString; +protected: + CInputDlg(CWnd *parent, const TCHAR *desc, const TCHAR *defaultString, int32 maxLength, double minValDbl, double maxValDbl = 0.0, double defaultDbl = 0.0, int32 minValInt = 0, int32 maxValInt = 0, int32 defaultInt = 0); + public: // Initialize text input box - CInputDlg(CWnd *parent, const TCHAR *desc, const TCHAR *defaultString, int32 maxLength = -1) : DialogBase(IDD_INPUT, parent) - , m_description(desc) - , m_maxLength(maxLength) - , resultAsString(defaultString) - { } + CInputDlg(CWnd *parent, const TCHAR *desc, const TCHAR *defaultString, int32 maxLength = -1) : CInputDlg{parent, desc, defaultString, maxLength, 0.0} { } // Initialize numeric input box (float) - CInputDlg(CWnd *parent, const TCHAR *desc, double minVal, double maxVal, double defaultNumber) : DialogBase(IDD_INPUT, parent) - , m_description(desc) - , m_minValueDbl(minVal), m_maxValueDbl(maxVal) - , resultAsDouble(defaultNumber) - { } - CInputDlg(CWnd *parent, const TCHAR *desc, float minVal, float maxVal, float defaultNumber) : DialogBase(IDD_INPUT, parent) - , m_description(desc) - , m_minValueDbl(minVal), m_maxValueDbl(maxVal) - , resultAsDouble(defaultNumber) - { } + CInputDlg(CWnd *parent, const TCHAR *desc, double minVal, double maxVal, double defaultNumber) : CInputDlg{parent, desc, {}, -1, minVal, maxVal, defaultNumber} { } + CInputDlg(CWnd *parent, const TCHAR *desc, float minVal, float maxVal, float defaultNumber) : CInputDlg{parent, desc, {}, -1, minVal, maxVal, defaultNumber } { } // Initialize numeric input box (int) - CInputDlg(CWnd *parent, const TCHAR *desc, int32 minVal, int32 maxVal, int32 defaultNumber) : DialogBase(IDD_INPUT, parent) - , m_description(desc) - , m_minValueInt(minVal), m_maxValueInt(maxVal) - , resultAsInt(defaultNumber) - { } + CInputDlg(CWnd *parent, const TCHAR *desc, int32 minVal, int32 maxVal, int32 defaultNumber) : CInputDlg{parent, desc, {}, -1, 0.0, 0.0, 0.0, minVal, maxVal, defaultNumber } { } protected: void DoDataExchange(CDataExchange *pDX) override; |
