Menu
▾
▴
[OMPT-svn-commit] OpenMPT r22260 - trunk/OpenMPT/mptrack
|
From: <sv...@op...> - 2024-11-21 22:52:23
|
Author: sagamusix Date: Thu Nov 21 23:52:10 2024 New Revision: 22260 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22260 Log: [Ref] Don't include WindowMessages.h in headers. Modified: trunk/OpenMPT/mptrack/AbstractVstEditor.cpp trunk/OpenMPT/mptrack/Childfrm.cpp trunk/OpenMPT/mptrack/Childfrm.h trunk/OpenMPT/mptrack/Ctrl_com.cpp trunk/OpenMPT/mptrack/Ctrl_gen.cpp trunk/OpenMPT/mptrack/Ctrl_ins.cpp trunk/OpenMPT/mptrack/Ctrl_pat.cpp trunk/OpenMPT/mptrack/Ctrl_smp.cpp trunk/OpenMPT/mptrack/Globals.cpp trunk/OpenMPT/mptrack/Globals.h trunk/OpenMPT/mptrack/View_gen.cpp trunk/OpenMPT/mptrack/View_gen.h trunk/OpenMPT/mptrack/View_pat.cpp trunk/OpenMPT/mptrack/View_pat.h Modified: trunk/OpenMPT/mptrack/AbstractVstEditor.cpp ============================================================================== --- trunk/OpenMPT/mptrack/AbstractVstEditor.cpp Thu Nov 21 23:38:25 2024 (r22259) +++ trunk/OpenMPT/mptrack/AbstractVstEditor.cpp Thu Nov 21 23:52:10 2024 (r22260) @@ -21,6 +21,7 @@ #include "resource.h" #include "VstPresets.h" #include "Vstplug.h" +#include "WindowMessages.h" #include "../common/FileReader.h" #include "../common/mptStringBuffer.h" #include "../soundlib/Sndfile.h" Modified: trunk/OpenMPT/mptrack/Childfrm.cpp ============================================================================== --- trunk/OpenMPT/mptrack/Childfrm.cpp Thu Nov 21 23:38:25 2024 (r22259) +++ trunk/OpenMPT/mptrack/Childfrm.cpp Thu Nov 21 23:52:10 2024 (r22260) @@ -25,6 +25,7 @@ #include "View_ins.h" #include "View_pat.h" #include "View_smp.h" +#include "WindowMessages.h" #include "../common/FileReader.h" #include "mpt/io/io.hpp" #include "mpt/io/io_stdstream.hpp" @@ -338,6 +339,9 @@ } +LRESULT CChildFrame::ActivateView(UINT nId, LPARAM lParam) { return ::SendMessage(m_hWndCtrl, WM_MOD_ACTIVATEVIEW, nId, lParam); } + + LRESULT CChildFrame::OnInstrumentSelected(WPARAM wParam, LPARAM lParam) { CView *pView = GetActiveView(); Modified: trunk/OpenMPT/mptrack/Childfrm.h ============================================================================== --- trunk/OpenMPT/mptrack/Childfrm.h Thu Nov 21 23:38:25 2024 (r22259) +++ trunk/OpenMPT/mptrack/Childfrm.h Thu Nov 21 23:52:10 2024 (r22260) @@ -13,7 +13,6 @@ #include "openmpt/all/BuildSettings.hpp" #include "PatternCursor.h" -#include "WindowMessages.h" #include "../common/FileReaderFwd.h" #include "../soundlib/plugins/PluginStructs.h" @@ -120,7 +119,7 @@ const char *GetCurrentViewClassName() const; LRESULT SendCtrlMessage(UINT uMsg, LPARAM lParam = 0) const; LRESULT SendViewMessage(UINT uMsg, LPARAM lParam = 0) const; - LRESULT ActivateView(UINT nId, LPARAM lParam) { return ::SendMessage(m_hWndCtrl, WM_MOD_ACTIVATEVIEW, nId, lParam); } + LRESULT ActivateView(UINT nId, LPARAM lParam); HWND GetHwndCtrl() const { return m_hWndCtrl; } HWND GetHwndView() const { return m_hWndView; } GeneralViewState &GetGeneralViewState() { return m_ViewGeneral; } Modified: trunk/OpenMPT/mptrack/Ctrl_com.cpp ============================================================================== --- trunk/OpenMPT/mptrack/Ctrl_com.cpp Thu Nov 21 23:38:25 2024 (r22259) +++ trunk/OpenMPT/mptrack/Ctrl_com.cpp Thu Nov 21 23:52:10 2024 (r22260) @@ -87,7 +87,7 @@ UpdateView(CommentHint().ModType()); m_EditComments.SetFocus(); m_EditComments.FmtLines(FALSE); - m_bInitialized = TRUE; + m_initialized = true; return FALSE; } @@ -333,7 +333,8 @@ { if(m_nLockCount) return; - if ((!m_bInitialized) || (!m_EditComments.m_hWnd) || (!m_EditComments.GetModify())) return; + if(!m_initialized || !m_EditComments.m_hWnd || !m_EditComments.GetModify()) + return; CString text; m_EditComments.GetWindowText(text); m_EditComments.SetModify(FALSE); Modified: trunk/OpenMPT/mptrack/Ctrl_gen.cpp ============================================================================== --- trunk/OpenMPT/mptrack/Ctrl_gen.cpp Thu Nov 21 23:38:25 2024 (r22259) +++ trunk/OpenMPT/mptrack/Ctrl_gen.cpp Thu Nov 21 23:52:10 2024 (r22260) @@ -122,7 +122,7 @@ m_editsLocked = false; UpdateView(GeneralHint().ModType()); OnActivatePage(0); - m_bInitialized = TRUE; + m_initialized = true; return FALSE; } @@ -403,7 +403,7 @@ { CModControlDlg::OnVScroll(code, pos, pscroll); - if (m_bInitialized) + if (m_initialized) { CSliderCtrl* pSlider = (CSliderCtrl*) pscroll; @@ -521,7 +521,7 @@ void CCtrlGeneral::OnTempoChanged() { - if (m_bInitialized && m_EditTempo.GetWindowTextLength() > 0 && !IsLocked()) + if (m_initialized && m_EditTempo.GetWindowTextLength() > 0 && !IsLocked()) { TEMPO tempo = m_EditTempo.GetTempoValue(); Limit(tempo, m_tempoMin, m_tempoMax); @@ -543,7 +543,7 @@ void CCtrlGeneral::OnSpeedChanged() { TCHAR s[16]; - if(m_bInitialized) + if(m_initialized) { m_EditSpeed.GetWindowText(s, mpt::saturate_cast<int>(std::size(s))); if (s[0]) @@ -570,7 +570,7 @@ void CCtrlGeneral::OnVSTiVolChanged() { TCHAR s[16]; - if (m_bInitialized) + if (m_initialized) { m_EditVSTiVol.GetWindowText(s, mpt::saturate_cast<int>(std::size(s))); if (s[0]) @@ -594,7 +594,7 @@ void CCtrlGeneral::OnSamplePAChanged() { TCHAR s[16]; - if(m_bInitialized) + if(m_initialized) { m_EditSamplePA.GetWindowText(s, mpt::saturate_cast<int>(std::size(s))); if (s[0]) @@ -617,7 +617,7 @@ void CCtrlGeneral::OnGlobalVolChanged() { TCHAR s[16]; - if(m_bInitialized) + if(m_initialized) { m_EditGlobalVol.GetWindowText(s, mpt::saturate_cast<int>(std::size(s))); if (s[0]) @@ -642,7 +642,7 @@ void CCtrlGeneral::OnRestartPosChanged() { - if(!m_bInitialized) + if(!m_initialized) return; TCHAR s[32]; m_EditRestartPos.GetWindowText(s, mpt::saturate_cast<int>(std::size(s))); @@ -666,7 +666,7 @@ void CCtrlGeneral::OnRestartPosDone() { - if(m_bInitialized) + if(m_initialized) SetDlgItemInt(IDC_EDIT_RESTARTPOS, m_sndFile.Order().GetRestartPos()); } Modified: trunk/OpenMPT/mptrack/Ctrl_ins.cpp ============================================================================== --- trunk/OpenMPT/mptrack/Ctrl_ins.cpp Thu Nov 21 23:38:25 2024 (r22259) +++ trunk/OpenMPT/mptrack/Ctrl_ins.cpp Thu Nov 21 23:52:10 2024 (r22260) @@ -1031,7 +1031,7 @@ BOOL CCtrlInstruments::OnInitDialog() { CModControlDlg::OnInitDialog(); - m_bInitialized = FALSE; + m_initialized = false; SetRedraw(FALSE); m_ToolBar.SetExtendedStyle(m_ToolBar.GetExtendedStyle() | TBSTYLE_EX_DRAWDDARROWS); @@ -1189,7 +1189,7 @@ if (m_sndFile.m_nInstruments < 1) return FALSE; if ((nIns < 1) || (nIns > m_sndFile.m_nInstruments)) return FALSE; LockControls(); - if ((m_nInstrument != nIns) || (!m_bInitialized)) + if (m_nInstrument != nIns || !m_initialized) { m_nInstrument = static_cast<INSTRUMENTINDEX>(nIns); m_NoteMap.SetCurrentInstrument(m_nInstrument); @@ -1242,7 +1242,8 @@ SetCurrentInstrument(static_cast<INSTRUMENTINDEX>((lParam > 0) ? lParam : m_nInstrument)); // Initial Update - if (!m_bInitialized) UpdateView(InstrumentHint(m_nInstrument).Info().Envelope().ModType(), NULL); + if(!m_initialized) + UpdateView(InstrumentHint(m_nInstrument).Info().Envelope().ModType(), NULL); PostViewMessage(VIEWMSG_LOADSTATE, (LPARAM)&instrumentState); SwitchToView(); @@ -1341,7 +1342,7 @@ const InstrumentHint instrHint = hint.ToType<InstrumentHint>(); FlagSet<HintType> hintType = instrHint.GetType(); - if(!m_bInitialized) + if(!m_initialized) hintType.set(HINT_MODTYPE); if(!hintType[HINT_MODTYPE | HINT_INSTRUMENT | HINT_ENVELOPE | HINT_INSNAMES]) return; @@ -1586,10 +1587,10 @@ m_ComboTuning.Invalidate(FALSE); } - if (!m_bInitialized) + if(!m_initialized) { // First update - m_bInitialized = TRUE; + m_initialized = true; UnlockControls(); } Modified: trunk/OpenMPT/mptrack/Ctrl_pat.cpp ============================================================================== --- trunk/OpenMPT/mptrack/Ctrl_pat.cpp Thu Nov 21 23:38:25 2024 (r22259) +++ trunk/OpenMPT/mptrack/Ctrl_pat.cpp Thu Nov 21 23:52:10 2024 (r22260) @@ -191,7 +191,7 @@ UpdateView(PatternHint().Names().ModType(), NULL); RecalcLayout(); - m_bInitialized = TRUE; + m_initialized = true; UnlockControls(); SetRedraw(TRUE); Modified: trunk/OpenMPT/mptrack/Ctrl_smp.cpp ============================================================================== --- trunk/OpenMPT/mptrack/Ctrl_smp.cpp Thu Nov 21 23:38:25 2024 (r22259) +++ trunk/OpenMPT/mptrack/Ctrl_smp.cpp Thu Nov 21 23:52:10 2024 (r22260) @@ -208,7 +208,7 @@ BOOL CCtrlSamples::OnInitDialog() { CModControlDlg::OnInitDialog(); - m_bInitialized = FALSE; + m_initialized = false; SetRedraw(FALSE); // Zoom Selection @@ -405,8 +405,10 @@ SetCurrentSample((lParam > 0) ? ((SAMPLEINDEX)lParam) : m_nSample); // Initial Update - if (!m_bInitialized) UpdateView(SampleHint(m_nSample).Info().ModType(), NULL); - if (m_hWndView) PostViewMessage(VIEWMSG_LOADSTATE, (LPARAM)&sampleState); + if(!m_initialized) + UpdateView(SampleHint(m_nSample).Info().ModType(), nullptr); + if(m_hWndView) + PostViewMessage(VIEWMSG_LOADSTATE, (LPARAM)&sampleState); SwitchToView(); // Combo boxes randomly disappear without this... why? @@ -683,7 +685,8 @@ const SampleHint sampleHint = hint.ToType<SampleHint>(); FlagSet<HintType> hintType = sampleHint.GetType(); - if (!m_bInitialized) hintType.set(HINT_MODTYPE); + if(!m_initialized) + hintType.set(HINT_MODTYPE); if(!hintType[HINT_SMPNAMES | HINT_SAMPLEINFO | HINT_MODTYPE]) return; const SAMPLEINDEX updateSmp = sampleHint.GetSample(); @@ -914,10 +917,10 @@ GetDlgItem(IDC_CHECK2)->EnableWindow((m_sndFile.SampleHasPath(m_nSample) && m_sndFile.GetType() == MOD_TYPE_MPT) ? TRUE : FALSE); } - if (!m_bInitialized) + if(!m_initialized) { // First update - m_bInitialized = TRUE; + m_initialized = true; UnlockControls(); } Modified: trunk/OpenMPT/mptrack/Globals.cpp ============================================================================== --- trunk/OpenMPT/mptrack/Globals.cpp Thu Nov 21 23:38:25 2024 (r22259) +++ trunk/OpenMPT/mptrack/Globals.cpp Thu Nov 21 23:52:10 2024 (r22260) @@ -25,6 +25,7 @@ #include "Mptrack.h" #include "resource.h" #include "TrackerSettings.h" +#include "WindowMessages.h" #include "../soundlib/mod_specifications.h" #include <afxpriv.h> @@ -152,6 +153,9 @@ return FALSE; } +LRESULT CModControlDlg::SwitchToView() const { return SendViewMessage(VIEWMSG_SETACTIVE); } +void CModControlDlg::UnlockControls() { PostMessage(WM_MOD_UNLOCKCONTROLS); } + BOOL CModControlDlg::OnToolTipText(UINT /*nID*/, NMHDR *pNMHDR, LRESULT *pResult) { Modified: trunk/OpenMPT/mptrack/Globals.h ============================================================================== --- trunk/OpenMPT/mptrack/Globals.h Thu Nov 21 23:38:25 2024 (r22259) +++ trunk/OpenMPT/mptrack/Globals.h Thu Nov 21 23:52:10 2024 (r22260) @@ -14,7 +14,6 @@ #include "DialogBase.h" #include "Settings.h" #include "UpdateHints.h" -#include "WindowMessages.h" OPENMPT_NAMESPACE_BEGIN @@ -45,7 +44,7 @@ HWND m_hWndView = nullptr; HWND m_lastFocusItem = nullptr; LONG m_nLockCount = 0; - BOOL m_bInitialized = FALSE; + bool m_initialized = false; public: CModControlDlg(CModControlView &parent, CModDoc &document); @@ -56,9 +55,9 @@ HWND GetViewWnd() const { return m_hWndView; } LRESULT SendViewMessage(UINT uMsg, LPARAM lParam = 0) const; BOOL PostViewMessage(UINT uMsg, LPARAM lParam = 0) const; - LRESULT SwitchToView() const { return SendViewMessage(VIEWMSG_SETACTIVE); } + LRESULT SwitchToView() const; void LockControls() { m_nLockCount++; } - void UnlockControls() { PostMessage(WM_MOD_UNLOCKCONTROLS); } + void UnlockControls(); bool IsLocked() const { return (m_nLockCount > 0); } virtual Setting<LONG> &GetSplitPosRef() = 0; Modified: trunk/OpenMPT/mptrack/View_gen.cpp ============================================================================== --- trunk/OpenMPT/mptrack/View_gen.cpp Thu Nov 21 23:38:25 2024 (r22259) +++ trunk/OpenMPT/mptrack/View_gen.cpp Thu Nov 21 23:52:10 2024 (r22260) @@ -23,6 +23,7 @@ #include "Reporting.h" #include "resource.h" #include "SelectPluginDialog.h" +#include "WindowMessages.h" #include "../common/mptStringBuffer.h" #include "../soundlib/mod_specifications.h" #include "../soundlib/plugins/PlugInterface.h" @@ -297,6 +298,9 @@ } +void CViewGlobals::UnlockControls() { PostMessage(WM_MOD_UNLOCKCONTROLS); } + + int CViewGlobals::GetDlgItemIntEx(UINT nID) { CString s; Modified: trunk/OpenMPT/mptrack/View_gen.h ============================================================================== --- trunk/OpenMPT/mptrack/View_gen.h Thu Nov 21 23:38:25 2024 (r22259) +++ trunk/OpenMPT/mptrack/View_gen.h Thu Nov 21 23:52:10 2024 (r22260) @@ -16,7 +16,6 @@ #include "ColorPickerButton.h" #include "PluginComboBox.h" #include "UpdateHints.h" -#include "WindowMessages.h" #include "../soundlib/plugins/PluginStructs.h" OPENMPT_NAMESPACE_BEGIN @@ -64,7 +63,7 @@ CModDoc* GetDocument() const; void RecalcLayout(); void LockControls() { m_nLockCount++; } - void UnlockControls() { PostMessage(WM_MOD_UNLOCKCONTROLS); } + void UnlockControls(); bool IsLocked() const noexcept { return (m_nLockCount > 0); } int GetDlgItemIntEx(UINT nID); void PopulateChannelPlugins(UpdateHint hint, const CObject *pObj = nullptr); Modified: trunk/OpenMPT/mptrack/View_pat.cpp ============================================================================== --- trunk/OpenMPT/mptrack/View_pat.cpp Thu Nov 21 23:38:25 2024 (r22259) +++ trunk/OpenMPT/mptrack/View_pat.cpp Thu Nov 21 23:52:10 2024 (r22260) @@ -28,7 +28,6 @@ #include "resource.h" #include "SampleEditorDialogs.h" // For amplification dialog (which is re-used from sample editor) #include "WindowMessages.h" -#include "WindowMessages.h" #include "../common/misc_util.h" #include "../soundlib/MIDIEvents.h" #include "../soundlib/mod_specifications.h" @@ -3305,6 +3304,24 @@ } +void CViewPattern::OnPrevInstrument() +{ + PostCtrlMessage(CTRLMSG_PAT_PREVINSTRUMENT); +} + + +void CViewPattern::OnNextInstrument() +{ + PostCtrlMessage(CTRLMSG_PAT_NEXTINSTRUMENT); +} + + +void CViewPattern::OnPatternRecord() +{ + PostCtrlMessage(CTRLMSG_SETRECORD, -1); +} + + void CViewPattern::GotoPreviousOrder(std::optional<OrderTransitionMode> transitionMode) { if(CSoundFile *sndFile = GetSoundFile(); sndFile && transitionMode && IsLiveRecord()) Modified: trunk/OpenMPT/mptrack/View_pat.h ============================================================================== --- trunk/OpenMPT/mptrack/View_pat.h Thu Nov 21 23:38:25 2024 (r22259) +++ trunk/OpenMPT/mptrack/View_pat.h Thu Nov 21 23:52:10 2024 (r22260) @@ -420,9 +420,9 @@ afx_msg void OnSplitPattern(); afx_msg void OnPatternStep(); afx_msg void OnSwitchToOrderList(); - afx_msg void OnPrevInstrument() { PostCtrlMessage(CTRLMSG_PAT_PREVINSTRUMENT); } - afx_msg void OnNextInstrument() { PostCtrlMessage(CTRLMSG_PAT_NEXTINSTRUMENT); } - afx_msg void OnPatternRecord() { PostCtrlMessage(CTRLMSG_SETRECORD, -1); } + afx_msg void OnPrevInstrument(); + afx_msg void OnNextInstrument(); + afx_msg void OnPatternRecord(); afx_msg void OnInterpolateVolume() { Interpolate(PatternCursor::volumeColumn); } afx_msg void OnInterpolateEffect() { Interpolate(PatternCursor::effectColumn); } afx_msg void OnInterpolateNote() { Interpolate(PatternCursor::noteColumn); } |
