Menu
▾
▴
[OMPT-svn-commit] OpenMPT r22151 - trunk/OpenMPT/mptrack
|
From: <sv...@op...> - 2024-11-10 21:30:59
|
Author: sagamusix Date: Sun Nov 10 22:30:47 2024 New Revision: 22151 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22151 Log: [Ref] Move CMainFrame::UpdateAllViews to CTrackApp. Modified: trunk/OpenMPT/mptrack/MainFrm.cpp trunk/OpenMPT/mptrack/Mainfrm.h trunk/OpenMPT/mptrack/Moddoc.cpp trunk/OpenMPT/mptrack/Mptrack.cpp trunk/OpenMPT/mptrack/Mptrack.h Modified: trunk/OpenMPT/mptrack/MainFrm.cpp ============================================================================== --- trunk/OpenMPT/mptrack/MainFrm.cpp Sun Nov 10 22:18:18 2024 (r22150) +++ trunk/OpenMPT/mptrack/MainFrm.cpp Sun Nov 10 22:30:47 2024 (r22151) @@ -1797,14 +1797,14 @@ } -BOOL CMainFrame::ResetSoundCard() +void CMainFrame::ResetSoundCard() { MPT_TRACE_SCOPE(); - return CMainFrame::SetupSoundCard(TrackerSettings::Instance().GetSoundDeviceSettings(TrackerSettings::Instance().GetSoundDeviceIdentifier()), TrackerSettings::Instance().GetSoundDeviceIdentifier(), TrackerSettings::Instance().m_SoundSettingsStopMode, true); + CMainFrame::SetupSoundCard(TrackerSettings::Instance().GetSoundDeviceSettings(TrackerSettings::Instance().GetSoundDeviceIdentifier()), TrackerSettings::Instance().GetSoundDeviceIdentifier(), TrackerSettings::Instance().m_SoundSettingsStopMode, true); } -BOOL CMainFrame::SetupSoundCard(SoundDevice::Settings deviceSettings, SoundDevice::Identifier deviceIdentifier, SoundDeviceStopMode stoppedMode, bool forceReset) +void CMainFrame::SetupSoundCard(SoundDevice::Settings deviceSettings, SoundDevice::Identifier deviceIdentifier, SoundDeviceStopMode stoppedMode, bool forceReset) { MPT_TRACE_SCOPE(); if(forceReset @@ -1852,19 +1852,17 @@ CriticalSection cs; if(GetSoundFilePlaying()) UpdateAudioParameters(*GetSoundFilePlaying(), FALSE); } - return TRUE; } -BOOL CMainFrame::SetupPlayer() +void CMainFrame::SetupPlayer() { CriticalSection cs; if(GetSoundFilePlaying()) UpdateAudioParameters(*GetSoundFilePlaying(), FALSE); - return TRUE; } -BOOL CMainFrame::SetupMiscOptions() +void CMainFrame::SetupMiscOptions() { if (TrackerSettings::Instance().m_dwPatternSetup & PATTERN_MUTECHNMODE) TrackerSettings::Instance().MixerFlags |= SNDMIX_MUTECHNMODE; @@ -1878,8 +1876,7 @@ m_wndToolBar.EnableFlatButtons(TrackerSettings::Instance().m_dwPatternSetup & PATTERN_FLATBUTTONS); UpdateTree(nullptr, UpdateHint().MPTOptions()); - UpdateAllViews(UpdateHint().MPTOptions()); - return true; + theApp.UpdateAllViews(UpdateHint().MPTOptions()); } @@ -1897,19 +1894,6 @@ } -void CMainFrame::UpdateAllViews(UpdateHint hint, CObject *pHint) -{ - CModDocTemplate *pDocTmpl = theApp.GetModDocTemplate(); - if (pDocTmpl) - { - for(auto &doc : *pDocTmpl) - { - doc->UpdateAllViews(nullptr, hint, pHint); - } - } -} - - void CMainFrame::SetUserText(LPCTSTR lpszText) { if (lpszText[0] | m_szUserText[0]) @@ -2372,7 +2356,7 @@ LRESULT CMainFrame::OnInvalidatePatterns(WPARAM, LPARAM) { - UpdateAllViews(UpdateHint().MPTOptions()); + theApp.UpdateAllViews(UpdateHint().MPTOptions()); return TRUE; } Modified: trunk/OpenMPT/mptrack/Mainfrm.h ============================================================================== --- trunk/OpenMPT/mptrack/Mainfrm.h Sun Nov 10 22:18:18 2024 (r22150) +++ trunk/OpenMPT/mptrack/Mainfrm.h Sun Nov 10 22:30:47 2024 (r22151) @@ -262,7 +262,6 @@ static HICON GetModIcon() { return m_hIcon; } static HFONT GetGUIFont() { return m_hGUIFont; } static HFONT &GetCommentsFont() { return m_hFixedFont; } - static void UpdateAllViews(UpdateHint hint, CObject *pHint=NULL); static LRESULT CALLBACK FocusChangeProc(int code, WPARAM wParam, LPARAM lParam); static CInputHandler *m_InputHandler; @@ -346,10 +345,10 @@ void IdleHandlerSounddevice(); - BOOL ResetSoundCard(); - BOOL SetupSoundCard(SoundDevice::Settings deviceSettings, SoundDevice::Identifier deviceIdentifier, SoundDeviceStopMode stoppedMode, bool forceReset = false); - BOOL SetupMiscOptions(); - BOOL SetupPlayer(); + void ResetSoundCard(); + void SetupSoundCard(SoundDevice::Settings deviceSettings, SoundDevice::Identifier deviceIdentifier, SoundDeviceStopMode stoppedMode, bool forceReset = false); + void SetupMiscOptions(); + void SetupPlayer(); void SetupMidi(DWORD d, UINT n); HWND GetFollowSong() const; Modified: trunk/OpenMPT/mptrack/Moddoc.cpp ============================================================================== --- trunk/OpenMPT/mptrack/Moddoc.cpp Sun Nov 10 22:18:18 2024 (r22150) +++ trunk/OpenMPT/mptrack/Moddoc.cpp Sun Nov 10 22:30:47 2024 (r22151) @@ -2839,7 +2839,7 @@ { TrackerSettings::Instance().gbLoopSong = loop; m_SndFile.SetRepeatCount(loop ? -1 : 0); - CMainFrame::GetMainFrame()->UpdateAllViews(UpdateHint().MPTOptions()); + theApp.UpdateAllViews(UpdateHint().MPTOptions()); } Modified: trunk/OpenMPT/mptrack/Mptrack.cpp ============================================================================== --- trunk/OpenMPT/mptrack/Mptrack.cpp Sun Nov 10 22:18:18 2024 (r22150) +++ trunk/OpenMPT/mptrack/Mptrack.cpp Sun Nov 10 22:30:47 2024 (r22151) @@ -289,6 +289,18 @@ } +void CTrackApp::UpdateAllViews(UpdateHint hint, CObject *pHint) +{ + if(auto *pDocTmpl = GetModDocTemplate()) + { + for(auto &doc : *pDocTmpl) + { + doc->UpdateAllViews(nullptr, hint, pHint); + } + } +} + + ///////////////////////////////////////////////////////////////////////////// // Command Line options Modified: trunk/OpenMPT/mptrack/Mptrack.h ============================================================================== --- trunk/OpenMPT/mptrack/Mptrack.h Sun Nov 10 22:18:18 2024 (r22150) +++ trunk/OpenMPT/mptrack/Mptrack.h Sun Nov 10 22:30:47 2024 (r22151) @@ -24,6 +24,7 @@ class CModDoc; class CModDocTemplate; class CVstPluginManager; +struct UpdateHint; namespace SoundDevice { class Manager; @@ -214,6 +215,8 @@ int GetOpenDocumentCount() const; std::vector<CModDoc *> GetOpenDocuments() const; + void UpdateAllViews(UpdateHint hint, CObject *pHint = nullptr); + public: inline mpt::recursive_mutex_with_lock_count &GetGlobalMutexRef() { return m_GlobalMutex; } bool InGuiThread() const { return GetCurrentThreadId() == m_GuiThreadId; } @@ -308,10 +311,9 @@ static CString GetResamplingModeName(ResamplingMode mode, int length, bool addTaps); // Overrides -public: +protected: // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(CTrackApp) -public: BOOL InitInstance() override; BOOL InitInstanceEarly(CMPTCommandLineInfo &cmdInfo); BOOL InitInstanceLate(CMPTCommandLineInfo &cmdInfo); @@ -345,7 +347,6 @@ //}}AFX_MSG DECLARE_MESSAGE_MAP() -protected: size_t AddScannedDLSBanks(); void InitializeDXPlugins(); |
