[OMPT-svn-commit] OpenMPT r22242 - trunk/OpenMPT/soundlib

[<sv...@op...>]

Author: sagamusix
Date: Tue Nov 19 19:12:48 2024
New Revision: 22242
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22242

Log:
[Ref] Silence warning.

Modified:
   trunk/OpenMPT/soundlib/Snd_defs.h
   trunk/OpenMPT/soundlib/Sndfile.cpp

Modified: trunk/OpenMPT/soundlib/Snd_defs.h
==============================================================================
--- trunk/OpenMPT/soundlib/Snd_defs.h	Tue Nov 19 18:57:55 2024	(r22241)
+++ trunk/OpenMPT/soundlib/Snd_defs.h	Tue Nov 19 19:12:48 2024	(r22242)
@@ -333,7 +333,8 @@
 #define SNDMIX_MUTECHNMODE    0x100000 // Notes are not played on muted channels
 
 
-#define MAX_GLOBAL_VOLUME 256u
+static constexpr uint32 MAX_GLOBAL_VOLUME = 256;
+static constexpr uint32 MAX_PREAMP = 2000;
 
 // When to execute a position override event
 enum class OrderTransitionMode : uint8

Modified: trunk/OpenMPT/soundlib/Sndfile.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/Sndfile.cpp	Tue Nov 19 18:57:55 2024	(r22241)
+++ trunk/OpenMPT/soundlib/Sndfile.cpp	Tue Nov 19 19:12:48 2024	(r22242)
@@ -673,8 +673,8 @@
 	LimitMax(m_nDefaultRowsPerBeat, MAX_ROWS_PER_BEAT);
 	LimitMax(m_nDefaultRowsPerMeasure, MAX_ROWS_PER_BEAT);
 	LimitMax(m_nDefaultGlobalVolume, MAX_GLOBAL_VOLUME);
-	LimitMax(m_nSamplePreAmp, 2000);
-	LimitMax(m_nVSTiVolume, 2000);
+	LimitMax(m_nSamplePreAmp, MAX_PREAMP);
+	LimitMax(m_nVSTiVolume, MAX_PREAMP);
 	if(!m_tempoSwing.empty())
 		m_tempoSwing.resize(m_nDefaultRowsPerBeat);