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

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

Author: manx
Date: Sun Apr 14 08:41:45 2024
New Revision: 20592
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20592

Log:
[Ref] Silence GCC -Wconversion warnings.

Modified:
   trunk/OpenMPT/soundlib/InstrumentSynth.cpp
   trunk/OpenMPT/soundlib/Load_puma.cpp

Modified: trunk/OpenMPT/soundlib/InstrumentSynth.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/InstrumentSynth.cpp	Sun Apr 14 01:08:01 2024	(r20591)
+++ trunk/OpenMPT/soundlib/InstrumentSynth.cpp	Sun Apr 14 08:41:45 2024	(r20592)
@@ -243,7 +243,7 @@
 	if(m_medArpOffset < events.size())
 	{
 		m_linearPitchFactor = 16 * events[m_medArpOffset + m_medArpPos].u8;
-		m_medArpPos = (m_medArpPos + 1) % static_cast<uint8>(events[m_medArpOffset].u16);
+		m_medArpPos = static_cast<uint8>((m_medArpPos + 1) % static_cast<uint8>(events[m_medArpOffset].u16));
 	}
 	if(m_medVibratoDepth)
 	{
@@ -280,7 +280,7 @@
 	}
 	if(m_gtkTremoloEnabled)
 	{
-		m_volumeAdd = ModSinusTable[(m_gtkVibratoPos / 4u) % std::size(ModSinusTable)] * m_gtkVibratoWidth / 2;
+		m_volumeAdd = static_cast<int16>(ModSinusTable[(m_gtkVibratoPos / 4u) % std::size(ModSinusTable)] * m_gtkVibratoWidth / 2);
 		m_gtkVibratoPos = (m_gtkVibratoPos + m_gtkVibratoSpeed) % (32u * 16u);
 	}
 	if(m_gtkVibratoEnabled)
@@ -427,7 +427,7 @@
 		return false;
 	case Event::Type::Puma_VolumeRamp:
 		m_ticksRemain = event.Byte2();
-		m_volumeAdd = event.Byte0() * 256 - 16384;
+		m_volumeAdd = static_cast<int16>(event.Byte0() * 256 - 16384);
 		return true;
 	case Event::Type::Puma_StopVoice:
 		chn.nRealVolume = 0;
@@ -446,7 +446,7 @@
 		return true;
 
 	case Event::Type::Mupp_SetWaveform:
-		ChannelSetSample(chn, sndFile, 32 + event.Byte0() * 28 + event.Byte1());
+		ChannelSetSample(chn, sndFile, static_cast<SAMPLEINDEX>(32 + event.Byte0() * 28 + event.Byte1()));
 		m_volumeFactor = static_cast<uint16>(std::min(event.Byte2() & 0x7F, 64) * 256u);
 		return true;
 

Modified: trunk/OpenMPT/soundlib/Load_puma.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/Load_puma.cpp	Sun Apr 14 01:08:01 2024	(r20591)
+++ trunk/OpenMPT/soundlib/Load_puma.cpp	Sun Apr 14 08:41:45 2024	(r20592)
@@ -84,7 +84,7 @@
 
 	uint32 GetHeaderMinimumAdditionalSize() const
 	{
-		return NumOrders() * sizeof(PumaPlaylistEntry) + numPatterns * 8 + 4 + numInstruments * 16 + 4;
+		return NumOrders() * static_cast<uint32>(sizeof(PumaPlaylistEntry)) + numPatterns * 8 + 4 + numInstruments * 16 + 4;
 	}
 };
 
@@ -237,7 +237,7 @@
 			for(const auto &p : patternData[chnInfo.pattern])
 			{
 				if(p[0])
-					m->note = NOTE_MIDDLEC - 49 + (p[0] + chnInfo.noteTranspose) / 2;
+					m->note = static_cast<uint8>(NOTE_MIDDLEC - 49 + (p[0] + chnInfo.noteTranspose) / 2);
 				if(uint8 instr = (p[1] & 0x1F); instr != 0)
 					m->instr = (instr + chnInfo.instrTranspose) & 0x1F;
 				if(!m->instr && m->note != NOTE_NONE)