Author: sagamusix
Date: Sat May 4 11:56:28 2024
New Revision: 20703
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20703
Log:
[Fix] Fix warnings and compile errors.
Modified:
trunk/OpenMPT/common/GzipWriter.h
trunk/OpenMPT/mptrack/MainFrm.cpp
trunk/OpenMPT/soundlib/OPL.cpp
trunk/OpenMPT/test/PlaybackTest.cpp
Modified: trunk/OpenMPT/common/GzipWriter.h
==============================================================================
--- trunk/OpenMPT/common/GzipWriter.h Sat May 4 00:32:17 2024 (r20702)
+++ trunk/OpenMPT/common/GzipWriter.h Sat May 4 11:56:28 2024 (r20703)
@@ -14,6 +14,7 @@
#include "mptString.h"
#include "mpt/io/io.hpp"
+#include "mpt/io/io_stdstream.hpp"
#ifdef MPT_WITH_ZLIB
Modified: trunk/OpenMPT/mptrack/MainFrm.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/MainFrm.cpp Sat May 4 00:32:17 2024 (r20702)
+++ trunk/OpenMPT/mptrack/MainFrm.cpp Sat May 4 11:56:28 2024 (r20703)
@@ -66,6 +66,9 @@
#define MPTTIMER_PERIOD 200
+#if defined(MPT_BUILD_DEBUG)
+#define MPT_ENABLE_PLAYBACK_TEST_MENU
+#endif
/////////////////////////////////////////////////////////////////////////////
// CMainFrame
@@ -126,11 +129,11 @@
#endif // MPT_ENABLE_UPDATE
ON_COMMAND(ID_HELPSHOW, &CMainFrame::OnHelp)
-#ifdef MPT_BUILD_DEBUG
+#ifdef MPT_ENABLE_PLAYBACK_TEST_MENU
ON_COMMAND(ID_CREATE_MIXERDUMP, &CMainFrame::OnCreateMixerDump)
ON_COMMAND(ID_VERIFY_MIXERDUMP, &CMainFrame::OnVerifyMixerDump)
ON_COMMAND(ID_CONVERT_MIXERDUMP, &CMainFrame::OnConvertMixerDumpToText)
-#endif // MPT_BUILD_DEBUG
+#endif // ENABLE_PLAYBACK_TEST_MENU
ON_COMMAND_RANGE(ID_MRU_LIST_FIRST, ID_MRU_LIST_LAST, &CMainFrame::OnOpenMRUItem)
ON_UPDATE_COMMAND_UI(ID_MRU_LIST_FIRST, &CMainFrame::OnUpdateMRUItem)
@@ -237,14 +240,14 @@
CreateTemplateModulesMenu();
UpdateMRUList();
-#ifdef MPT_BUILD_DEBUG
+#ifdef MPT_ENABLE_PLAYBACK_TEST_MENU
CMenu debugMenu;
debugMenu.CreatePopupMenu();
debugMenu.AppendMenu(MF_STRING, ID_CREATE_MIXERDUMP, _T("Create Mixer Dump for &File(s)..."));
debugMenu.AppendMenu(MF_STRING, ID_VERIFY_MIXERDUMP, _T("&Verify File(s)..."));
debugMenu.AppendMenu(MF_STRING, ID_CONVERT_MIXERDUMP, _T("Convert Mixer Dump to &TSV..."));
GetMenu()->AppendMenu(MF_STRING | MF_POPUP, reinterpret_cast<UINT_PTR>(debugMenu.Detach()), _T("Debug"));
-#endif // MPT_BUILD_DEBUG
+#endif // ENABLE_PLAYBACK_TEST_MENU
}
@@ -3176,7 +3179,7 @@
}
-#ifdef MPT_BUILD_DEBUG
+#ifdef MPT_ENABLE_PLAYBACK_TEST_MENU
void CMainFrame::OnCreateMixerDump()
{
std::string exts;
@@ -3283,7 +3286,7 @@
}
}
-#endif // MPT_BUILD_DEBUG
+#endif // ENABLE_PLAYBACK_TEST_MENU
void CMainFrame::NotifyAccessibilityUpdate(CWnd &source)
Modified: trunk/OpenMPT/soundlib/OPL.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/OPL.cpp Sat May 4 00:32:17 2024 (r20702)
+++ trunk/OpenMPT/soundlib/OPL.cpp Sat May 4 11:56:28 2024 (r20703)
@@ -383,7 +383,7 @@
if(regLo >= FNUM_LOW && regLo <= FEEDBACK_CONNECTION)
return (reg & 0xF0);
if(regLo >= AM_VIB && regLo <= WAVE_SELECT)
- return (reg & 0xE0) + ((reg & 0x07) >= 3 ? 3 : 0);
+ return regLo + static_cast<OPL::Register>((reg & 0x07) >= 3 ? 3 : 0);
return reg;
}
Modified: trunk/OpenMPT/test/PlaybackTest.cpp
==============================================================================
--- trunk/OpenMPT/test/PlaybackTest.cpp Sat May 4 00:32:17 2024 (r20702)
+++ trunk/OpenMPT/test/PlaybackTest.cpp Sat May 4 11:56:28 2024 (r20703)
@@ -20,6 +20,7 @@
#include "mpt/binary/hex.hpp"
#include "mpt/crypto/hash.hpp"
#include "mpt/io/io.hpp"
+#include "mpt/io/io_stdstream.hpp"
#include "openmpt/base/Endian.hpp"
#include <sstream>
@@ -380,7 +381,7 @@
}
#ifdef MPT_WITH_ZLIB
- std::string outData = std::move(outStream.str());
+ std::string outData = std::move(outStream).str();
WriteGzip(output, outData, filename);
#else
// miniz doesn't have gzip convenience functions
|
