You can subscribe to this list here.
2006 |
Jan
|
Feb
|
Mar
(1) |
Apr
(1) |
May
|
Jun
(1) |
Jul
|
Aug
(10) |
Sep
|
Oct
|
Nov
|
Dec
(3) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2007 |
Jan
(1) |
Feb
(2) |
Mar
(3) |
Apr
(2) |
May
(10) |
Jun
(2) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
(3) |
Dec
|
2008 |
Jan
(6) |
Feb
(4) |
Mar
(5) |
Apr
(2) |
May
(1) |
Jun
(1) |
Jul
(4) |
Aug
(6) |
Sep
(2) |
Oct
(9) |
Nov
(1) |
Dec
(4) |
2009 |
Jan
(9) |
Feb
(2) |
Mar
(2) |
Apr
(2) |
May
(6) |
Jun
(18) |
Jul
(33) |
Aug
(39) |
Sep
(33) |
Oct
(24) |
Nov
(23) |
Dec
(22) |
2010 |
Jan
(29) |
Feb
(32) |
Mar
(51) |
Apr
(17) |
May
(31) |
Jun
(21) |
Jul
(32) |
Aug
(28) |
Sep
(35) |
Oct
(27) |
Nov
(11) |
Dec
(13) |
2011 |
Jan
(14) |
Feb
(13) |
Mar
(27) |
Apr
(27) |
May
(28) |
Jun
(20) |
Jul
(43) |
Aug
(52) |
Sep
(66) |
Oct
(61) |
Nov
(11) |
Dec
(8) |
2012 |
Jan
(20) |
Feb
(30) |
Mar
(38) |
Apr
(21) |
May
(33) |
Jun
(21) |
Jul
(25) |
Aug
(9) |
Sep
(24) |
Oct
(42) |
Nov
(27) |
Dec
(41) |
2013 |
Jan
(20) |
Feb
(35) |
Mar
(156) |
Apr
(298) |
May
(258) |
Jun
(201) |
Jul
(105) |
Aug
(60) |
Sep
(193) |
Oct
(245) |
Nov
(280) |
Dec
(194) |
2014 |
Jan
(63) |
Feb
(202) |
Mar
(200) |
Apr
(23) |
May
(53) |
Jun
(105) |
Jul
(18) |
Aug
(26) |
Sep
(110) |
Oct
(187) |
Nov
(97) |
Dec
(74) |
2015 |
Jan
(45) |
Feb
(55) |
Mar
(116) |
Apr
(116) |
May
(193) |
Jun
(164) |
Jul
(50) |
Aug
(111) |
Sep
(98) |
Oct
(71) |
Nov
(103) |
Dec
(63) |
2016 |
Jan
(33) |
Feb
(101) |
Mar
(182) |
Apr
(139) |
May
(140) |
Jun
(103) |
Jul
(165) |
Aug
(286) |
Sep
(208) |
Oct
(127) |
Nov
(97) |
Dec
(54) |
2017 |
Jan
(64) |
Feb
(335) |
Mar
(202) |
Apr
(212) |
May
(139) |
Jun
(127) |
Jul
(294) |
Aug
(154) |
Sep
(170) |
Oct
(152) |
Nov
(156) |
Dec
(62) |
2018 |
Jan
(168) |
Feb
(237) |
Mar
(196) |
Apr
(174) |
May
(174) |
Jun
(161) |
Jul
(127) |
Aug
(88) |
Sep
(149) |
Oct
(66) |
Nov
(52) |
Dec
(135) |
2019 |
Jan
(146) |
Feb
(126) |
Mar
(104) |
Apr
(58) |
May
(60) |
Jun
(28) |
Jul
(197) |
Aug
(129) |
Sep
(141) |
Oct
(148) |
Nov
(63) |
Dec
(100) |
2020 |
Jan
(74) |
Feb
(37) |
Mar
(59) |
Apr
(154) |
May
(194) |
Jun
(133) |
Jul
(313) |
Aug
(197) |
Sep
(49) |
Oct
(162) |
Nov
(143) |
Dec
(57) |
2021 |
Jan
(120) |
Feb
(107) |
Mar
(314) |
Apr
(157) |
May
(524) |
Jun
(169) |
Jul
(72) |
Aug
(133) |
Sep
(135) |
Oct
(146) |
Nov
(198) |
Dec
(325) |
2022 |
Jan
(409) |
Feb
(249) |
Mar
(138) |
Apr
(95) |
May
(102) |
Jun
(221) |
Jul
(66) |
Aug
(120) |
Sep
(192) |
Oct
(131) |
Nov
(53) |
Dec
(171) |
2023 |
Jan
(357) |
Feb
(82) |
Mar
(168) |
Apr
(218) |
May
(196) |
Jun
(86) |
Jul
(115) |
Aug
(49) |
Sep
(190) |
Oct
(102) |
Nov
(45) |
Dec
(76) |
2024 |
Jan
(86) |
Feb
(50) |
Mar
(324) |
Apr
(209) |
May
(197) |
Jun
(232) |
Jul
(194) |
Aug
(247) |
Sep
(219) |
Oct
(266) |
Nov
(328) |
Dec
(304) |
2025 |
Jan
(191) |
Feb
(115) |
Mar
(137) |
Apr
(32) |
May
(126) |
Jun
(403) |
Jul
(181) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <sv...@op...> - 2024-12-11 13:34:53
|
Author: manx Date: Wed Dec 11 14:34:37 2024 New Revision: 22508 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22508 Log: [Ref] mpt/fs/fs.hpp: Small readability improvement. Modified: trunk/OpenMPT/src/mpt/fs/fs.hpp Modified: trunk/OpenMPT/src/mpt/fs/fs.hpp ============================================================================== --- trunk/OpenMPT/src/mpt/fs/fs.hpp Tue Dec 10 18:56:35 2024 (r22507) +++ trunk/OpenMPT/src/mpt/fs/fs.hpp Wed Dec 11 14:34:37 2024 (r22508) @@ -83,7 +83,7 @@ #if !(MPT_WINRT_BEFORE(MPT_WIN_10)) mpt::native_path absolute(const mpt::native_path & path) { - const auto long_path = mpt::support_long_path(path.AsNative()); + const mpt::os_path long_path = mpt::support_long_path(path.AsNative()); DWORD size = ::GetFullPathName(long_path.c_str(), 0, nullptr, nullptr); if (size == 0) { return path; |
From: <sv...@op...> - 2024-12-10 17:56:49
|
Author: sagamusix Date: Tue Dec 10 18:56:35 2024 New Revision: 22507 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22507 Log: [Fix] TCB: The restart order is really special. It refers to the first *unplayed* order, and values 0 and 1 are identical. Modified: trunk/OpenMPT/soundlib/Load_tcb.cpp Modified: trunk/OpenMPT/soundlib/Load_tcb.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_tcb.cpp Tue Dec 10 18:34:12 2024 (r22506) +++ trunk/OpenMPT/soundlib/Load_tcb.cpp Tue Dec 10 18:56:35 2024 (r22507) @@ -22,7 +22,7 @@ uint8 tempo; uint8 unused1; uint8 order[128]; - uint8 lastOrder; + uint8 restartOrder; uint8 unused2; // Supposed to be part of lastOrder but then it would have to be a little-endian word bool IsNewFormat() const @@ -34,7 +34,7 @@ { if(memcmp(magic, "AN COOL.", 8) && memcmp(magic, "AN COOL!", 8)) return false; - if(tempo > 15 || unused1 || lastOrder > 127 || unused2 || numPatterns > 128) + if(tempo > 15 || unused1 || restartOrder > 127 || unused2 || numPatterns > 128) return false; for(uint8 ord : order) { @@ -85,7 +85,7 @@ SetupMODPanning(true); Order().SetDefaultSpeed(16 - fileHeader.tempo); Order().SetDefaultTempoInt(125); - ReadOrderFromArray(Order(), fileHeader.order, fileHeader.lastOrder + 1); + ReadOrderFromArray(Order(), fileHeader.order, std::max(uint8(1), fileHeader.restartOrder)); m_nSamplePreAmp = 64; m_SongFlags.set(SONG_IMPORTED); m_playBehaviour.set(kApplyUpperPeriodLimit); |
From: <sv...@op...> - 2024-12-10 17:34:27
|
Author: sagamusix Date: Tue Dec 10 18:34:12 2024 New Revision: 22506 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22506 Log: [Fix] Moving the OpenMPT window to a screen with different size didn't adjust the frame size of MDI children. [Ref] Small general improvements to CChildFrame code. Modified: trunk/OpenMPT/mptrack/Childfrm.cpp trunk/OpenMPT/mptrack/Childfrm.h trunk/OpenMPT/mptrack/MainFrm.cpp trunk/OpenMPT/mptrack/Moddoc.cpp Modified: trunk/OpenMPT/mptrack/Childfrm.cpp ============================================================================== --- trunk/OpenMPT/mptrack/Childfrm.cpp Tue Dec 10 18:23:59 2024 (r22505) +++ trunk/OpenMPT/mptrack/Childfrm.cpp Tue Dec 10 18:34:12 2024 (r22506) @@ -61,10 +61,6 @@ CChildFrame::CChildFrame() { - m_bInitialActivation=true; //rewbs.fix3185 - m_szCurrentViewClassName[0] = 0; - m_hWndCtrl = m_hWndView = nullptr; - m_bMaxWhenClosed = false; glMdiOpenCount++; } @@ -73,7 +69,7 @@ { if ((--glMdiOpenCount) == 0) { - TrackerSettings::Instance().gbMdiMaximize = m_bMaxWhenClosed; + TrackerSettings::Instance().gbMdiMaximize = m_maxWhenClosed; } } @@ -96,6 +92,8 @@ pModView->SetMDIParentFrame(m_hWnd); } + m_dpi = HighDPISupport::GetDpiForWindow(m_hWnd); + const BOOL bStatus = ChangeViewClass(RUNTIME_CLASS(CViewGlobals), pContext); // If it all worked, we now have a splitter window which contain two different views @@ -122,6 +120,18 @@ m_wndSplitter.RecalcLayout(); } } + const int newDPI = HighDPISupport::GetDpiForWindow(m_hWnd); + if(m_dpi) + { + // MDI child windows are not resized automatically on DPI change. + CRect windowRect; + GetClientRect(windowRect); + windowRect.right = Util::muldiv(windowRect.right, newDPI, m_dpi); + windowRect.bottom = Util::muldiv(windowRect.bottom, newDPI, m_dpi); + HighDPISupport::AdjustWindowRectEx(windowRect, GetStyle(), FALSE, GetExStyle(), newDPI); + SetWindowPos(nullptr, 0, 0, windowRect.Width(), windowRect.Height(), SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOMOVE); + } + m_dpi = newDPI; return result; } @@ -190,11 +200,11 @@ if (pView) pModDoc = (CModDoc *)pView->GetDocument(); if ((m_hWndCtrl) && (pModDoc)) { - if (m_bInitialActivation && m_ViewPatterns.nPattern == 0) + if (m_initialActivation && m_ViewPatterns.nPattern == 0) { if(!pModDoc->GetSoundFile().Order().empty()) m_ViewPatterns.nPattern = pModDoc->GetSoundFile().Order()[0]; - m_bInitialActivation = false; + m_initialActivation = false; } } } @@ -234,10 +244,10 @@ { CMainFrame *pMainFrm = CMainFrame::GetMainFrame(); CWnd *pWnd; - if (!strcmp(pViewClass->m_lpszClassName, m_szCurrentViewClassName)) return TRUE; - if (m_szCurrentViewClassName[0]) + if (pViewClass->m_lpszClassName == m_currentViewClassName) return TRUE; + if(!m_currentViewClassName.empty()) { - m_szCurrentViewClassName[0] = 0; + m_currentViewClassName.clear(); m_wndSplitter.DeleteView(1, 0); } if ((m_hWndView) && (pMainFrm)) @@ -251,7 +261,7 @@ if (!m_wndSplitter.CreateView(1, 0, pViewClass, CSize(0, 0), pContext)) return FALSE; // Get 2nd window handle if ((pWnd = m_wndSplitter.GetPane(1, 0)) != NULL) m_hWndView = pWnd->m_hWnd; - strcpy(m_szCurrentViewClassName, pViewClass->m_lpszClassName); + m_currentViewClassName = pViewClass->m_lpszClassName; m_wndSplitter.RecalcLayout(); if ((m_hWndView) && (m_hWndCtrl)) { @@ -273,12 +283,13 @@ return; } -void CChildFrame::SavePosition(BOOL bForce) +void CChildFrame::SavePosition(bool force) { if (m_hWnd) { - m_bMaxWhenClosed = IsZoomed() != FALSE; - if (bForce) TrackerSettings::Instance().gbMdiMaximize = m_bMaxWhenClosed; + m_maxWhenClosed = IsZoomed() != FALSE; + if (force) + TrackerSettings::Instance().gbMdiMaximize = m_maxWhenClosed; if (!IsIconic()) { CWnd *pWnd = m_wndSplitter.GetPane(0, 0); @@ -290,15 +301,15 @@ return; int l = HighDPISupport::ScalePixelsInv(rect.Height(), m_hWnd); //rewbs.varWindowSize - not the nicest piece of code, but we need to distinguish between the views: - if (strcmp(CViewGlobals::classCViewGlobals.m_lpszClassName, m_szCurrentViewClassName) == 0) + if(CViewGlobals::classCViewGlobals.m_lpszClassName == m_currentViewClassName) TrackerSettings::Instance().glGeneralWindowHeight = l; - else if (strcmp(CViewPattern::classCViewPattern.m_lpszClassName, m_szCurrentViewClassName) == 0) + else if(CViewPattern::classCViewPattern.m_lpszClassName == m_currentViewClassName) TrackerSettings::Instance().glPatternWindowHeight = l; - else if (strcmp(CViewSample::classCViewSample.m_lpszClassName, m_szCurrentViewClassName) == 0) + else if(CViewSample::classCViewSample.m_lpszClassName == m_currentViewClassName) TrackerSettings::Instance().glSampleWindowHeight = l; - else if (strcmp(CViewInstrument::classCViewInstrument.m_lpszClassName, m_szCurrentViewClassName) == 0) + else if(CViewInstrument::classCViewInstrument.m_lpszClassName == m_currentViewClassName) TrackerSettings::Instance().glInstrumentWindowHeight = l; - else if (strcmp(CViewComments::classCViewComments.m_lpszClassName, m_szCurrentViewClassName) == 0) + else if(CViewComments::classCViewComments.m_lpszClassName == m_currentViewClassName) TrackerSettings::Instance().glCommentsWindowHeight = l; } } @@ -390,24 +401,24 @@ } -const char *CChildFrame::GetCurrentViewClassName() const +bool CChildFrame::IsPatternView() const { - return m_szCurrentViewClassName; + return CViewPattern::classCViewPattern.m_lpszClassName == m_currentViewClassName; } void CChildFrame::SaveAllViewStates() { void *ptr = nullptr; - if(strcmp(CViewPattern::classCViewPattern.m_lpszClassName, m_szCurrentViewClassName) == 0) + if(CViewPattern::classCViewPattern.m_lpszClassName == m_currentViewClassName) ptr = &m_ViewPatterns; - else if(strcmp(CViewSample::classCViewSample.m_lpszClassName, m_szCurrentViewClassName) == 0) + else if(CViewSample::classCViewSample.m_lpszClassName == m_currentViewClassName) ptr = &m_ViewSamples; - else if(strcmp(CViewInstrument::classCViewInstrument.m_lpszClassName, m_szCurrentViewClassName) == 0) + else if(CViewInstrument::classCViewInstrument.m_lpszClassName == m_currentViewClassName) ptr = &m_ViewInstruments; - else if(strcmp(CViewGlobals::classCViewGlobals.m_lpszClassName, m_szCurrentViewClassName) == 0) + else if(CViewGlobals::classCViewGlobals.m_lpszClassName == m_currentViewClassName) ptr = &m_ViewGeneral; - else if(strcmp(CViewComments::classCViewComments.m_lpszClassName, m_szCurrentViewClassName) == 0) + else if(CViewComments::classCViewComments.m_lpszClassName == m_currentViewClassName) ptr = &m_ViewComments; ::SendMessage(m_hWndView, WM_MOD_VIEWMSG, VIEWMSG_SAVESTATE, reinterpret_cast<LPARAM>(ptr)); } @@ -440,63 +451,64 @@ void CChildFrame::DeserializeView(FileReader &file) { uint32 version, page; - if(file.ReadVarInt(version) && version < 2 && - file.ReadVarInt(page) && page >= 0 && static_cast<CModControlView::Page>(page) < CModControlView::Page::NumPages) - { - UINT pageDlg = 0; + if(!file.ReadVarInt(version) || version > 1) + return; + if(!file.ReadVarInt(page) || page >= static_cast<uint32>(CModControlView::Page::NumPages)) + return; + + UINT pageDlg = 0; + switch(static_cast<CModControlView::Page>(page)) + { + case CModControlView::Page::Globals: + pageDlg = IDD_CONTROL_GLOBALS; + break; + case CModControlView::Page::Patterns: + pageDlg = IDD_CONTROL_PATTERNS; + if(version == 0) + m_ViewPatterns.Deserialize(file); + break; + case CModControlView::Page::Samples: + pageDlg = IDD_CONTROL_SAMPLES; + if(version == 0) + m_ViewSamples.Deserialize(file); + break; + case CModControlView::Page::Instruments: + pageDlg = IDD_CONTROL_INSTRUMENTS; + if(version == 0) + m_ViewInstruments.Deserialize(file); + break; + case CModControlView::Page::Comments: + pageDlg = IDD_CONTROL_COMMENTS; + break; + case CModControlView::Page::Unknown: + case CModControlView::Page::NumPages: + break; + } + + // Version 1 extensions: Deserialize all views, not just current view + while(file.CanRead(3)) + { + uint32 size = 0; + file.ReadVarInt(page); + file.ReadVarInt(size); + FileReader chunk = file.ReadChunk(size); + if(page >= static_cast<uint32>(CModControlView::Page::NumPages) || !chunk.IsValid()) + continue; + switch(static_cast<CModControlView::Page>(page)) { - case CModControlView::Page::Globals: - pageDlg = IDD_CONTROL_GLOBALS; - break; - case CModControlView::Page::Patterns: - pageDlg = IDD_CONTROL_PATTERNS; - if(version == 0) - m_ViewPatterns.Deserialize(file); - break; - case CModControlView::Page::Samples: - pageDlg = IDD_CONTROL_SAMPLES; - if(version == 0) - m_ViewSamples.Deserialize(file); - break; - case CModControlView::Page::Instruments: - pageDlg = IDD_CONTROL_INSTRUMENTS; - if(version == 0) - m_ViewInstruments.Deserialize(file); - break; - case CModControlView::Page::Comments: - pageDlg = IDD_CONTROL_COMMENTS; - break; + case CModControlView::Page::Globals: m_ViewGeneral.Deserialize(chunk); break; + case CModControlView::Page::Patterns: m_ViewPatterns.Deserialize(chunk); break; + case CModControlView::Page::Samples: m_ViewSamples.Deserialize(chunk); break; + case CModControlView::Page::Instruments: m_ViewInstruments.Deserialize(chunk); break; + case CModControlView::Page::Comments: m_ViewComments.Deserialize(chunk); break; case CModControlView::Page::Unknown: case CModControlView::Page::NumPages: break; } - - // Version 1 extensions - while(file.CanRead(3)) - { - uint32 size = 0; - file.ReadVarInt(page); - file.ReadVarInt(size); - FileReader chunk = file.ReadChunk(size); - if(page >= 0 && static_cast<CModControlView::Page>(page) < CModControlView::Page::NumPages && chunk.IsValid()) - { - switch(static_cast<CModControlView::Page>(page)) - { - case CModControlView::Page::Globals: m_ViewGeneral.Deserialize(chunk); break; - case CModControlView::Page::Patterns: m_ViewPatterns.Deserialize(chunk); break; - case CModControlView::Page::Samples: m_ViewSamples.Deserialize(chunk); break; - case CModControlView::Page::Instruments: m_ViewInstruments.Deserialize(chunk); break; - case CModControlView::Page::Comments: m_ViewComments.Deserialize(chunk); break; - case CModControlView::Page::Unknown: - case CModControlView::Page::NumPages: - break; - } - } - } - - GetModControlView()->PostMessage(WM_MOD_ACTIVATEVIEW, pageDlg, LPARAM(-1)); } + + GetModControlView()->PostMessage(WM_MOD_ACTIVATEVIEW, pageDlg, LPARAM(-1)); } Modified: trunk/OpenMPT/mptrack/Childfrm.h ============================================================================== --- trunk/OpenMPT/mptrack/Childfrm.h Tue Dec 10 18:23:59 2024 (r22505) +++ trunk/OpenMPT/mptrack/Childfrm.h Tue Dec 10 18:34:12 2024 (r22506) @@ -99,23 +99,23 @@ // Attributes protected: CSplitterWnd m_wndSplitter; - HWND m_hWndCtrl, m_hWndView; + HWND m_hWndCtrl = nullptr, m_hWndView = nullptr; GeneralViewState m_ViewGeneral; PatternViewState m_ViewPatterns; SampleViewState m_ViewSamples; InstrumentViewState m_ViewInstruments; CommentsViewState m_ViewComments; - CHAR m_szCurrentViewClassName[256]; - bool m_bMaxWhenClosed; - bool m_bInitialActivation; + std::string m_currentViewClassName; + int m_dpi = 0; + bool m_maxWhenClosed = false; + bool m_initialActivation = true; // Operations public: - CModControlView *GetModControlView() const { return (CModControlView *)m_wndSplitter.GetPane(0, 0); } - BOOL ChangeViewClass(CRuntimeClass* pNewViewClass, CCreateContext* pContext=NULL); + CModControlView *GetModControlView() const { return reinterpret_cast<CModControlView *>(m_wndSplitter.GetPane(0, 0)); } + BOOL ChangeViewClass(CRuntimeClass *pNewViewClass, CCreateContext *pContext = nullptr); void ForceRefresh(); - void SavePosition(BOOL bExit=FALSE); - const char *GetCurrentViewClassName() const; + void SavePosition(bool exit = false); LRESULT SendCtrlMessage(UINT uMsg, LPARAM lParam = 0) const; LRESULT SendViewMessage(UINT uMsg, LPARAM lParam = 0) const; LRESULT ActivateView(UINT nId, LPARAM lParam); @@ -127,6 +127,8 @@ InstrumentViewState &GetInstrumentViewState() { return m_ViewInstruments; } CommentsViewState &GetCommentViewState() { return m_ViewComments; } + bool IsPatternView() const; + void SetSplitterHeight(int x); int GetSplitterHeight(); Modified: trunk/OpenMPT/mptrack/MainFrm.cpp ============================================================================== --- trunk/OpenMPT/mptrack/MainFrm.cpp Tue Dec 10 18:23:59 2024 (r22505) +++ trunk/OpenMPT/mptrack/MainFrm.cpp Tue Dec 10 18:34:12 2024 (r22506) @@ -459,7 +459,7 @@ BeginWaitCursor(); if (IsPlaying()) PauseMod(); - if (pMDIActive) pMDIActive->SavePosition(TRUE); + if (pMDIActive) pMDIActive->SavePosition(true); if(gpSoundDevice) { Modified: trunk/OpenMPT/mptrack/Moddoc.cpp ============================================================================== --- trunk/OpenMPT/mptrack/Moddoc.cpp Tue Dec 10 18:23:59 2024 (r22505) +++ trunk/OpenMPT/mptrack/Moddoc.cpp Tue Dec 10 18:34:12 2024 (r22506) @@ -2120,7 +2120,7 @@ if (pMainFrm) { CChildFrame *pChildFrm = GetChildFrame(); - if (strcmp("CViewPattern", pChildFrm->GetCurrentViewClassName()) == 0) + if(pChildFrm->IsPatternView()) { //User has sent play song command: set loop pattern checkbox to false. pChildFrm->SendViewMessage(VIEWMSG_PATTERNLOOP, 0); @@ -2221,7 +2221,7 @@ if (pMainFrm) { CChildFrame *pChildFrm = GetChildFrame(); - if (strcmp("CViewPattern", pChildFrm->GetCurrentViewClassName()) == 0) + if(pChildFrm->IsPatternView()) { //User has sent play song command: set loop pattern checkbox to false. pChildFrm->SendViewMessage(VIEWMSG_PATTERNLOOP, 0); @@ -2459,7 +2459,7 @@ { CChildFrame *pChildFrm = GetChildFrame(); - if(strcmp("CViewPattern", pChildFrm->GetCurrentViewClassName()) == 0) // dirty HACK + if(pChildFrm->IsPatternView()) { PatternViewState patternViewState; pChildFrm->SendViewMessage(VIEWMSG_SAVESTATE, (LPARAM)(&patternViewState)); @@ -2516,7 +2516,7 @@ if ((pMainFrm) && (pChildFrm)) { - if (strcmp("CViewPattern", pChildFrm->GetCurrentViewClassName()) == 0) + if(pChildFrm->IsPatternView()) { //User has sent play pattern command: set loop pattern checkbox to true. pChildFrm->SendViewMessage(VIEWMSG_PATTERNLOOP, loop ? 1 : 0); @@ -2572,7 +2572,7 @@ if ((pMainFrm) && (pChildFrm)) { - if (strcmp("CViewPattern", pChildFrm->GetCurrentViewClassName()) == 0) + if(pChildFrm->IsPatternView()) { //User has sent play pattern command: set loop pattern checkbox to true. pChildFrm->SendViewMessage(VIEWMSG_PATTERNLOOP, 1); @@ -2623,7 +2623,7 @@ if ((pMainFrm) && (pChildFrm)) { - if (strcmp("CViewPattern", pChildFrm->GetCurrentViewClassName()) == 0) + if(pChildFrm->IsPatternView()) { //User has sent play song command: set loop pattern checkbox to false. pChildFrm->SendViewMessage(VIEWMSG_PATTERNLOOP, 0); |
From: <sv...@op...> - 2024-12-10 17:24:10
|
Author: sagamusix Date: Tue Dec 10 18:23:59 2024 New Revision: 22505 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22505 Log: [Ref] Quick Start Dialog: Simplify DPI adjustment code. Modified: trunk/OpenMPT/mptrack/QuickStartDialog.cpp trunk/OpenMPT/mptrack/QuickStartDialog.h Modified: trunk/OpenMPT/mptrack/QuickStartDialog.cpp ============================================================================== --- trunk/OpenMPT/mptrack/QuickStartDialog.cpp Tue Dec 10 18:23:04 2024 (r22504) +++ trunk/OpenMPT/mptrack/QuickStartDialog.cpp Tue Dec 10 18:23:59 2024 (r22505) @@ -22,8 +22,6 @@ OPENMPT_NAMESPACE_BEGIN BEGIN_MESSAGE_MAP(QuickStartDlg, ResizableDialog) - ON_WM_SIZE() - ON_COMMAND(IDC_BUTTON1, &QuickStartDlg::OnNew) ON_COMMAND(IDC_BUTTON2, &QuickStartDlg::OnOpen) ON_COMMAND(ID_REMOVE, &QuickStartDlg::OnRemoveMRUItem) @@ -121,12 +119,15 @@ if(m_prevDPI) { - CRect windowRect{CPoint{}, m_prevSize}; + // We don't use this as a stand-alone dialog but rather embed it in the MDI child area, and it is not resized automatically. + CRect windowRect; + GetClientRect(windowRect); windowRect.right = Util::muldiv(windowRect.right, GetDPI(), m_prevDPI); windowRect.bottom = Util::muldiv(windowRect.bottom, GetDPI(), m_prevDPI); HighDPISupport::AdjustWindowRectEx(windowRect, GetStyle(), FALSE, GetExStyle(), GetDPI()); SetWindowPos(nullptr, 0, 0, windowRect.Width(), windowRect.Height(), SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOMOVE); } + m_prevDPI = GetDPI(); m_list.SetImageList(&CMainFrame::GetMainFrame()->m_PatternIcons, LVSIL_SMALL); m_list.SetColumnWidth(0, LVSCW_AUTOSIZE); @@ -195,14 +196,6 @@ } -void QuickStartDlg::OnSize(UINT nType, int cx, int cy) -{ - ResizableDialog::OnSize(nType, cx, cy); - m_prevSize.SetSize(cx, cy); - m_prevDPI = GetDPI(); -} - - void QuickStartDlg::OnNew() { theApp.NewDocument(); Modified: trunk/OpenMPT/mptrack/QuickStartDialog.h ============================================================================== --- trunk/OpenMPT/mptrack/QuickStartDialog.h Tue Dec 10 18:23:04 2024 (r22504) +++ trunk/OpenMPT/mptrack/QuickStartDialog.h Tue Dec 10 18:23:59 2024 (r22505) @@ -38,7 +38,6 @@ size_t GetItemIndex(int index) const { return static_cast<size_t>(m_list.GetItemData(index) & 0x00FF'FFFF); } int GetItemGroup(int index) const { return static_cast<int>(m_list.GetItemData(index) >> 24); } - afx_msg void OnSize(UINT nType, int cx, int cy); afx_msg void OnNew(); afx_msg void OnOpen(); afx_msg void OnRemoveMRUItem(); @@ -55,8 +54,7 @@ AccessibleButton m_newButton, m_openButton; CBitmap m_bmpNew, m_bmpOpen; std::array<std::vector<mpt::PathString>, 3> m_paths; - CSize m_prevSize; - int m_prevDPI = 96; + int m_prevDPI = 0; bool m_groupsEnabled = false; }; |
From: <sv...@op...> - 2024-12-10 17:23:14
|
Author: sagamusix Date: Tue Dec 10 18:23:04 2024 New Revision: 22504 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22504 Log: [Imp] Allow FileReader::ReadArray<type, size> to work with plain C arrays, like the other overload does. [Ref] Make use of this change in TCB loader. [Mod] TCB: Import default portamento values for old files. This is a pure guess, as the only file in old format that I have doesn't even use portamento. Modified: trunk/OpenMPT/soundlib/Load_tcb.cpp trunk/OpenMPT/src/mpt/io_read/filereader.hpp Modified: trunk/OpenMPT/soundlib/Load_tcb.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_tcb.cpp Tue Dec 10 11:14:19 2024 (r22503) +++ trunk/OpenMPT/soundlib/Load_tcb.cpp Tue Dec 10 18:23:04 2024 (r22504) @@ -92,8 +92,6 @@ const bool newFormat = fileHeader.IsNewFormat(); bool useAmigaFreqs = false; - std::array<char[8], 16> instrNames{}; - std::array<int16be, 16> specialValues{}; if(newFormat) { uint16 amigaFreqs = file.ReadUint16BE(); @@ -101,9 +99,17 @@ return false; useAmigaFreqs = amigaFreqs != 0; } - file.ReadStruct(instrNames); + const auto instrNames = file.ReadArray<char[8], 16>(); + std::array<int16be, 16> specialValues{}; if(newFormat) + { file.ReadStruct(specialValues); + } else + { + // A pure guess, the only old-format file I found doesn't even use these... + static constexpr std::array<int16, 16> defaultSpecialValues{0, 10, 30, 50, 70, 90, -10, -30, -50, -70, -90, 0, 0, 0, 0, 0}; + std::copy(defaultSpecialValues.begin(), defaultSpecialValues.end(), specialValues.begin()); + } m_nMinPeriod = useAmigaFreqs ? 113 * 4 : 92 * 4; m_nMaxPeriod = useAmigaFreqs ? 856 * 4 : 694 * 4; @@ -161,24 +167,24 @@ m_nSamples = 16; for(SAMPLEINDEX smp = 1; smp <= 16; smp++) { - ModSample &mptSample = Samples[smp]; - mptSample.Initialize(MOD_TYPE_MOD); - mptSample.nVolume = std::min(sampleHeaders1.ReadUint8(), uint8(127)) * 2; + ModSample &mptSmp = Samples[smp]; + mptSmp.Initialize(MOD_TYPE_MOD); + mptSmp.nVolume = std::min(sampleHeaders1.ReadUint8(), uint8(127)) * 2; sampleHeaders1.Skip(1); // Empty value according to docs - mptSample.nLoopStart = sampleHeaders1.ReadUint16BE(); + mptSmp.nLoopStart = sampleHeaders1.ReadUint16BE(); uint32 offset = sampleHeaders2.ReadUint32BE(); - mptSample.nLength = sampleHeaders2.ReadUint32BE(); - if(mptSample.nLoopStart && mptSample.nLoopStart < mptSample.nLength) + mptSmp.nLength = sampleHeaders2.ReadUint32BE(); + if(mptSmp.nLoopStart && mptSmp.nLoopStart < mptSmp.nLength) { - mptSample.nLoopEnd = mptSample.nLength; - mptSample.nLoopStart = mptSample.nLength - mptSample.nLoopStart; - mptSample.uFlags.set(CHN_LOOP); + mptSmp.nLoopEnd = mptSmp.nLength; + mptSmp.nLoopStart = mptSmp.nLength - mptSmp.nLoopStart; + mptSmp.uFlags.set(CHN_LOOP); } if(!useAmigaFreqs) - mptSample.nFineTune = 5 * 16; + mptSmp.nFineTune = 5 * 16; - if((loadFlags & loadSampleData) && file.Seek(sampleStart + offset)) - sampleIO.ReadSample(mptSample, file); + if((loadFlags & loadSampleData) && mptSmp.nLength > 1 && file.Seek(sampleStart + offset)) + sampleIO.ReadSample(mptSmp, file); m_szNames[smp] = mpt::String::ReadBuf(mpt::String::spacePadded, instrNames[smp - 1]); } Modified: trunk/OpenMPT/src/mpt/io_read/filereader.hpp ============================================================================== --- trunk/OpenMPT/src/mpt/io_read/filereader.hpp Tue Dec 10 11:14:19 2024 (r22503) +++ trunk/OpenMPT/src/mpt/io_read/filereader.hpp Tue Dec 10 18:23:04 2024 (r22504) @@ -267,7 +267,7 @@ bool ReadArray(TFileCursor & f, std::array<T, destSize> & destArray) { static_assert(mpt::is_binary_safe<T>::value); if (!f.CanRead(sizeof(destArray))) { - destArray.fill(T{}); + mpt::reset(destArray); return false; } f.ReadRaw(mpt::as_raw_memory(destArray)); |
Author: manx Date: Tue Dec 10 11:14:19 2024 New Revision: 22503 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22503 Log: [Imp] build: premake: mpg123: Set LINK_MPG123_DLL. Modified: trunk/OpenMPT/build/premake/ext-mpg123.lua trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj trunk/OpenMPT/build/vs2022win10/libopenmpt.vcxproj trunk/OpenMPT/build/vs2022win10/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj trunk/OpenMPT/build/vs2022win10clang/libopenmpt.vcxproj trunk/OpenMPT/build/vs2022win10clang/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2022win10uwp/libopenmpt.vcxproj trunk/OpenMPT/build/vs2022win10uwp/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win7/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2022win7/OpenMPT.vcxproj trunk/OpenMPT/build/vs2022win7/libopenmpt.vcxproj trunk/OpenMPT/build/vs2022win7/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2022win8/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win8/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2022win8/OpenMPT.vcxproj trunk/OpenMPT/build/vs2022win8/libopenmpt.vcxproj trunk/OpenMPT/build/vs2022win8/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2022win81/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win81/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2022win81/OpenMPT.vcxproj trunk/OpenMPT/build/vs2022win81/libopenmpt.vcxproj trunk/OpenMPT/build/vs2022win81/libopenmpt_test.vcxproj Modified: trunk/OpenMPT/build/premake/ext-mpg123.lua ============================================================================== --- trunk/OpenMPT/build/premake/ext-mpg123.lua Mon Dec 9 18:42:31 2024 (r22502) +++ trunk/OpenMPT/build/premake/ext-mpg123.lua Tue Dec 10 11:14:19 2024 (r22503) @@ -125,5 +125,7 @@ links { "mpg123", } + filter { "action:vs*" } + defines { "LINK_MPG123_DLL" } filter {} end Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj Mon Dec 9 18:42:31 2024 (r22502) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj Tue Dec 10 11:14:19 2024 (r22503) @@ -313,7 +313,7 @@ <PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeaderFile>PCH.h</PrecompiledHeaderFile> <WarningLevel>Level4</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SIGNALSMITH_STRETCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(PreprocessorDefinit ions)</PreprocessorDefinitions> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;LINK_MPG123_DLL;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SIGNALSMITH_STRETCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(Pre processorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include\SignalsmithStretch;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <ForcedIncludeFiles>PCH.h</ForcedIncludeFiles> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> @@ -326,7 +326,7 @@ <LanguageStandard>stdcpp17</LanguageStandard> </ClCompile> <ResourceCompile> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SIGNALSMITH_STRETCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_ARCHNAME=\"x86\"; %(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;LINK_MPG123_DLL;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SIGNALSMITH_STRETCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_A RCHNAME=\"x86\";%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include\SignalsmithStretch;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> @@ -348,7 +348,7 @@ <PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeaderFile>PCH.h</PrecompiledHeaderFile> <WarningLevel>Level4</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SIGNALSMITH_STRETCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(PreprocessorDefinit ions)</PreprocessorDefinitions> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;LINK_MPG123_DLL;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SIGNALSMITH_STRETCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(Pre processorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include\SignalsmithStretch;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <ForcedIncludeFiles>PCH.h</ForcedIncludeFiles> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> @@ -360,7 +360,7 @@ <LanguageStandard>stdcpp17</LanguageStandard> </ClCompile> <ResourceCompile> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SIGNALSMITH_STRETCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_ARCHNAME=\"amd64\ ";%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;LINK_MPG123_DLL;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SIGNALSMITH_STRETCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_A RCHNAME=\"amd64\";%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include\SignalsmithStretch;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> @@ -382,7 +382,7 @@ <PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeaderFile>PCH.h</PrecompiledHeaderFile> <WarningLevel>Level4</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SIGNALSMITH_STRETCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(PreprocessorDefinitions)</Preproce ssorDefinitions> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;LINK_MPG123_DLL;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SIGNALSMITH_STRETCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(PreprocessorDefini tions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include\SignalsmithStretch;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <ForcedIncludeFiles>PCH.h</ForcedIncludeFiles> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> @@ -398,7 +398,7 @@ <LanguageStandard>stdcpp17</LanguageStandard> </ClCompile> <ResourceCompile> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SIGNALSMITH_STRETCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_ARCHNAME=\"x86\";%(PreprocessorD efinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;LINK_MPG123_DLL;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SIGNALSMITH_STRETCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_ARCHNAME=\"x86\" ;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include\SignalsmithStretch;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> @@ -421,7 +421,7 @@ <PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeaderFile>PCH.h</PrecompiledHeaderFile> <WarningLevel>Level4</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SIGNALSMITH_STRETCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(PreprocessorDefinitions)</Preproce ssorDefinitions> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;LINK_MPG123_DLL;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SIGNALSMITH_STRETCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(PreprocessorDefini tions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include\SignalsmithStretch;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <ForcedIncludeFiles>PCH.h</ForcedIncludeFiles> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> @@ -436,7 +436,7 @@ <LanguageStandard>stdcpp17</LanguageStandard> </ClCompile> <ResourceCompile> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SIGNALSMITH_STRETCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_ARCHNAME=\"amd64\";%(Preprocesso rDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;LINK_MPG123_DLL;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SIGNALSMITH_STRETCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_ARCHNAME=\"amd64 \";%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include\SignalsmithStretch;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> @@ -459,7 +459,7 @@ <PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeaderFile>PCH.h</PrecompiledHeaderFile> <WarningLevel>Level4</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SIGNALSMITH_STRETCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(PreprocessorDefin itions)</PreprocessorDefinitions> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;LINK_MPG123_DLL;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SIGNALSMITH_STRETCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(P reprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include\SignalsmithStretch;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <ForcedIncludeFiles>PCH.h</ForcedIncludeFiles> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> @@ -476,7 +476,7 @@ <LanguageStandard>stdcpp17</LanguageStandard> </ClCompile> <ResourceCompile> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SIGNALSMITH_STRETCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_ARCHNAME=\"x86\ ";%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;LINK_MPG123_DLL;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SIGNALSMITH_STRETCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER _ARCHNAME=\"x86\";%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include\SignalsmithStretch;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> @@ -499,7 +499,7 @@ <PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeaderFile>PCH.h</PrecompiledHeaderFile> <WarningLevel>Level4</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SIGNALSMITH_STRETCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(PreprocessorDefin itions)</PreprocessorDefinitions> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;LINK_MPG123_DLL;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SIGNALSMITH_STRETCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(P reprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include\SignalsmithStretch;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <ForcedIncludeFiles>PCH.h</ForcedIncludeFiles> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> @@ -515,7 +515,7 @@ <LanguageStandard>stdcpp17</LanguageStandard> </ClCompile> <ResourceCompile> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SIGNALSMITH_STRETCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_ARCHNAME=\"amd6 4\";%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;LINK_MPG123_DLL;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SIGNALSMITH_STRETCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER _ARCHNAME=\"amd64\";%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include\SignalsmithStretch;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> @@ -538,7 +538,7 @@ <PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeaderFile>PCH.h</PrecompiledHeaderFile> <WarningLevel>Level4</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;ANCIENT_API_DECLSPEC_DLLIMPORT;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SIGNALSMITH_STRETCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;ZLIB_DLL;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UN ICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;ANCIENT_API_DECLSPEC_DLLIMPORT;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;LINK_MPG123_DLL;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SIGNALSMITH_STRETCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;ZLIB_DLL;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNO RE_WARNING_NO_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include\SignalsmithStretch;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <ForcedIncludeFiles>PCH.h</ForcedIncludeFiles> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> @@ -551,7 +551,7 @@ <LanguageStandard>stdcpp17</LanguageStandard> </ClCompile> <ResourceCompile> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;ANCIENT_API_DECLSPEC_DLLIMPORT;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SIGNALSMITH_STRETCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;ZLIB_DLL;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UN ICODE;VER_ARCHNAME=\"x86\";%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;ANCIENT_API_DECLSPEC_DLLIMPORT;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;LINK_MPG123_DLL;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SIGNALSMITH_STRETCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;ZLIB_DLL;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNO RE_WARNING_NO_UNICODE;VER_ARCHNAME=\"x86\";%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include\SignalsmithStretch;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> @@ -572,7 +572,7 @@ <PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeaderFile>PCH.h</PrecompiledHeaderFile> <WarningLevel>Level4</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;ANCIENT_API_DECLSPEC_DLLIMPORT;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SIGNALSMITH_STRETCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;ZLIB_DLL;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UN ICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;ANCIENT_API_DECLSPEC_DLLIMPORT;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;LINK_MPG123_DLL;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SIGNALSMITH_STRETCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;ZLIB_DLL;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNO RE_WARNING_NO_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include\SignalsmithStretch;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <ForcedIncludeFiles>PCH.h</ForcedIncludeFiles> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> @@ -584,7 +584,7 @@ <LanguageStandard>stdcpp17</LanguageStandard> </ClCompile> <ResourceCompile> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;ANCIENT_API_DECLSPEC_DLLIMPORT;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SIGNALSMITH_STRETCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;ZLIB_DLL;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UN ICODE;VER_ARCHNAME=\"amd64\";%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;ANCIENT_API_DECLSPEC_DLLIMPORT;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;LINK_MPG123_DLL;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SIGNALSMITH_STRETCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;ZLIB_DLL;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNO RE_WARNING_NO_UNICODE;VER_ARCHNAME=\"amd64\";%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include\SignalsmithStretch;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> @@ -605,7 +605,7 @@ <PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeaderFile>PCH.h</PrecompiledHeaderFile> <WarningLevel>Level4</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;ANCIENT_API_DECLSPEC_DLLIMPORT;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SIGNALSMITH_STRETCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;ZLIB_DLL;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(Preproc essorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;ANCIENT_API_DECLSPEC_DLLIMPORT;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;LINK_MPG123_DLL;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SIGNALSMITH_STRETCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;ZLIB_DLL;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_U NICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include\SignalsmithStretch;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <ForcedIncludeFiles>PCH.h</ForcedIncludeFiles> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> @@ -621,7 +621,7 @@ <LanguageStandard>stdcpp17</LanguageStandard> </ClCompile> <ResourceCompile> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;ANCIENT_API_DECLSPEC_DLLIMPORT;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SIGNALSMITH_STRETCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;ZLIB_DLL;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_ARCHN AME=\"x86\";%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;ANCIENT_API_DECLSPEC_DLLIMPORT;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;LINK_MPG123_DLL;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SIGNALSMITH_STRETCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;ZLIB_DLL;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_U NICODE;VER_ARCHNAME=\"x86\";%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include\SignalsmithStretch;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> @@ -644,7 +644,7 @@ <PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeaderFile>PCH.h</PrecompiledHeaderFile> <WarningLevel>Level4</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;ANCIENT_API_DECLSPEC_DLLIMPORT;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SIGNALSMITH_STRETCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;ZLIB_DLL;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(Preproc essorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;ANCIENT_API_DECLSPEC_DLLIMPORT;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;LINK_MPG123_DLL;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SIGNALSMITH_STRETCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;ZLIB_DLL;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_U NICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include\SignalsmithStretch;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <ForcedIncludeFiles>PCH.h</ForcedIncludeFiles> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> @@ -659,7 +659,7 @@ <LanguageStandard>stdcpp17</LanguageStandard> </ClCompile> <ResourceCompile> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;ANCIENT_API_DECLSPEC_DLLIMPORT;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SIGNALSMITH_STRETCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;ZLIB_DLL;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_ARCHN AME=\"amd64\";%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_W... [truncated message content] |
From: <sv...@op...> - 2024-12-09 17:42:43
|
Author: sagamusix Date: Mon Dec 9 18:42:31 2024 New Revision: 22502 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22502 Log: [Imp] TCB: Also validate order list. Modified: trunk/OpenMPT/soundlib/Load_tcb.cpp Modified: trunk/OpenMPT/soundlib/Load_tcb.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_tcb.cpp Mon Dec 9 14:52:14 2024 (r22501) +++ trunk/OpenMPT/soundlib/Load_tcb.cpp Mon Dec 9 18:42:31 2024 (r22502) @@ -36,6 +36,11 @@ return false; if(tempo > 15 || unused1 || lastOrder > 127 || unused2 || numPatterns > 128) return false; + for(uint8 ord : order) + { + if(ord >= 128) + return false; + } return true; } |
From: <sv...@op...> - 2024-12-09 13:52:26
|
Author: sagamusix Date: Mon Dec 9 14:52:14 2024 New Revision: 22501 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22501 Log: [Ref] Small cleanup. Modified: trunk/OpenMPT/soundlib/Load_tcb.cpp trunk/OpenMPT/soundlib/Sndmix.cpp Modified: trunk/OpenMPT/soundlib/Load_tcb.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_tcb.cpp Mon Dec 9 14:44:41 2024 (r22500) +++ trunk/OpenMPT/soundlib/Load_tcb.cpp Mon Dec 9 14:52:14 2024 (r22501) @@ -1,7 +1,7 @@ /* * Load_tcb.cpp * ------------ - * Purpose: TCB Tracker loader + * Purpose: TCB Tracker module loader * Notes : Based on the manual scan available at https://files.scene.org/view/resources/gotpapers/manuals/tcb_tracker_1.0_manual_1990.pdf * and a bit of messing about in TCB Tracker 1.0 and 1.1. * Authors: OpenMPT Devs @@ -135,10 +135,10 @@ case 0x0C: // Continue sample after interrupt m.SetVolumeCommand(VOLCMD_PLAYCONTROL, static_cast<ModCommand::VOL>(((specialValues[0x0B] == 2) ? 5 : 0) + ((instrEffect & 0x0F) - 0x0B))); break; - case 0x0D: + case 0x0D: // End Pattern m.SetEffectCommand(CMD_PATTERNBREAK, 0); break; - default: + default: // Pitch Bend if(int value = specialValues[(instrEffect & 0x0F)]; value > 0) m.SetEffectCommand(CMD_PORTAMENTODOWN, mpt::saturate_cast<ModCommand::PARAM>((value + 16) / 32)); else if(value < 0) Modified: trunk/OpenMPT/soundlib/Sndmix.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Sndmix.cpp Mon Dec 9 14:44:41 2024 (r22500) +++ trunk/OpenMPT/soundlib/Sndmix.cpp Mon Dec 9 14:52:14 2024 (r22501) @@ -2747,14 +2747,14 @@ { // Ramping required m_lHighResRampingGlobalVolume += step; - SoundBuffer[0] = Util::muldiv(SoundBuffer[0], m_lHighResRampingGlobalVolume, MAX_GLOBAL_VOLUME << VOLUMERAMPPRECISION); + SoundBuffer[0] = Util::muldiv(SoundBuffer[0], m_lHighResRampingGlobalVolume, MAX_GLOBAL_VOLUME << VOLUMERAMPPRECISION); if constexpr(isStereo) SoundBuffer[1] = Util::muldiv(SoundBuffer[1], m_lHighResRampingGlobalVolume, MAX_GLOBAL_VOLUME << VOLUMERAMPPRECISION); if constexpr(hasRear) RearBuffer[0] = Util::muldiv(RearBuffer[0] , m_lHighResRampingGlobalVolume, MAX_GLOBAL_VOLUME << VOLUMERAMPPRECISION); else MPT_UNUSED_VARIABLE(RearBuffer); if constexpr(hasRear) RearBuffer[1] = Util::muldiv(RearBuffer[1] , m_lHighResRampingGlobalVolume, MAX_GLOBAL_VOLUME << VOLUMERAMPPRECISION); else MPT_UNUSED_VARIABLE(RearBuffer); m_nSamplesToGlobalVolRampDest--; } else { - SoundBuffer[0] = Util::muldiv(SoundBuffer[0], m_nGlobalVolume, MAX_GLOBAL_VOLUME); + SoundBuffer[0] = Util::muldiv(SoundBuffer[0], m_nGlobalVolume, MAX_GLOBAL_VOLUME); if constexpr(isStereo) SoundBuffer[1] = Util::muldiv(SoundBuffer[1], m_nGlobalVolume, MAX_GLOBAL_VOLUME); if constexpr(hasRear) RearBuffer[0] = Util::muldiv(RearBuffer[0] , m_nGlobalVolume, MAX_GLOBAL_VOLUME); else MPT_UNUSED_VARIABLE(RearBuffer); if constexpr(hasRear) RearBuffer[1] = Util::muldiv(RearBuffer[1] , m_nGlobalVolume, MAX_GLOBAL_VOLUME); else MPT_UNUSED_VARIABLE(RearBuffer); |
From: <sv...@op...> - 2024-12-09 13:44:58
|
Author: sagamusix Date: Mon Dec 9 14:44:41 2024 New Revision: 22500 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22500 Log: [Imp] EffectInfo: Document new VOLCMD_PLAYCONTROL parameters. Modified: trunk/OpenMPT/mptrack/EffectInfo.cpp Modified: trunk/OpenMPT/mptrack/EffectInfo.cpp ============================================================================== --- trunk/OpenMPT/mptrack/EffectInfo.cpp Mon Dec 9 14:43:29 2024 (r22499) +++ trunk/OpenMPT/mptrack/EffectInfo.cpp Mon Dec 9 14:44:41 2024 (r22500) @@ -1112,12 +1112,18 @@ break; case VOLCMD_PLAYCONTROL: - if(m.vol == 0) - *s = _T("Pause Playback"); - else if(m.vol == 1) - *s = _T("Continue Playback"); + switch(m.vol) + { + case 0: *s = _T("Pause Playback"); break; + case 1: *s = _T("Continue Playback"); break; + case 2: *s = _T("Play Forward"); break; + case 3: *s = _T("Play Backward"); break; + case 4: *s = _T("Switch Play Direction"); break; + case 5: *s = _T("Store Offset"); break; + case 6: *s = _T("Play From Offset"); break; + default: *s = _T("unused"); break; + } break; - default: *s = volume; break; |
From: <sv...@op...> - 2024-12-09 13:43:44
|
Author: sagamusix Date: Mon Dec 9 14:43:29 2024 New Revision: 22499 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22499 Log: [Fix] All Play Control commands should only be executed on the first tick. Modified: trunk/OpenMPT/soundlib/ModChannel.cpp trunk/OpenMPT/soundlib/Snd_fx.cpp Modified: trunk/OpenMPT/soundlib/ModChannel.cpp ============================================================================== --- trunk/OpenMPT/soundlib/ModChannel.cpp Mon Dec 9 13:22:21 2024 (r22498) +++ trunk/OpenMPT/soundlib/ModChannel.cpp Mon Dec 9 14:43:29 2024 (r22499) @@ -263,8 +263,8 @@ case 2: dwFlags.set(CHN_PINGPONGFLAG, false); break; case 3: dwFlags.set(CHN_PINGPONGFLAG, true); break; case 4: dwFlags.flip(CHN_PINGPONGFLAG); break; - case 5: if(isFirstTick) oldOffset = position.GetUInt(); break; - case 6: if(isFirstTick) position.Set(oldOffset); break; + case 5: oldOffset = position.GetUInt(); break; + case 6: position.Set(oldOffset); break; } } Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Snd_fx.cpp Mon Dec 9 13:22:21 2024 (r22498) +++ trunk/OpenMPT/soundlib/Snd_fx.cpp Mon Dec 9 14:43:29 2024 (r22499) @@ -3310,7 +3310,8 @@ break; case VOLCMD_PLAYCONTROL: - chn.PlayControl(vol); + if(chn.isFirstTick) + chn.PlayControl(vol); break; default: |
From: <sv...@op...> - 2024-12-09 12:22:30
|
Author: manx Date: Mon Dec 9 13:22:21 2024 New Revision: 22498 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22498 Log: [Doc] libopenmpt: Update changelog. Modified: branches/OpenMPT-1.28/libopenmpt/dox/changelog.md Modified: branches/OpenMPT-1.28/libopenmpt/dox/changelog.md ============================================================================== --- branches/OpenMPT-1.28/libopenmpt/dox/changelog.md Mon Dec 9 13:22:13 2024 (r22497) +++ branches/OpenMPT-1.28/libopenmpt/dox/changelog.md Mon Dec 9 13:22:21 2024 (r22498) @@ -7,6 +7,8 @@ ### libopenmpt 0.4.48-pre + * mpg123: Update to v1.32.10-dev+r5461 (2024-12-09). + ### libopenmpt 0.4.47 (2024-12-01) * [**Bug**] Fixed various undefined behaviour found with ubsan. |
From: <sv...@op...> - 2024-12-09 12:22:25
|
Author: manx Date: Mon Dec 9 13:22:13 2024 New Revision: 22497 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22497 Log: [Doc] libopenmpt: Update changelog. Modified: branches/OpenMPT-1.29/libopenmpt/dox/changelog.md Modified: branches/OpenMPT-1.29/libopenmpt/dox/changelog.md ============================================================================== --- branches/OpenMPT-1.29/libopenmpt/dox/changelog.md Mon Dec 9 13:22:05 2024 (r22496) +++ branches/OpenMPT-1.29/libopenmpt/dox/changelog.md Mon Dec 9 13:22:13 2024 (r22497) @@ -7,6 +7,8 @@ ### libopenmpt 0.5.36-pre + * mpg123: Update to v1.32.10-dev+r5461 (2024-12-09). + ### libopenmpt 0.5.35 (2024-12-01) * [**Bug**] Fixed various undefined behaviour found with ubsan. |
From: <sv...@op...> - 2024-12-09 12:22:12
|
Author: manx Date: Mon Dec 9 13:22:05 2024 New Revision: 22496 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22496 Log: [Doc] libopenmpt: Update changelog. Modified: branches/OpenMPT-1.30/libopenmpt/dox/changelog.md Modified: branches/OpenMPT-1.30/libopenmpt/dox/changelog.md ============================================================================== --- branches/OpenMPT-1.30/libopenmpt/dox/changelog.md Mon Dec 9 13:21:13 2024 (r22495) +++ branches/OpenMPT-1.30/libopenmpt/dox/changelog.md Mon Dec 9 13:22:05 2024 (r22496) @@ -7,6 +7,8 @@ ### libopenmpt 0.6.22-pre + * mpg123: Update to v1.32.10-dev+r5461 (2024-12-09). + ### libopenmpt 0.6.21 (2024-12-01) * [**Bug**] Fixed various undefined behaviour found with ubsan. |
From: <sv...@op...> - 2024-12-09 12:21:25
|
Author: manx Date: Mon Dec 9 13:21:13 2024 New Revision: 22495 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22495 Log: [Doc] libopenmpt: Update changelog. Modified: branches/OpenMPT-1.31/doc/libopenmpt/changelog.md Modified: branches/OpenMPT-1.31/doc/libopenmpt/changelog.md ============================================================================== --- branches/OpenMPT-1.31/doc/libopenmpt/changelog.md Mon Dec 9 13:19:54 2024 (r22494) +++ branches/OpenMPT-1.31/doc/libopenmpt/changelog.md Mon Dec 9 13:21:13 2024 (r22495) @@ -7,6 +7,8 @@ ### libopenmpt 0.7.13-pre + * mpg123: Update to v1.32.10-dev+r5461 (2024-12-09). + ### libopenmpt 0.7.12 (2024-12-01) * [**Bug**] Fixed various undefined behaviour found with ubsan. |
From: <sv...@op...> - 2024-12-09 12:20:08
|
Author: manx Date: Mon Dec 9 13:19:54 2024 New Revision: 22494 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22494 Log: Merged revision(s) 22490 from trunk/OpenMPT: [Var] mpg123: Update to 1.32.10-dev+r5461 (2024-12-09). ........ Modified: branches/OpenMPT-1.28/ (props changed) branches/OpenMPT-1.28/include/mpg123/OpenMPT.txt branches/OpenMPT-1.28/include/mpg123/src/libmpg123/format.c branches/OpenMPT-1.28/include/mpg123/src/libmpg123/id3.c branches/OpenMPT-1.28/include/mpg123/src/libmpg123/mpg123lib_intern.h branches/OpenMPT-1.28/include/mpg123/src/libmpg123/optimize.c branches/OpenMPT-1.28/include/mpg123/src/version.h Modified: branches/OpenMPT-1.28/include/mpg123/OpenMPT.txt ============================================================================== --- branches/OpenMPT-1.28/include/mpg123/OpenMPT.txt Mon Dec 9 13:19:30 2024 (r22493) +++ branches/OpenMPT-1.28/include/mpg123/OpenMPT.txt Mon Dec 9 13:19:54 2024 (r22494) @@ -1,4 +1,4 @@ -libmpg123 library version 1.32.9 (2024-11-02). +libmpg123 library version 1.32.10-dev+r5461 (2024-12-09). The following changes have been made: * `ports/MSVC++/config.h` has been added for MSVC builds. * `ports/Xcode/config.h` has been retained from older versions. Modified: branches/OpenMPT-1.28/include/mpg123/src/libmpg123/format.c ============================================================================== --- branches/OpenMPT-1.28/include/mpg123/src/libmpg123/format.c Mon Dec 9 13:19:30 2024 (r22493) +++ branches/OpenMPT-1.28/include/mpg123/src/libmpg123/format.c Mon Dec 9 13:19:54 2024 (r22494) @@ -688,7 +688,7 @@ #include "../common/swap_bytes_impl.h" -void swap_endian(struct outbuffer *buf, int block) +static void swap_endian(struct outbuffer *buf, int block) { size_t count; Modified: branches/OpenMPT-1.28/include/mpg123/src/libmpg123/id3.c ============================================================================== --- branches/OpenMPT-1.28/include/mpg123/src/libmpg123/id3.c Mon Dec 9 13:19:30 2024 (r22493) +++ branches/OpenMPT-1.28/include/mpg123/src/libmpg123/id3.c Mon Dec 9 13:19:54 2024 (r22494) @@ -794,7 +794,7 @@ #endif /* NO_ID3V2 */ -int store_id3v2( mpg123_handle *fr +static int store_id3v2( mpg123_handle *fr , unsigned long first4bytes, unsigned char buf[6], unsigned long length ) { int ret = 1; Modified: branches/OpenMPT-1.28/include/mpg123/src/libmpg123/mpg123lib_intern.h ============================================================================== --- branches/OpenMPT-1.28/include/mpg123/src/libmpg123/mpg123lib_intern.h Mon Dec 9 13:19:30 2024 (r22493) +++ branches/OpenMPT-1.28/include/mpg123/src/libmpg123/mpg123lib_intern.h Mon Dec 9 13:19:54 2024 (r22494) @@ -21,7 +21,10 @@ // Only portable API plays a role in the library itself, outside of lfs_wrap.c. // Also, we need to ensure no suffix renaming for the primary implementations. -#define MPG123_PORTABLE_API +// But: The _definition_ of non-portable API needs to be present for those +// primary implementations being exported for DLL builds. Just the largefile +// renaming needs to be skipped! +#define MPG123_NO_LARGENAME #define MPG123_ENUM_API #include "mpg123.h" Modified: branches/OpenMPT-1.28/include/mpg123/src/libmpg123/optimize.c ============================================================================== --- branches/OpenMPT-1.28/include/mpg123/src/libmpg123/optimize.c Mon Dec 9 13:19:30 2024 (r22493) +++ branches/OpenMPT-1.28/include/mpg123/src/libmpg123/optimize.c Mon Dec 9 13:19:54 2024 (r22494) @@ -1027,7 +1027,7 @@ NULL }; -void check_decoders(void) +static void check_decoders(void) { #ifndef OPT_MULTI /* In non-multi mode, only the full list (one entry) is used. */ Modified: branches/OpenMPT-1.28/include/mpg123/src/version.h ============================================================================== --- branches/OpenMPT-1.28/include/mpg123/src/version.h Mon Dec 9 13:19:30 2024 (r22493) +++ branches/OpenMPT-1.28/include/mpg123/src/version.h Mon Dec 9 13:19:54 2024 (r22494) @@ -16,10 +16,10 @@ // only single spaces as separator to ease parsing by build scripts #define MPG123_MAJOR 1 #define MPG123_MINOR 32 -#define MPG123_PATCH 9 +#define MPG123_PATCH 10 // Don't get too wild with that to avoid confusing m4. No brackets. // Also, it should fit well into a sane file name for the tarball. -#define MPG123_SUFFIX "" +#define MPG123_SUFFIX "-dev" #define MPG123_VERSION_CAT_REALLY(a, b, c) #a "." #b "." #c #define MPG123_VERSION_CAT(a, b, c) MPG123_VERSION_CAT_REALLY(a, b, c) |
From: <sv...@op...> - 2024-12-09 12:19:41
|
Author: manx Date: Mon Dec 9 13:19:30 2024 New Revision: 22493 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22493 Log: Merged revision(s) 22490 from trunk/OpenMPT: [Var] mpg123: Update to 1.32.10-dev+r5461 (2024-12-09). ........ Modified: branches/OpenMPT-1.29/ (props changed) branches/OpenMPT-1.29/include/mpg123/OpenMPT.txt branches/OpenMPT-1.29/include/mpg123/src/libmpg123/format.c branches/OpenMPT-1.29/include/mpg123/src/libmpg123/id3.c branches/OpenMPT-1.29/include/mpg123/src/libmpg123/mpg123lib_intern.h branches/OpenMPT-1.29/include/mpg123/src/libmpg123/optimize.c branches/OpenMPT-1.29/include/mpg123/src/version.h Modified: branches/OpenMPT-1.29/include/mpg123/OpenMPT.txt ============================================================================== --- branches/OpenMPT-1.29/include/mpg123/OpenMPT.txt Mon Dec 9 13:18:44 2024 (r22492) +++ branches/OpenMPT-1.29/include/mpg123/OpenMPT.txt Mon Dec 9 13:19:30 2024 (r22493) @@ -1,4 +1,4 @@ -libmpg123 library version 1.32.9 (2024-11-02). +libmpg123 library version 1.32.10-dev+r5461 (2024-12-09). The following changes have been made: * `ports/makefile/config.h` has been added for plain `Makefile` builds. * `ports/MSVC++/config.h` has been added for MSVC builds. Modified: branches/OpenMPT-1.29/include/mpg123/src/libmpg123/format.c ============================================================================== --- branches/OpenMPT-1.29/include/mpg123/src/libmpg123/format.c Mon Dec 9 13:18:44 2024 (r22492) +++ branches/OpenMPT-1.29/include/mpg123/src/libmpg123/format.c Mon Dec 9 13:19:30 2024 (r22493) @@ -688,7 +688,7 @@ #include "../common/swap_bytes_impl.h" -void swap_endian(struct outbuffer *buf, int block) +static void swap_endian(struct outbuffer *buf, int block) { size_t count; Modified: branches/OpenMPT-1.29/include/mpg123/src/libmpg123/id3.c ============================================================================== --- branches/OpenMPT-1.29/include/mpg123/src/libmpg123/id3.c Mon Dec 9 13:18:44 2024 (r22492) +++ branches/OpenMPT-1.29/include/mpg123/src/libmpg123/id3.c Mon Dec 9 13:19:30 2024 (r22493) @@ -794,7 +794,7 @@ #endif /* NO_ID3V2 */ -int store_id3v2( mpg123_handle *fr +static int store_id3v2( mpg123_handle *fr , unsigned long first4bytes, unsigned char buf[6], unsigned long length ) { int ret = 1; Modified: branches/OpenMPT-1.29/include/mpg123/src/libmpg123/mpg123lib_intern.h ============================================================================== --- branches/OpenMPT-1.29/include/mpg123/src/libmpg123/mpg123lib_intern.h Mon Dec 9 13:18:44 2024 (r22492) +++ branches/OpenMPT-1.29/include/mpg123/src/libmpg123/mpg123lib_intern.h Mon Dec 9 13:19:30 2024 (r22493) @@ -21,7 +21,10 @@ // Only portable API plays a role in the library itself, outside of lfs_wrap.c. // Also, we need to ensure no suffix renaming for the primary implementations. -#define MPG123_PORTABLE_API +// But: The _definition_ of non-portable API needs to be present for those +// primary implementations being exported for DLL builds. Just the largefile +// renaming needs to be skipped! +#define MPG123_NO_LARGENAME #define MPG123_ENUM_API #include "mpg123.h" Modified: branches/OpenMPT-1.29/include/mpg123/src/libmpg123/optimize.c ============================================================================== --- branches/OpenMPT-1.29/include/mpg123/src/libmpg123/optimize.c Mon Dec 9 13:18:44 2024 (r22492) +++ branches/OpenMPT-1.29/include/mpg123/src/libmpg123/optimize.c Mon Dec 9 13:19:30 2024 (r22493) @@ -1027,7 +1027,7 @@ NULL }; -void check_decoders(void) +static void check_decoders(void) { #ifndef OPT_MULTI /* In non-multi mode, only the full list (one entry) is used. */ Modified: branches/OpenMPT-1.29/include/mpg123/src/version.h ============================================================================== --- branches/OpenMPT-1.29/include/mpg123/src/version.h Mon Dec 9 13:18:44 2024 (r22492) +++ branches/OpenMPT-1.29/include/mpg123/src/version.h Mon Dec 9 13:19:30 2024 (r22493) @@ -16,10 +16,10 @@ // only single spaces as separator to ease parsing by build scripts #define MPG123_MAJOR 1 #define MPG123_MINOR 32 -#define MPG123_PATCH 9 +#define MPG123_PATCH 10 // Don't get too wild with that to avoid confusing m4. No brackets. // Also, it should fit well into a sane file name for the tarball. -#define MPG123_SUFFIX "" +#define MPG123_SUFFIX "-dev" #define MPG123_VERSION_CAT_REALLY(a, b, c) #a "." #b "." #c #define MPG123_VERSION_CAT(a, b, c) MPG123_VERSION_CAT_REALLY(a, b, c) |
From: <sv...@op...> - 2024-12-09 12:18:59
|
Author: manx Date: Mon Dec 9 13:18:44 2024 New Revision: 22492 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22492 Log: Merged revision(s) 22490 from trunk/OpenMPT: [Var] mpg123: Update to 1.32.10-dev+r5461 (2024-12-09). ........ Modified: branches/OpenMPT-1.30/ (props changed) branches/OpenMPT-1.30/include/mpg123/OpenMPT.txt branches/OpenMPT-1.30/include/mpg123/src/libmpg123/format.c branches/OpenMPT-1.30/include/mpg123/src/libmpg123/id3.c branches/OpenMPT-1.30/include/mpg123/src/libmpg123/mpg123lib_intern.h branches/OpenMPT-1.30/include/mpg123/src/libmpg123/optimize.c branches/OpenMPT-1.30/include/mpg123/src/version.h Modified: branches/OpenMPT-1.30/include/mpg123/OpenMPT.txt ============================================================================== --- branches/OpenMPT-1.30/include/mpg123/OpenMPT.txt Mon Dec 9 13:18:17 2024 (r22491) +++ branches/OpenMPT-1.30/include/mpg123/OpenMPT.txt Mon Dec 9 13:18:44 2024 (r22492) @@ -1,4 +1,4 @@ -libmpg123 library version 1.32.9 (2024-11-02). +libmpg123 library version 1.32.10-dev+r5461 (2024-12-09). The following changes have been made: * `ports/makefile/config.h` has been added for plain `Makefile` builds. * `ports/MSVC++/config.h` has been added for MSVC builds. Modified: branches/OpenMPT-1.30/include/mpg123/src/libmpg123/format.c ============================================================================== --- branches/OpenMPT-1.30/include/mpg123/src/libmpg123/format.c Mon Dec 9 13:18:17 2024 (r22491) +++ branches/OpenMPT-1.30/include/mpg123/src/libmpg123/format.c Mon Dec 9 13:18:44 2024 (r22492) @@ -688,7 +688,7 @@ #include "../common/swap_bytes_impl.h" -void swap_endian(struct outbuffer *buf, int block) +static void swap_endian(struct outbuffer *buf, int block) { size_t count; Modified: branches/OpenMPT-1.30/include/mpg123/src/libmpg123/id3.c ============================================================================== --- branches/OpenMPT-1.30/include/mpg123/src/libmpg123/id3.c Mon Dec 9 13:18:17 2024 (r22491) +++ branches/OpenMPT-1.30/include/mpg123/src/libmpg123/id3.c Mon Dec 9 13:18:44 2024 (r22492) @@ -794,7 +794,7 @@ #endif /* NO_ID3V2 */ -int store_id3v2( mpg123_handle *fr +static int store_id3v2( mpg123_handle *fr , unsigned long first4bytes, unsigned char buf[6], unsigned long length ) { int ret = 1; Modified: branches/OpenMPT-1.30/include/mpg123/src/libmpg123/mpg123lib_intern.h ============================================================================== --- branches/OpenMPT-1.30/include/mpg123/src/libmpg123/mpg123lib_intern.h Mon Dec 9 13:18:17 2024 (r22491) +++ branches/OpenMPT-1.30/include/mpg123/src/libmpg123/mpg123lib_intern.h Mon Dec 9 13:18:44 2024 (r22492) @@ -21,7 +21,10 @@ // Only portable API plays a role in the library itself, outside of lfs_wrap.c. // Also, we need to ensure no suffix renaming for the primary implementations. -#define MPG123_PORTABLE_API +// But: The _definition_ of non-portable API needs to be present for those +// primary implementations being exported for DLL builds. Just the largefile +// renaming needs to be skipped! +#define MPG123_NO_LARGENAME #define MPG123_ENUM_API #include "mpg123.h" Modified: branches/OpenMPT-1.30/include/mpg123/src/libmpg123/optimize.c ============================================================================== --- branches/OpenMPT-1.30/include/mpg123/src/libmpg123/optimize.c Mon Dec 9 13:18:17 2024 (r22491) +++ branches/OpenMPT-1.30/include/mpg123/src/libmpg123/optimize.c Mon Dec 9 13:18:44 2024 (r22492) @@ -1027,7 +1027,7 @@ NULL }; -void check_decoders(void) +static void check_decoders(void) { #ifndef OPT_MULTI /* In non-multi mode, only the full list (one entry) is used. */ Modified: branches/OpenMPT-1.30/include/mpg123/src/version.h ============================================================================== --- branches/OpenMPT-1.30/include/mpg123/src/version.h Mon Dec 9 13:18:17 2024 (r22491) +++ branches/OpenMPT-1.30/include/mpg123/src/version.h Mon Dec 9 13:18:44 2024 (r22492) @@ -16,10 +16,10 @@ // only single spaces as separator to ease parsing by build scripts #define MPG123_MAJOR 1 #define MPG123_MINOR 32 -#define MPG123_PATCH 9 +#define MPG123_PATCH 10 // Don't get too wild with that to avoid confusing m4. No brackets. // Also, it should fit well into a sane file name for the tarball. -#define MPG123_SUFFIX "" +#define MPG123_SUFFIX "-dev" #define MPG123_VERSION_CAT_REALLY(a, b, c) #a "." #b "." #c #define MPG123_VERSION_CAT(a, b, c) MPG123_VERSION_CAT_REALLY(a, b, c) |
From: <sv...@op...> - 2024-12-09 12:18:30
|
Author: manx Date: Mon Dec 9 13:18:17 2024 New Revision: 22491 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22491 Log: Merged revision(s) 22490 from trunk/OpenMPT: [Var] mpg123: Update to 1.32.10-dev+r5461 (2024-12-09). ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/include/mpg123/OpenMPT.txt branches/OpenMPT-1.31/include/mpg123/src/libmpg123/format.c branches/OpenMPT-1.31/include/mpg123/src/libmpg123/id3.c branches/OpenMPT-1.31/include/mpg123/src/libmpg123/mpg123lib_intern.h branches/OpenMPT-1.31/include/mpg123/src/libmpg123/optimize.c branches/OpenMPT-1.31/include/mpg123/src/version.h Modified: branches/OpenMPT-1.31/include/mpg123/OpenMPT.txt ============================================================================== --- branches/OpenMPT-1.31/include/mpg123/OpenMPT.txt Mon Dec 9 13:17:40 2024 (r22490) +++ branches/OpenMPT-1.31/include/mpg123/OpenMPT.txt Mon Dec 9 13:18:17 2024 (r22491) @@ -1,4 +1,4 @@ -libmpg123 library version 1.32.9 (2024-11-02). +libmpg123 library version 1.32.10-dev+r5461 (2024-12-09). The following changes have been made: * `ports/makefile/config.h` has been added for plain `Makefile` builds. * `ports/MSVC++/config.h` has been added for MSVC builds. Modified: branches/OpenMPT-1.31/include/mpg123/src/libmpg123/format.c ============================================================================== --- branches/OpenMPT-1.31/include/mpg123/src/libmpg123/format.c Mon Dec 9 13:17:40 2024 (r22490) +++ branches/OpenMPT-1.31/include/mpg123/src/libmpg123/format.c Mon Dec 9 13:18:17 2024 (r22491) @@ -688,7 +688,7 @@ #include "../common/swap_bytes_impl.h" -void swap_endian(struct outbuffer *buf, int block) +static void swap_endian(struct outbuffer *buf, int block) { size_t count; Modified: branches/OpenMPT-1.31/include/mpg123/src/libmpg123/id3.c ============================================================================== --- branches/OpenMPT-1.31/include/mpg123/src/libmpg123/id3.c Mon Dec 9 13:17:40 2024 (r22490) +++ branches/OpenMPT-1.31/include/mpg123/src/libmpg123/id3.c Mon Dec 9 13:18:17 2024 (r22491) @@ -794,7 +794,7 @@ #endif /* NO_ID3V2 */ -int store_id3v2( mpg123_handle *fr +static int store_id3v2( mpg123_handle *fr , unsigned long first4bytes, unsigned char buf[6], unsigned long length ) { int ret = 1; Modified: branches/OpenMPT-1.31/include/mpg123/src/libmpg123/mpg123lib_intern.h ============================================================================== --- branches/OpenMPT-1.31/include/mpg123/src/libmpg123/mpg123lib_intern.h Mon Dec 9 13:17:40 2024 (r22490) +++ branches/OpenMPT-1.31/include/mpg123/src/libmpg123/mpg123lib_intern.h Mon Dec 9 13:18:17 2024 (r22491) @@ -21,7 +21,10 @@ // Only portable API plays a role in the library itself, outside of lfs_wrap.c. // Also, we need to ensure no suffix renaming for the primary implementations. -#define MPG123_PORTABLE_API +// But: The _definition_ of non-portable API needs to be present for those +// primary implementations being exported for DLL builds. Just the largefile +// renaming needs to be skipped! +#define MPG123_NO_LARGENAME #define MPG123_ENUM_API #include "mpg123.h" Modified: branches/OpenMPT-1.31/include/mpg123/src/libmpg123/optimize.c ============================================================================== --- branches/OpenMPT-1.31/include/mpg123/src/libmpg123/optimize.c Mon Dec 9 13:17:40 2024 (r22490) +++ branches/OpenMPT-1.31/include/mpg123/src/libmpg123/optimize.c Mon Dec 9 13:18:17 2024 (r22491) @@ -1027,7 +1027,7 @@ NULL }; -void check_decoders(void) +static void check_decoders(void) { #ifndef OPT_MULTI /* In non-multi mode, only the full list (one entry) is used. */ Modified: branches/OpenMPT-1.31/include/mpg123/src/version.h ============================================================================== --- branches/OpenMPT-1.31/include/mpg123/src/version.h Mon Dec 9 13:17:40 2024 (r22490) +++ branches/OpenMPT-1.31/include/mpg123/src/version.h Mon Dec 9 13:18:17 2024 (r22491) @@ -16,10 +16,10 @@ // only single spaces as separator to ease parsing by build scripts #define MPG123_MAJOR 1 #define MPG123_MINOR 32 -#define MPG123_PATCH 9 +#define MPG123_PATCH 10 // Don't get too wild with that to avoid confusing m4. No brackets. // Also, it should fit well into a sane file name for the tarball. -#define MPG123_SUFFIX "" +#define MPG123_SUFFIX "-dev" #define MPG123_VERSION_CAT_REALLY(a, b, c) #a "." #b "." #c #define MPG123_VERSION_CAT(a, b, c) MPG123_VERSION_CAT_REALLY(a, b, c) |
From: <sv...@op...> - 2024-12-09 12:17:47
|
Author: manx Date: Mon Dec 9 13:17:40 2024 New Revision: 22490 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22490 Log: [Var] mpg123: Update to 1.32.10-dev+r5461 (2024-12-09). Modified: trunk/OpenMPT/include/mpg123/OpenMPT.txt trunk/OpenMPT/include/mpg123/src/libmpg123/format.c trunk/OpenMPT/include/mpg123/src/libmpg123/id3.c trunk/OpenMPT/include/mpg123/src/libmpg123/mpg123lib_intern.h trunk/OpenMPT/include/mpg123/src/libmpg123/optimize.c trunk/OpenMPT/include/mpg123/src/version.h Modified: trunk/OpenMPT/include/mpg123/OpenMPT.txt ============================================================================== --- trunk/OpenMPT/include/mpg123/OpenMPT.txt Mon Dec 9 09:20:01 2024 (r22489) +++ trunk/OpenMPT/include/mpg123/OpenMPT.txt Mon Dec 9 13:17:40 2024 (r22490) @@ -1,4 +1,4 @@ -libmpg123 library version 1.32.9 (2024-11-02). +libmpg123 library version 1.32.10-dev+r5461 (2024-12-09). The following changes have been made: * `ports/makefile/config.h` has been added for plain `Makefile` builds. * `ports/MSVC++/config.h` has been added for MSVC builds. Modified: trunk/OpenMPT/include/mpg123/src/libmpg123/format.c ============================================================================== --- trunk/OpenMPT/include/mpg123/src/libmpg123/format.c Mon Dec 9 09:20:01 2024 (r22489) +++ trunk/OpenMPT/include/mpg123/src/libmpg123/format.c Mon Dec 9 13:17:40 2024 (r22490) @@ -688,7 +688,7 @@ #include "../common/swap_bytes_impl.h" -void swap_endian(struct outbuffer *buf, int block) +static void swap_endian(struct outbuffer *buf, int block) { size_t count; Modified: trunk/OpenMPT/include/mpg123/src/libmpg123/id3.c ============================================================================== --- trunk/OpenMPT/include/mpg123/src/libmpg123/id3.c Mon Dec 9 09:20:01 2024 (r22489) +++ trunk/OpenMPT/include/mpg123/src/libmpg123/id3.c Mon Dec 9 13:17:40 2024 (r22490) @@ -794,7 +794,7 @@ #endif /* NO_ID3V2 */ -int store_id3v2( mpg123_handle *fr +static int store_id3v2( mpg123_handle *fr , unsigned long first4bytes, unsigned char buf[6], unsigned long length ) { int ret = 1; Modified: trunk/OpenMPT/include/mpg123/src/libmpg123/mpg123lib_intern.h ============================================================================== --- trunk/OpenMPT/include/mpg123/src/libmpg123/mpg123lib_intern.h Mon Dec 9 09:20:01 2024 (r22489) +++ trunk/OpenMPT/include/mpg123/src/libmpg123/mpg123lib_intern.h Mon Dec 9 13:17:40 2024 (r22490) @@ -21,7 +21,10 @@ // Only portable API plays a role in the library itself, outside of lfs_wrap.c. // Also, we need to ensure no suffix renaming for the primary implementations. -#define MPG123_PORTABLE_API +// But: The _definition_ of non-portable API needs to be present for those +// primary implementations being exported for DLL builds. Just the largefile +// renaming needs to be skipped! +#define MPG123_NO_LARGENAME #define MPG123_ENUM_API #include "mpg123.h" Modified: trunk/OpenMPT/include/mpg123/src/libmpg123/optimize.c ============================================================================== --- trunk/OpenMPT/include/mpg123/src/libmpg123/optimize.c Mon Dec 9 09:20:01 2024 (r22489) +++ trunk/OpenMPT/include/mpg123/src/libmpg123/optimize.c Mon Dec 9 13:17:40 2024 (r22490) @@ -1027,7 +1027,7 @@ NULL }; -void check_decoders(void) +static void check_decoders(void) { #ifndef OPT_MULTI /* In non-multi mode, only the full list (one entry) is used. */ Modified: trunk/OpenMPT/include/mpg123/src/version.h ============================================================================== --- trunk/OpenMPT/include/mpg123/src/version.h Mon Dec 9 09:20:01 2024 (r22489) +++ trunk/OpenMPT/include/mpg123/src/version.h Mon Dec 9 13:17:40 2024 (r22490) @@ -16,10 +16,10 @@ // only single spaces as separator to ease parsing by build scripts #define MPG123_MAJOR 1 #define MPG123_MINOR 32 -#define MPG123_PATCH 9 +#define MPG123_PATCH 10 // Don't get too wild with that to avoid confusing m4. No brackets. // Also, it should fit well into a sane file name for the tarball. -#define MPG123_SUFFIX "" +#define MPG123_SUFFIX "-dev" #define MPG123_VERSION_CAT_REALLY(a, b, c) #a "." #b "." #c #define MPG123_VERSION_CAT(a, b, c) MPG123_VERSION_CAT_REALLY(a, b, c) |
From: <sv...@op...> - 2024-12-09 08:20:13
|
Author: sagamusix Date: Mon Dec 9 09:20:01 2024 New Revision: 22489 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22489 Log: [Ref] Silence warning. Modified: trunk/OpenMPT/soundlib/Load_tcb.cpp Modified: trunk/OpenMPT/soundlib/Load_tcb.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_tcb.cpp Sun Dec 8 19:50:57 2024 (r22488) +++ trunk/OpenMPT/soundlib/Load_tcb.cpp Mon Dec 9 09:20:01 2024 (r22489) @@ -133,7 +133,7 @@ break; case 0x0B: // Interrupt sample case 0x0C: // Continue sample after interrupt - m.SetVolumeCommand(VOLCMD_PLAYCONTROL, ((specialValues[0x0B] == 2) ? 5 : 0) + ((instrEffect & 0x0F) - 0x0B)); + m.SetVolumeCommand(VOLCMD_PLAYCONTROL, static_cast<ModCommand::VOL>(((specialValues[0x0B] == 2) ? 5 : 0) + ((instrEffect & 0x0F) - 0x0B))); break; case 0x0D: m.SetEffectCommand(CMD_PATTERNBREAK, 0); |
From: <sv...@op...> - 2024-12-08 18:51:10
|
Author: sagamusix Date: Sun Dec 8 19:50:57 2024 New Revision: 22488 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22488 Log: [Fix] Add missing file changes. Modified: trunk/OpenMPT/build/android_ndk/Android.mk trunk/OpenMPT/build/autotools/Makefile.am Modified: trunk/OpenMPT/build/android_ndk/Android.mk ============================================================================== --- trunk/OpenMPT/build/android_ndk/Android.mk Sun Dec 8 19:21:53 2024 (r22487) +++ trunk/OpenMPT/build/android_ndk/Android.mk Sun Dec 8 19:50:57 2024 (r22488) @@ -197,6 +197,7 @@ soundlib/Load_stm.cpp \ soundlib/Load_stp.cpp \ soundlib/Load_symmod.cpp \ + soundlib/Load_tcb.cpp \ soundlib/Load_uax.cpp \ soundlib/Load_ult.cpp \ soundlib/Load_unic.cpp \ Modified: trunk/OpenMPT/build/autotools/Makefile.am ============================================================================== --- trunk/OpenMPT/build/autotools/Makefile.am Sun Dec 8 19:21:53 2024 (r22487) +++ trunk/OpenMPT/build/autotools/Makefile.am Sun Dec 8 19:50:57 2024 (r22488) @@ -437,6 +437,7 @@ MPT_FILES_SOUNDLIB += soundlib/Load_stm.cpp MPT_FILES_SOUNDLIB += soundlib/Load_stp.cpp MPT_FILES_SOUNDLIB += soundlib/Load_symmod.cpp +MPT_FILES_SOUNDLIB += soundlib/Load_tcb.cpp MPT_FILES_SOUNDLIB += soundlib/Load_uax.cpp MPT_FILES_SOUNDLIB += soundlib/Load_ult.cpp MPT_FILES_SOUNDLIB += soundlib/Load_unic.cpp |
From: <sv...@op...> - 2024-12-08 18:22:08
|
Author: sagamusix Date: Sun Dec 8 19:21:53 2024 New Revision: 22487 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22487 Log: [New] Can now read MOD files from TCB Tracker (https://bugs.openmpt.org/view.php?id=1845). [Mod] OpenMPT: Version is now 1.32.00.36 Added: trunk/OpenMPT/soundlib/Load_tcb.cpp (contents, props changed) Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2022win10/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2022win10/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2022win10/libopenmpt.vcxproj trunk/OpenMPT/build/vs2022win10/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2022win10/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2022win10/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2022win10clang/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/libopenmpt.vcxproj trunk/OpenMPT/build/vs2022win10clang/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2022win10clang/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2022win10uwp/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2022win10uwp/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2022win10uwp/libopenmpt.vcxproj trunk/OpenMPT/build/vs2022win10uwp/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2022win10uwp/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2022win10uwp/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2022win7/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2022win7/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2022win7/OpenMPT.vcxproj trunk/OpenMPT/build/vs2022win7/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2022win7/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2022win7/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2022win7/libopenmpt.vcxproj trunk/OpenMPT/build/vs2022win7/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2022win7/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2022win7/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2022win8/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win8/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2022win8/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2022win8/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2022win8/OpenMPT.vcxproj trunk/OpenMPT/build/vs2022win8/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2022win8/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2022win8/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2022win8/libopenmpt.vcxproj trunk/OpenMPT/build/vs2022win8/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2022win8/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2022win8/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2022win81/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win81/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2022win81/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2022win81/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2022win81/OpenMPT.vcxproj trunk/OpenMPT/build/vs2022win81/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2022win81/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2022win81/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2022win81/libopenmpt.vcxproj trunk/OpenMPT/build/vs2022win81/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2022win81/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2022win81/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/xcode-ios/libopenmpt.xcodeproj/project.pbxproj trunk/OpenMPT/build/xcode-macosx/libopenmpt.xcodeproj/project.pbxproj trunk/OpenMPT/common/versionNumber.h trunk/OpenMPT/contrib/fuzzing/all_formats.dict trunk/OpenMPT/soundlib/Load_kris.cpp trunk/OpenMPT/soundlib/ModChannel.cpp trunk/OpenMPT/soundlib/Sndfile.cpp trunk/OpenMPT/soundlib/Sndfile.h trunk/OpenMPT/soundlib/Tables.cpp Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj Sun Dec 8 19:21:53 2024 (r22487) @@ -1408,6 +1408,7 @@ <ClCompile Include="..\..\soundlib\Load_stm.cpp" /> <ClCompile Include="..\..\soundlib\Load_stp.cpp" /> <ClCompile Include="..\..\soundlib\Load_symmod.cpp" /> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp" /> <ClCompile Include="..\..\soundlib\Load_uax.cpp" /> <ClCompile Include="..\..\soundlib\Load_ult.cpp" /> <ClCompile Include="..\..\soundlib\Load_unic.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters Sun Dec 8 19:21:53 2024 (r22487) @@ -2183,6 +2183,9 @@ <ClCompile Include="..\..\soundlib\Load_symmod.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_uax.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj Sun Dec 8 19:21:53 2024 (r22487) @@ -1408,6 +1408,7 @@ <ClCompile Include="..\..\soundlib\Load_stm.cpp" /> <ClCompile Include="..\..\soundlib\Load_stp.cpp" /> <ClCompile Include="..\..\soundlib\Load_symmod.cpp" /> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp" /> <ClCompile Include="..\..\soundlib\Load_uax.cpp" /> <ClCompile Include="..\..\soundlib\Load_ult.cpp" /> <ClCompile Include="..\..\soundlib\Load_unic.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters Sun Dec 8 19:21:53 2024 (r22487) @@ -2183,6 +2183,9 @@ <ClCompile Include="..\..\soundlib\Load_symmod.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_uax.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj Sun Dec 8 19:21:53 2024 (r22487) @@ -1408,6 +1408,7 @@ <ClCompile Include="..\..\soundlib\Load_stm.cpp" /> <ClCompile Include="..\..\soundlib\Load_stp.cpp" /> <ClCompile Include="..\..\soundlib\Load_symmod.cpp" /> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp" /> <ClCompile Include="..\..\soundlib\Load_uax.cpp" /> <ClCompile Include="..\..\soundlib\Load_ult.cpp" /> <ClCompile Include="..\..\soundlib\Load_unic.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters Sun Dec 8 19:21:53 2024 (r22487) @@ -2183,6 +2183,9 @@ <ClCompile Include="..\..\soundlib\Load_symmod.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_uax.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj Sun Dec 8 19:21:53 2024 (r22487) @@ -1032,6 +1032,7 @@ <ClCompile Include="..\..\soundlib\Load_stm.cpp" /> <ClCompile Include="..\..\soundlib\Load_stp.cpp" /> <ClCompile Include="..\..\soundlib\Load_symmod.cpp" /> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp" /> <ClCompile Include="..\..\soundlib\Load_uax.cpp" /> <ClCompile Include="..\..\soundlib\Load_ult.cpp" /> <ClCompile Include="..\..\soundlib\Load_unic.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj.filters Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj.filters Sun Dec 8 19:21:53 2024 (r22487) @@ -1331,6 +1331,9 @@ <ClCompile Include="..\..\soundlib\Load_symmod.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_uax.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj Sun Dec 8 19:21:53 2024 (r22487) @@ -1032,6 +1032,7 @@ <ClCompile Include="..\..\soundlib\Load_stm.cpp" /> <ClCompile Include="..\..\soundlib\Load_stp.cpp" /> <ClCompile Include="..\..\soundlib\Load_symmod.cpp" /> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp" /> <ClCompile Include="..\..\soundlib\Load_uax.cpp" /> <ClCompile Include="..\..\soundlib\Load_ult.cpp" /> <ClCompile Include="..\..\soundlib\Load_unic.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj.filters Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj.filters Sun Dec 8 19:21:53 2024 (r22487) @@ -1331,6 +1331,9 @@ <ClCompile Include="..\..\soundlib\Load_symmod.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_uax.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj Sun Dec 8 19:21:53 2024 (r22487) @@ -1074,6 +1074,7 @@ <ClCompile Include="..\..\soundlib\Load_stm.cpp" /> <ClCompile Include="..\..\soundlib\Load_stp.cpp" /> <ClCompile Include="..\..\soundlib\Load_symmod.cpp" /> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp" /> <ClCompile Include="..\..\soundlib\Load_uax.cpp" /> <ClCompile Include="..\..\soundlib\Load_ult.cpp" /> <ClCompile Include="..\..\soundlib\Load_unic.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj.filters Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj.filters Sun Dec 8 19:21:53 2024 (r22487) @@ -1385,6 +1385,9 @@ <ClCompile Include="..\..\soundlib\Load_symmod.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_uax.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj Sun Dec 8 19:21:53 2024 (r22487) @@ -1408,6 +1408,7 @@ <ClCompile Include="..\..\soundlib\Load_stm.cpp" /> <ClCompile Include="..\..\soundlib\Load_stp.cpp" /> <ClCompile Include="..\..\soundlib\Load_symmod.cpp" /> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp" /> <ClCompile Include="..\..\soundlib\Load_uax.cpp" /> <ClCompile Include="..\..\soundlib\Load_ult.cpp" /> <ClCompile Include="..\..\soundlib\Load_unic.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters Sun Dec 8 19:21:53 2024 (r22487) @@ -2183,6 +2183,9 @@ <ClCompile Include="..\..\soundlib\Load_symmod.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_uax.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj Sun Dec 8 19:21:53 2024 (r22487) @@ -1408,6 +1408,7 @@ <ClCompile Include="..\..\soundlib\Load_stm.cpp" /> <ClCompile Include="..\..\soundlib\Load_stp.cpp" /> <ClCompile Include="..\..\soundlib\Load_symmod.cpp" /> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp" /> <ClCompile Include="..\..\soundlib\Load_uax.cpp" /> <ClCompile Include="..\..\soundlib\Load_ult.cpp" /> <ClCompile Include="..\..\soundlib\Load_unic.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters Sun Dec 8 19:21:53 2024 (r22487) @@ -2183,6 +2183,9 @@ <ClCompile Include="..\..\soundlib\Load_symmod.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_uax.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj Sun Dec 8 19:21:53 2024 (r22487) @@ -1408,6 +1408,7 @@ <ClCompile Include="..\..\soundlib\Load_stm.cpp" /> <ClCompile Include="..\..\soundlib\Load_stp.cpp" /> <ClCompile Include="..\..\soundlib\Load_symmod.cpp" /> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp" /> <ClCompile Include="..\..\soundlib\Load_uax.cpp" /> <ClCompile Include="..\..\soundlib\Load_ult.cpp" /> <ClCompile Include="..\..\soundlib\Load_unic.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters Sun Dec 8 19:21:53 2024 (r22487) @@ -2183,6 +2183,9 @@ <ClCompile Include="..\..\soundlib\Load_symmod.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_uax.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj Sun Dec 8 19:21:53 2024 (r22487) @@ -1032,6 +1032,7 @@ <ClCompile Include="..\..\soundlib\Load_stm.cpp" /> <ClCompile Include="..\..\soundlib\Load_stp.cpp" /> <ClCompile Include="..\..\soundlib\Load_symmod.cpp" /> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp" /> <ClCompile Include="..\..\soundlib\Load_uax.cpp" /> <ClCompile Include="..\..\soundlib\Load_ult.cpp" /> <ClCompile Include="..\..\soundlib\Load_unic.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj.filters Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj.filters Sun Dec 8 19:21:53 2024 (r22487) @@ -1331,6 +1331,9 @@ <ClCompile Include="..\..\soundlib\Load_symmod.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_uax.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj Sun Dec 8 19:21:53 2024 (r22487) @@ -1032,6 +1032,7 @@ <ClCompile Include="..\..\soundlib\Load_stm.cpp" /> <ClCompile Include="..\..\soundlib\Load_stp.cpp" /> <ClCompile Include="..\..\soundlib\Load_symmod.cpp" /> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp" /> <ClCompile Include="..\..\soundlib\Load_uax.cpp" /> <ClCompile Include="..\..\soundlib\Load_ult.cpp" /> <ClCompile Include="..\..\soundlib\Load_unic.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj.filters Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj.filters Sun Dec 8 19:21:53 2024 (r22487) @@ -1331,6 +1331,9 @@ <ClCompile Include="..\..\soundlib\Load_symmod.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_uax.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj Sun Dec 8 19:21:53 2024 (r22487) @@ -1074,6 +1074,7 @@ <ClCompile Include="..\..\soundlib\Load_stm.cpp" /> <ClCompile Include="..\..\soundlib\Load_stp.cpp" /> <ClCompile Include="..\..\soundlib\Load_symmod.cpp" /> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp" /> <ClCompile Include="..\..\soundlib\Load_uax.cpp" /> <ClCompile Include="..\..\soundlib\Load_ult.cpp" /> <ClCompile Include="..\..\soundlib\Load_unic.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj.filters Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj.filters Sun Dec 8 19:21:53 2024 (r22487) @@ -1385,6 +1385,9 @@ <ClCompile Include="..\..\soundlib\Load_symmod.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_uax.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj Sun Dec 8 19:21:53 2024 (r22487) @@ -1427,6 +1427,7 @@ <ClCompile Include="..\..\soundlib\Load_stm.cpp" /> <ClCompile Include="..\..\soundlib\Load_stp.cpp" /> <ClCompile Include="..\..\soundlib\Load_symmod.cpp" /> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp" /> <ClCompile Include="..\..\soundlib\Load_uax.cpp" /> <ClCompile Include="..\..\soundlib\Load_ult.cpp" /> <ClCompile Include="..\..\soundlib\Load_unic.cpp" /> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters Sun Dec 8 19:21:53 2024 (r22487) @@ -2225,6 +2225,9 @@ <ClCompile Include="..\..\soundlib\Load_symmod.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_uax.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj Sun Dec 8 19:21:53 2024 (r22487) @@ -1427,6 +1427,7 @@ <ClCompile Include="..\..\soundlib\Load_stm.cpp" /> <ClCompile Include="..\..\soundlib\Load_stp.cpp" /> <ClCompile Include="..\..\soundlib\Load_symmod.cpp" /> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp" /> <ClCompile Include="..\..\soundlib\Load_uax.cpp" /> <ClCompile Include="..\..\soundlib\Load_ult.cpp" /> <ClCompile Include="..\..\soundlib\Load_unic.cpp" /> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj.filters Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj.filters Sun Dec 8 19:21:53 2024 (r22487) @@ -2225,6 +2225,9 @@ <ClCompile Include="..\..\soundlib\Load_symmod.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_uax.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj Sun Dec 8 19:21:53 2024 (r22487) @@ -1427,6 +1427,7 @@ <ClCompile Include="..\..\soundlib\Load_stm.cpp" /> <ClCompile Include="..\..\soundlib\Load_stp.cpp" /> <ClCompile Include="..\..\soundlib\Load_symmod.cpp" /> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp" /> <ClCompile Include="..\..\soundlib\Load_uax.cpp" /> <ClCompile Include="..\..\soundlib\Load_ult.cpp" /> <ClCompile Include="..\..\soundlib\Load_unic.cpp" /> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj.filters Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj.filters Sun Dec 8 19:21:53 2024 (r22487) @@ -2225,6 +2225,9 @@ <ClCompile Include="..\..\soundlib\Load_symmod.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_uax.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj Sun Dec 8 19:21:53 2024 (r22487) @@ -1029,6 +1029,7 @@ <ClCompile Include="..\..\soundlib\Load_stm.cpp" /> <ClCompile Include="..\..\soundlib\Load_stp.cpp" /> <ClCompile Include="..\..\soundlib\Load_symmod.cpp" /> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp" /> <ClCompile Include="..\..\soundlib\Load_uax.cpp" /> <ClCompile Include="..\..\soundlib\Load_ult.cpp" /> <ClCompile Include="..\..\soundlib\Load_unic.cpp" /> Modified: trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj.filters Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj.filters Sun Dec 8 19:21:53 2024 (r22487) @@ -1331,6 +1331,9 @@ <ClCompile Include="..\..\soundlib\Load_symmod.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_uax.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj Sun Dec 8 19:21:53 2024 (r22487) @@ -1029,6 +1029,7 @@ <ClCompile Include="..\..\soundlib\Load_stm.cpp" /> <ClCompile Include="..\..\soundlib\Load_stp.cpp" /> <ClCompile Include="..\..\soundlib\Load_symmod.cpp" /> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp" /> <ClCompile Include="..\..\soundlib\Load_uax.cpp" /> <ClCompile Include="..\..\soundlib\Load_ult.cpp" /> <ClCompile Include="..\..\soundlib\Load_unic.cpp" /> Modified: trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj.filters Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj.filters Sun Dec 8 19:21:53 2024 (r22487) @@ -1331,6 +1331,9 @@ <ClCompile Include="..\..\soundlib\Load_symmod.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_uax.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj Sun Dec 8 19:21:53 2024 (r22487) @@ -1071,6 +1071,7 @@ <ClCompile Include="..\..\soundlib\Load_stm.cpp" /> <ClCompile Include="..\..\soundlib\Load_stp.cpp" /> <ClCompile Include="..\..\soundlib\Load_symmod.cpp" /> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp" /> <ClCompile Include="..\..\soundlib\Load_uax.cpp" /> <ClCompile Include="..\..\soundlib\Load_ult.cpp" /> <ClCompile Include="..\..\soundlib\Load_unic.cpp" /> Modified: trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj.filters Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj.filters Sun Dec 8 19:21:53 2024 (r22487) @@ -1391,6 +1391,9 @@ <ClCompile Include="..\..\soundlib\Load_symmod.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_uax.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj Sun Dec 8 19:21:53 2024 (r22487) @@ -2629,6 +2629,7 @@ <ClCompile Include="..\..\soundlib\Load_stm.cpp" /> <ClCompile Include="..\..\soundlib\Load_stp.cpp" /> <ClCompile Include="..\..\soundlib\Load_symmod.cpp" /> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp" /> <ClCompile Include="..\..\soundlib\Load_uax.cpp" /> <ClCompile Include="..\..\soundlib\Load_ult.cpp" /> <ClCompile Include="..\..\soundlib\Load_unic.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj.filters Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj.filters Sun Dec 8 19:21:53 2024 (r22487) @@ -2225,6 +2225,9 @@ <ClCompile Include="..\..\soundlib\Load_symmod.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_uax.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj Sun Dec 8 19:21:53 2024 (r22487) @@ -2629,6 +2629,7 @@ <ClCompile Include="..\..\soundlib\Load_stm.cpp" /> <ClCompile Include="..\..\soundlib\Load_stp.cpp" /> <ClCompile Include="..\..\soundlib\Load_symmod.cpp" /> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp" /> <ClCompile Include="..\..\soundlib\Load_uax.cpp" /> <ClCompile Include="..\..\soundlib\Load_ult.cpp" /> <ClCompile Include="..\..\soundlib\Load_unic.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj.filters Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj.filters Sun Dec 8 19:21:53 2024 (r22487) @@ -2225,6 +2225,9 @@ <ClCompile Include="..\..\soundlib\Load_symmod.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_uax.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj Sun Dec 8 19:21:53 2024 (r22487) @@ -2629,6 +2629,7 @@ <ClCompile Include="..\..\soundlib\Load_stm.cpp" /> <ClCompile Include="..\..\soundlib\Load_stp.cpp" /> <ClCompile Include="..\..\soundlib\Load_symmod.cpp" /> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp" /> <ClCompile Include="..\..\soundlib\Load_uax.cpp" /> <ClCompile Include="..\..\soundlib\Load_ult.cpp" /> <ClCompile Include="..\..\soundlib\Load_unic.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj.filters Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj.filters Sun Dec 8 19:21:53 2024 (r22487) @@ -2225,6 +2225,9 @@ <ClCompile Include="..\..\soundlib\Load_symmod.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_uax.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10/libopenmpt-small.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10/libopenmpt-small.vcxproj Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2022win10/libopenmpt-small.vcxproj Sun Dec 8 19:21:53 2024 (r22487) @@ -2042,6 +2042,7 @@ <ClCompile Include="..\..\soundlib\Load_stm.cpp" /> <ClCompile Include="..\..\soundlib\Load_stp.cpp" /> <ClCompile Include="..\..\soundlib\Load_symmod.cpp" /> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp" /> <ClCompile Include="..\..\soundlib\Load_uax.cpp" /> <ClCompile Include="..\..\soundlib\Load_ult.cpp" /> <ClCompile Include="..\..\soundlib\Load_unic.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10/libopenmpt-small.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10/libopenmpt-small.vcxproj.filters Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2022win10/libopenmpt-small.vcxproj.filters Sun Dec 8 19:21:53 2024 (r22487) @@ -1331,6 +1331,9 @@ <ClCompile Include="..\..\soundlib\Load_symmod.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_uax.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10/libopenmpt.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10/libopenmpt.vcxproj Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2022win10/libopenmpt.vcxproj Sun Dec 8 19:21:53 2024 (r22487) @@ -2042,6 +2042,7 @@ <ClCompile Include="..\..\soundlib\Load_stm.cpp" /> <ClCompile Include="..\..\soundlib\Load_stp.cpp" /> <ClCompile Include="..\..\soundlib\Load_symmod.cpp" /> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp" /> <ClCompile Include="..\..\soundlib\Load_uax.cpp" /> <ClCompile Include="..\..\soundlib\Load_ult.cpp" /> <ClCompile Include="..\..\soundlib\Load_unic.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10/libopenmpt.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10/libopenmpt.vcxproj.filters Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2022win10/libopenmpt.vcxproj.filters Sun Dec 8 19:21:53 2024 (r22487) @@ -1331,6 +1331,9 @@ <ClCompile Include="..\..\soundlib\Load_symmod.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_uax.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10/libopenmpt_test.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10/libopenmpt_test.vcxproj Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2022win10/libopenmpt_test.vcxproj Sun Dec 8 19:21:53 2024 (r22487) @@ -2129,6 +2129,7 @@ <ClCompile Include="..\..\soundlib\Load_stm.cpp" /> <ClCompile Include="..\..\soundlib\Load_stp.cpp" /> <ClCompile Include="..\..\soundlib\Load_symmod.cpp" /> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp" /> <ClCompile Include="..\..\soundlib\Load_uax.cpp" /> <ClCompile Include="..\..\soundlib\Load_ult.cpp" /> <ClCompile Include="..\..\soundlib\Load_unic.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10/libopenmpt_test.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10/libopenmpt_test.vcxproj.filters Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2022win10/libopenmpt_test.vcxproj.filters Sun Dec 8 19:21:53 2024 (r22487) @@ -1391,6 +1391,9 @@ <ClCompile Include="..\..\soundlib\Load_symmod.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_uax.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj Sun Dec 8 19:21:53 2024 (r22487) @@ -2197,6 +2197,7 @@ <ClCompile Include="..\..\soundlib\Load_stm.cpp" /> <ClCompile Include="..\..\soundlib\Load_stp.cpp" /> <ClCompile Include="..\..\soundlib\Load_symmod.cpp" /> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp" /> <ClCompile Include="..\..\soundlib\Load_uax.cpp" /> <ClCompile Include="..\..\soundlib\Load_ult.cpp" /> <ClCompile Include="..\..\soundlib\Load_unic.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj.filters Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj.filters Sun Dec 8 19:21:53 2024 (r22487) @@ -2183,6 +2183,9 @@ <ClCompile Include="..\..\soundlib\Load_symmod.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_uax.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj Sun Dec 8 19:21:53 2024 (r22487) @@ -2197,6 +2197,7 @@ <ClCompile Include="..\..\soundlib\Load_stm.cpp" /> <ClCompile Include="..\..\soundlib\Load_stp.cpp" /> <ClCompile Include="..\..\soundlib\Load_symmod.cpp" /> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp" /> <ClCompile Include="..\..\soundlib\Load_uax.cpp" /> <ClCompile Include="..\..\soundlib\Load_ult.cpp" /> <ClCompile Include="..\..\soundlib\Load_unic.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj.filters Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj.filters Sun Dec 8 19:21:53 2024 (r22487) @@ -2183,6 +2183,9 @@ <ClCompile Include="..\..\soundlib\Load_symmod.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_uax.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj Sun Dec 8 19:21:53 2024 (r22487) @@ -2197,6 +2197,7 @@ <ClCompile Include="..\..\soundlib\Load_stm.cpp" /> <ClCompile Include="..\..\soundlib\Load_stp.cpp" /> <ClCompile Include="..\..\soundlib\Load_symmod.cpp" /> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp" /> <ClCompile Include="..\..\soundlib\Load_uax.cpp" /> <ClCompile Include="..\..\soundlib\Load_ult.cpp" /> <ClCompile Include="..\..\soundlib\Load_unic.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj.filters Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj.filters Sun Dec 8 19:21:53 2024 (r22487) @@ -2183,6 +2183,9 @@ <ClCompile Include="..\..\soundlib\Load_symmod.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_uax.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10clang/libopenmpt-small.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/libopenmpt-small.vcxproj Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2022win10clang/libopenmpt-small.vcxproj Sun Dec 8 19:21:53 2024 (r22487) @@ -1635,6 +1635,7 @@ <ClCompile Include="..\..\soundlib\Load_stm.cpp" /> <ClCompile Include="..\..\soundlib\Load_stp.cpp" /> <ClCompile Include="..\..\soundlib\Load_symmod.cpp" /> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp" /> <ClCompile Include="..\..\soundlib\Load_uax.cpp" /> <ClCompile Include="..\..\soundlib\Load_ult.cpp" /> <ClCompile Include="..\..\soundlib\Load_unic.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10clang/libopenmpt-small.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/libopenmpt-small.vcxproj.filters Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2022win10clang/libopenmpt-small.vcxproj.filters Sun Dec 8 19:21:53 2024 (r22487) @@ -1331,6 +1331,9 @@ <ClCompile Include="..\..\soundlib\Load_symmod.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_uax.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10clang/libopenmpt.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/libopenmpt.vcxproj Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2022win10clang/libopenmpt.vcxproj Sun Dec 8 19:21:53 2024 (r22487) @@ -1635,6 +1635,7 @@ <ClCompile Include="..\..\soundlib\Load_stm.cpp" /> <ClCompile Include="..\..\soundlib\Load_stp.cpp" /> <ClCompile Include="..\..\soundlib\Load_symmod.cpp" /> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp" /> <ClCompile Include="..\..\soundlib\Load_uax.cpp" /> <ClCompile Include="..\..\soundlib\Load_ult.cpp" /> <ClCompile Include="..\..\soundlib\Load_unic.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10clang/libopenmpt.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/libopenmpt.vcxproj.filters Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2022win10clang/libopenmpt.vcxproj.filters Sun Dec 8 19:21:53 2024 (r22487) @@ -1331,6 +1331,9 @@ <ClCompile Include="..\..\soundlib\Load_symmod.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_uax.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10clang/libopenmpt_test.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/libopenmpt_test.vcxproj Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2022win10clang/libopenmpt_test.vcxproj Sun Dec 8 19:21:53 2024 (r22487) @@ -1707,6 +1707,7 @@ <ClCompile Include="..\..\soundlib\Load_stm.cpp" /> <ClCompile Include="..\..\soundlib\Load_stp.cpp" /> <ClCompile Include="..\..\soundlib\Load_symmod.cpp" /> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp" /> <ClCompile Include="..\..\soundlib\Load_uax.cpp" /> <ClCompile Include="..\..\soundlib\Load_ult.cpp" /> <ClCompile Include="..\..\soundlib\Load_unic.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10clang/libopenmpt_test.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/libopenmpt_test.vcxproj.filters Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2022win10clang/libopenmpt_test.vcxproj.filters Sun Dec 8 19:21:53 2024 (r22487) @@ -1391,6 +1391,9 @@ <ClCompile Include="..\..\soundlib\Load_symmod.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_uax.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10uwp/libopenmpt-small.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10uwp/libopenmpt-small.vcxproj Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2022win10uwp/libopenmpt-small.vcxproj Sun Dec 8 19:21:53 2024 (r22487) @@ -1729,6 +1729,7 @@ <ClCompile Include="..\..\soundlib\Load_stm.cpp" /> <ClCompile Include="..\..\soundlib\Load_stp.cpp" /> <ClCompile Include="..\..\soundlib\Load_symmod.cpp" /> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp" /> <ClCompile Include="..\..\soundlib\Load_uax.cpp" /> <ClCompile Include="..\..\soundlib\Load_ult.cpp" /> <ClCompile Include="..\..\soundlib\Load_unic.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10uwp/libopenmpt-small.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10uwp/libopenmpt-small.vcxproj.filters Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2022win10uwp/libopenmpt-small.vcxproj.filters Sun Dec 8 19:21:53 2024 (r22487) @@ -1331,6 +1331,9 @@ <ClCompile Include="..\..\soundlib\Load_symmod.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_uax.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10uwp/libopenmpt.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10uwp/libopenmpt.vcxproj Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2022win10uwp/libopenmpt.vcxproj Sun Dec 8 19:21:53 2024 (r22487) @@ -1729,6 +1729,7 @@ <ClCompile Include="..\..\soundlib\Load_stm.cpp" /> <ClCompile Include="..\..\soundlib\Load_stp.cpp" /> <ClCompile Include="..\..\soundlib\Load_symmod.cpp" /> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp" /> <ClCompile Include="..\..\soundlib\Load_uax.cpp" /> <ClCompile Include="..\..\soundlib\Load_ult.cpp" /> <ClCompile Include="..\..\soundlib\Load_unic.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10uwp/libopenmpt.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10uwp/libopenmpt.vcxproj.filters Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2022win10uwp/libopenmpt.vcxproj.filters Sun Dec 8 19:21:53 2024 (r22487) @@ -1331,6 +1331,9 @@ <ClCompile Include="..\..\soundlib\Load_symmod.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_uax.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10uwp/libopenmpt_test.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10uwp/libopenmpt_test.vcxproj Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2022win10uwp/libopenmpt_test.vcxproj Sun Dec 8 19:21:53 2024 (r22487) @@ -1801,6 +1801,7 @@ <ClCompile Include="..\..\soundlib\Load_stm.cpp" /> <ClCompile Include="..\..\soundlib\Load_stp.cpp" /> <ClCompile Include="..\..\soundlib\Load_symmod.cpp" /> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp" /> <ClCompile Include="..\..\soundlib\Load_uax.cpp" /> <ClCompile Include="..\..\soundlib\Load_ult.cpp" /> <ClCompile Include="..\..\soundlib\Load_unic.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10uwp/libopenmpt_test.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10uwp/libopenmpt_test.vcxproj.filters Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2022win10uwp/libopenmpt_test.vcxproj.filters Sun Dec 8 19:21:53 2024 (r22487) @@ -1391,6 +1391,9 @@ <ClCompile Include="..\..\soundlib\Load_symmod.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_uax.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.vcxproj Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.vcxproj Sun Dec 8 19:21:53 2024 (r22487) @@ -1447,6 +1447,7 @@ <ClCompile Include="..\..\soundlib\Load_stm.cpp" /> <ClCompile Include="..\..\soundlib\Load_stp.cpp" /> <ClCompile Include="..\..\soundlib\Load_symmod.cpp" /> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp" /> <ClCompile Include="..\..\soundlib\Load_uax.cpp" /> <ClCompile Include="..\..\soundlib\Load_ult.cpp" /> <ClCompile Include="..\..\soundlib\Load_unic.cpp" /> Modified: trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.vcxproj.filters Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.vcxproj.filters Sun Dec 8 19:21:53 2024 (r22487) @@ -2225,6 +2225,9 @@ <ClCompile Include="..\..\soundlib\Load_symmod.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_uax.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win7/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win7/OpenMPT-UTF8.vcxproj Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2022win7/OpenMPT-UTF8.vcxproj Sun Dec 8 19:21:53 2024 (r22487) @@ -1447,6 +1447,7 @@ <ClCompile Include="..\..\soundlib\Load_stm.cpp" /> <ClCompile Include="..\..\soundlib\Load_stp.cpp" /> <ClCompile Include="..\..\soundlib\Load_symmod.cpp" /> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp" /> <ClCompile Include="..\..\soundlib\Load_uax.cpp" /> <ClCompile Include="..\..\soundlib\Load_ult.cpp" /> <ClCompile Include="..\..\soundlib\Load_unic.cpp" /> Modified: trunk/OpenMPT/build/vs2022win7/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win7/OpenMPT-UTF8.vcxproj.filters Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2022win7/OpenMPT-UTF8.vcxproj.filters Sun Dec 8 19:21:53 2024 (r22487) @@ -2225,6 +2225,9 @@ <ClCompile Include="..\..\soundlib\Load_symmod.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_uax.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win7/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win7/OpenMPT.vcxproj Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2022win7/OpenMPT.vcxproj Sun Dec 8 19:21:53 2024 (r22487) @@ -1447,6 +1447,7 @@ <ClCompile Include="..\..\soundlib\Load_stm.cpp" /> <ClCompile Include="..\..\soundlib\Load_stp.cpp" /> <ClCompile Include="..\..\soundlib\Load_symmod.cpp" /> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp" /> <ClCompile Include="..\..\soundlib\Load_uax.cpp" /> <ClCompile Include="..\..\soundlib\Load_ult.cpp" /> <ClCompile Include="..\..\soundlib\Load_unic.cpp" /> Modified: trunk/OpenMPT/build/vs2022win7/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win7/OpenMPT.vcxproj.filters Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2022win7/OpenMPT.vcxproj.filters Sun Dec 8 19:21:53 2024 (r22487) @@ -2225,6 +2225,9 @@ <ClCompile Include="..\..\soundlib\Load_symmod.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_uax.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win7/libopenmpt-small.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win7/libopenmpt-small.vcxproj Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2022win7/libopenmpt-small.vcxproj Sun Dec 8 19:21:53 2024 (r22487) @@ -1049,6 +1049,7 @@ <ClCompile Include="..\..\soundlib\Load_stm.cpp" /> <ClCompile Include="..\..\soundlib\Load_stp.cpp" /> <ClCompile Include="..\..\soundlib\Load_symmod.cpp" /> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp" /> <ClCompile Include="..\..\soundlib\Load_uax.cpp" /> <ClCompile Include="..\..\soundlib\Load_ult.cpp" /> <ClCompile Include="..\..\soundlib\Load_unic.cpp" /> Modified: trunk/OpenMPT/build/vs2022win7/libopenmpt-small.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win7/libopenmpt-small.vcxproj.filters Sun Dec 8 19:16:26 2024 (r22486) +++ trunk/OpenMPT/build/vs2022win7/libopenmpt-small.vcxproj.filters Sun Dec 8 19:21:53 2024 (r22487) @@ -1331,6 +1331,9 @@ <ClCompile Include="..\..\soundlib\Load_symmod.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_tcb.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_uax.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/... [truncated message content] |
From: <sv...@op...> - 2024-12-08 18:16:35
|
Author: sagamusix Date: Sun Dec 8 19:16:26 2024 New Revision: 22486 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22486 Log: [Fix] Play Control volume command was affected by volume column effect memory handling, making it impossible to use "pause sample" depending on compatibility flags. Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Snd_fx.cpp Sun Dec 8 11:29:40 2024 (r22485) +++ trunk/OpenMPT/soundlib/Snd_fx.cpp Sun Dec 8 19:16:26 2024 (r22486) @@ -3220,8 +3220,7 @@ // no memory here. volcmd = VOLCMD_NONE; } - - } else if(!m_playBehaviour[kITVolColMemory]) + } else if(!m_playBehaviour[kITVolColMemory] && volcmd != VOLCMD_PLAYCONTROL) { // IT Compatibility: Effects in the volume column don't have an unified memory. // Test case: VolColMemory.it |
From: <sv...@op...> - 2024-12-08 10:29:52
|
Author: manx Date: Sun Dec 8 11:29:40 2024 New Revision: 22485 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22485 Log: Merged revision(s) 22483 from branches/OpenMPT-1.30: [Fix] build: CI: GitHub: macOS: Try to work-around Homebrew python breakage on macOS 13. See r22481. ........ Modified: branches/OpenMPT-1.28/ (props changed) branches/OpenMPT-1.28/.github/workflows/macOS-13-Makefile.yml Modified: branches/OpenMPT-1.28/.github/workflows/macOS-13-Makefile.yml ============================================================================== --- branches/OpenMPT-1.28/.github/workflows/macOS-13-Makefile.yml Sun Dec 8 11:29:21 2024 (r22484) +++ branches/OpenMPT-1.28/.github/workflows/macOS-13-Makefile.yml Sun Dec 8 11:29:40 2024 (r22485) @@ -18,7 +18,7 @@ - name: update Homebrew run: brew update - name: fixup GitHub Homebrew python breakage - run: brew unlink python@3.12 && brew link --overwrite python@3.12 + run: brew unlink python@3.12 && brew unlink python@3.13 && brew link --overwrite python@3.12 && brew link --overwrite python@3.13 - name: upgrade packages run: brew upgrade - name: install dependencies |
From: <sv...@op...> - 2024-12-08 10:29:35
|
Author: manx Date: Sun Dec 8 11:29:21 2024 New Revision: 22484 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22484 Log: Merged revision(s) 22483 from branches/OpenMPT-1.30: [Fix] build: CI: GitHub: macOS: Try to work-around Homebrew python breakage on macOS 13. See r22481. ........ Modified: branches/OpenMPT-1.29/ (props changed) branches/OpenMPT-1.29/.github/workflows/macOS-13-Makefile.yml Modified: branches/OpenMPT-1.29/.github/workflows/macOS-13-Makefile.yml ============================================================================== --- branches/OpenMPT-1.29/.github/workflows/macOS-13-Makefile.yml Sun Dec 8 11:29:00 2024 (r22483) +++ branches/OpenMPT-1.29/.github/workflows/macOS-13-Makefile.yml Sun Dec 8 11:29:21 2024 (r22484) @@ -18,7 +18,7 @@ - name: update Homebrew run: brew update - name: fixup GitHub Homebrew python breakage - run: brew unlink python@3.12 && brew link --overwrite python@3.12 + run: brew unlink python@3.12 && brew unlink python@3.13 && brew link --overwrite python@3.12 && brew link --overwrite python@3.13 - name: upgrade packages run: brew upgrade - name: install dependencies |