Menu
▾
▴
modplug-svn-commit
|
From: <sv...@op...> - 2024-05-06 21:24:01
|
Author: sagamusix Date: Mon May 6 23:23:53 2024 New Revision: 20718 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20718 Log: [Ref] Various small changes which should not change any functionality (whitespace fixes, comments fixes, header include reordering...) Modified: trunk/OpenMPT/mptrack/AdvancedConfigDlg.cpp trunk/OpenMPT/mptrack/ColorSchemes.h trunk/OpenMPT/mptrack/KeyConfigDlg.cpp trunk/OpenMPT/mptrack/UpdateCheck.cpp trunk/OpenMPT/sounddsp/AGC.cpp trunk/OpenMPT/soundlib/Load_ams.cpp trunk/OpenMPT/soundlib/Load_plm.cpp trunk/OpenMPT/soundlib/Load_sfx.cpp trunk/OpenMPT/soundlib/plugins/SymMODEcho.cpp trunk/OpenMPT/soundlib/plugins/dmo/DMOPlugin.cpp trunk/OpenMPT/soundlib/plugins/dmo/Distortion.cpp trunk/OpenMPT/soundlib/plugins/dmo/Echo.cpp trunk/OpenMPT/soundlib/plugins/dmo/Gargle.cpp trunk/OpenMPT/soundlib/plugins/dmo/I3DL2Reverb.cpp trunk/OpenMPT/soundlib/plugins/dmo/ParamEq.cpp trunk/OpenMPT/soundlib/plugins/dmo/WavesReverb.cpp Modified: trunk/OpenMPT/mptrack/AdvancedConfigDlg.cpp ============================================================================== --- trunk/OpenMPT/mptrack/AdvancedConfigDlg.cpp Mon May 6 22:48:35 2024 (r20717) +++ trunk/OpenMPT/mptrack/AdvancedConfigDlg.cpp Mon May 6 23:23:53 2024 (r20718) @@ -279,7 +279,7 @@ pLVCD->clrTextBk = isDefault ? defColor : modColor; } break; - } + } } Modified: trunk/OpenMPT/mptrack/ColorSchemes.h ============================================================================== --- trunk/OpenMPT/mptrack/ColorSchemes.h Mon May 6 22:48:35 2024 (r20717) +++ trunk/OpenMPT/mptrack/ColorSchemes.h Mon May 6 23:23:53 2024 (r20718) @@ -18,7 +18,7 @@ struct ColorScheme { const TCHAR *name; - struct { ModColor id : 8; COLORREF color : 24; } colors[MAX_MODCOLORS]; + struct { const ModColor id : 8; const COLORREF color : 24; } colors[MAX_MODCOLORS]; }; inline constexpr ColorScheme ColorSchemes[] = Modified: trunk/OpenMPT/mptrack/KeyConfigDlg.cpp ============================================================================== --- trunk/OpenMPT/mptrack/KeyConfigDlg.cpp Mon May 6 22:48:35 2024 (r20717) +++ trunk/OpenMPT/mptrack/KeyConfigDlg.cpp Mon May 6 23:23:53 2024 (r20718) @@ -625,7 +625,7 @@ selectedItem = m_lbnCommandKeys.GetSelectionMark(); } - const CommandID cmd = static_cast<CommandID>(m_lbnCommandKeys.GetItemData(selectedItem)); + const CommandID cmd = (selectedItem >= 0) ? static_cast<CommandID>(m_lbnCommandKeys.GetItemData(selectedItem)) : kcNull; CString str; //Separator Modified: trunk/OpenMPT/mptrack/UpdateCheck.cpp ============================================================================== --- trunk/OpenMPT/mptrack/UpdateCheck.cpp Mon May 6 22:48:35 2024 (r20717) +++ trunk/OpenMPT/mptrack/UpdateCheck.cpp Mon May 6 23:23:53 2024 (r20718) @@ -924,7 +924,7 @@ -static const char * const updateScript = R"vbs( +static const char updateScript[] = R"vbs( Wscript.Echo Wscript.Echo "OpenMPT portable Update" Modified: trunk/OpenMPT/sounddsp/AGC.cpp ============================================================================== --- trunk/OpenMPT/sounddsp/AGC.cpp Mon May 6 22:48:35 2024 (r20717) +++ trunk/OpenMPT/sounddsp/AGC.cpp Mon May 6 23:23:53 2024 (r20718) @@ -85,7 +85,7 @@ CAGC::CAGC() { - Initialize(true, 44100); + Initialize(true, 48000); } Modified: trunk/OpenMPT/soundlib/Load_ams.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_ams.cpp Mon May 6 22:48:35 2024 (r20717) +++ trunk/OpenMPT/soundlib/Load_ams.cpp Mon May 6 23:23:53 2024 (r20718) @@ -773,10 +773,10 @@ { return true; } - + InitializeGlobals(MOD_TYPE_AMS); - - m_songName = songName; + + m_songName = std::move(songName); m_nInstruments = fileHeader.numIns; m_nChannels = 32; Modified: trunk/OpenMPT/soundlib/Load_plm.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_plm.cpp Mon May 6 22:48:35 2024 (r20717) +++ trunk/OpenMPT/soundlib/Load_plm.cpp Mon May 6 23:23:53 2024 (r20718) @@ -275,7 +275,8 @@ const uint32 patternEnd = ord.x + patHeader.numRows; maxPos = std::max(maxPos, patternEnd); - ModCommand::NOTE lastNote[32] = { 0 }; + std::array<ModCommand::NOTE, 32> lastNote; + lastNote.fill(NOTE_NONE); for(ROWINDEX r = 0; r < patHeader.numRows; r++, curRow++) { if(curRow >= rowsPerPat) Modified: trunk/OpenMPT/soundlib/Load_sfx.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_sfx.cpp Mon May 6 22:48:35 2024 (r20717) +++ trunk/OpenMPT/soundlib/Load_sfx.cpp Mon May 6 23:23:53 2024 (r20718) @@ -60,7 +60,7 @@ uint16be loopStart; uint16be loopLength; - // Convert an MOD sample header to OpenMPT's internal sample header. + // Convert an SFX sample header to OpenMPT's internal sample header. void ConvertToMPT(ModSample &mptSmp, uint32 length) const { mptSmp.Initialize(MOD_TYPE_MOD); Modified: trunk/OpenMPT/soundlib/plugins/SymMODEcho.cpp ============================================================================== --- trunk/OpenMPT/soundlib/plugins/SymMODEcho.cpp Mon May 6 22:48:35 2024 (r20717) +++ trunk/OpenMPT/soundlib/plugins/SymMODEcho.cpp Mon May 6 23:23:53 2024 (r20718) @@ -209,15 +209,15 @@ switch(static_cast<Parameters>(param)) { case kEchoType: - switch(GetDSPType()) - { - case DSPType::Off: return _T("Off"); - case DSPType::Normal: return _T("Normal"); - case DSPType::Cross: return _T("Cross"); - case DSPType::Cross2: return _T("Cross 2"); - case DSPType::Center: return _T("Center"); - case DSPType::NumTypes: break; - } + switch(GetDSPType()) + { + case DSPType::Off: return _T("Off"); + case DSPType::Normal: return _T("Normal"); + case DSPType::Cross: return _T("Cross"); + case DSPType::Cross2: return _T("Cross 2"); + case DSPType::Center: return _T("Center"); + case DSPType::NumTypes: break; + } break; case kEchoDelay: return mpt::cfmt::val(m_chunk.param[kEchoDelay]); Modified: trunk/OpenMPT/soundlib/plugins/dmo/DMOPlugin.cpp ============================================================================== --- trunk/OpenMPT/soundlib/plugins/dmo/DMOPlugin.cpp Mon May 6 22:48:35 2024 (r20717) +++ trunk/OpenMPT/soundlib/plugins/dmo/DMOPlugin.cpp Mon May 6 23:23:53 2024 (r20718) @@ -14,9 +14,9 @@ #include "mpt/base/aligned_array.hpp" #if defined(MPT_WITH_DMO) +#include "DMOPlugin.h" #include "mpt/uuid/guid.hpp" #include "../../Sndfile.h" -#include "DMOPlugin.h" #include "../PluginManager.h" #include <uuids.h> #include <medparam.h> Modified: trunk/OpenMPT/soundlib/plugins/dmo/Distortion.cpp ============================================================================== --- trunk/OpenMPT/soundlib/plugins/dmo/Distortion.cpp Mon May 6 22:48:35 2024 (r20717) +++ trunk/OpenMPT/soundlib/plugins/dmo/Distortion.cpp Mon May 6 23:23:53 2024 (r20718) @@ -13,8 +13,8 @@ #include "stdafx.h" #ifndef NO_PLUGINS -#include "../../Sndfile.h" #include "Distortion.h" +#include "../../Sndfile.h" #include "DMOUtils.h" #include "mpt/base/numbers.hpp" #endif // !NO_PLUGINS Modified: trunk/OpenMPT/soundlib/plugins/dmo/Echo.cpp ============================================================================== --- trunk/OpenMPT/soundlib/plugins/dmo/Echo.cpp Mon May 6 22:48:35 2024 (r20717) +++ trunk/OpenMPT/soundlib/plugins/dmo/Echo.cpp Mon May 6 23:23:53 2024 (r20718) @@ -11,8 +11,8 @@ #include "stdafx.h" #ifndef NO_PLUGINS -#include "../../Sndfile.h" #include "Echo.h" +#include "../../Sndfile.h" #endif // !NO_PLUGINS OPENMPT_NAMESPACE_BEGIN Modified: trunk/OpenMPT/soundlib/plugins/dmo/Gargle.cpp ============================================================================== --- trunk/OpenMPT/soundlib/plugins/dmo/Gargle.cpp Mon May 6 22:48:35 2024 (r20717) +++ trunk/OpenMPT/soundlib/plugins/dmo/Gargle.cpp Mon May 6 23:23:53 2024 (r20718) @@ -11,9 +11,9 @@ #include "stdafx.h" #ifndef NO_PLUGINS -#include "../../Sndfile.h" #include "Gargle.h" -#endif // !NO_PLUGINS +#include "../../Sndfile.h" +#endif // !NO_PLUGINS OPENMPT_NAMESPACE_BEGIN Modified: trunk/OpenMPT/soundlib/plugins/dmo/I3DL2Reverb.cpp ============================================================================== --- trunk/OpenMPT/soundlib/plugins/dmo/I3DL2Reverb.cpp Mon May 6 22:48:35 2024 (r20717) +++ trunk/OpenMPT/soundlib/plugins/dmo/I3DL2Reverb.cpp Mon May 6 23:23:53 2024 (r20718) @@ -11,8 +11,8 @@ #include "stdafx.h" #ifndef NO_PLUGINS -#include "../../Sndfile.h" #include "I3DL2Reverb.h" +#include "../../Sndfile.h" #ifdef MODPLUG_TRACKER #include "../../../sounddsp/Reverb.h" #endif // MODPLUG_TRACKER Modified: trunk/OpenMPT/soundlib/plugins/dmo/ParamEq.cpp ============================================================================== --- trunk/OpenMPT/soundlib/plugins/dmo/ParamEq.cpp Mon May 6 22:48:35 2024 (r20717) +++ trunk/OpenMPT/soundlib/plugins/dmo/ParamEq.cpp Mon May 6 23:23:53 2024 (r20718) @@ -11,8 +11,8 @@ #include "stdafx.h" #ifndef NO_PLUGINS -#include "../../Sndfile.h" #include "ParamEq.h" +#include "../../Sndfile.h" #include "mpt/base/numbers.hpp" #endif // !NO_PLUGINS Modified: trunk/OpenMPT/soundlib/plugins/dmo/WavesReverb.cpp ============================================================================== --- trunk/OpenMPT/soundlib/plugins/dmo/WavesReverb.cpp Mon May 6 22:48:35 2024 (r20717) +++ trunk/OpenMPT/soundlib/plugins/dmo/WavesReverb.cpp Mon May 6 23:23:53 2024 (r20718) @@ -11,8 +11,8 @@ #include "stdafx.h" #ifndef NO_PLUGINS -#include "../../Sndfile.h" #include "WavesReverb.h" +#include "../../Sndfile.h" #endif // !NO_PLUGINS OPENMPT_NAMESPACE_BEGIN |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X