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

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

Author: sagamusix
Date: Tue Jul  9 14:35:15 2024
New Revision: 21133
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21133

Log:
[Fix] Compile fix for DJGPP, and silence a warning.

Modified:
   trunk/OpenMPT/soundlib/Load_etx.cpp
   trunk/OpenMPT/soundlib/Snd_fx.cpp

Modified: trunk/OpenMPT/soundlib/Load_etx.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/Load_etx.cpp	Mon Jul  8 23:13:05 2024	(r21132)
+++ trunk/OpenMPT/soundlib/Load_etx.cpp	Tue Jul  9 14:35:15 2024	(r21133)
@@ -142,7 +142,7 @@
 				{
 					m->note = NOTE_MIDDLEC - 24 + note;
 					m->instr = instr + 1;
-					m->SetVolumeCommand(VOLCMD_VOLUME, (std::min(vol, uint8(127)) + 1u) / 2u);
+					m->SetVolumeCommand(VOLCMD_VOLUME, static_cast<ModCommand::VOL>((std::min(vol, uint8(127)) + 1u) / 2u));
 				}
 			}
 		}

Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/Snd_fx.cpp	Mon Jul  8 23:13:05 2024	(r21132)
+++ trunk/OpenMPT/soundlib/Snd_fx.cpp	Tue Jul  9 14:35:15 2024	(r21133)
@@ -3901,7 +3901,7 @@
 	if(chn.autoSlide.IsActive(AutoSlideCommand::FineVolumeSlideDown) && chn.rowCommand.command != CMD_AUTO_VOLUMESLIDE)
 		FineVolumeDown(chn, 0, false);
 	if(chn.autoSlide.IsActive(AutoSlideCommand::VolumeDownETX))
-		chn.nVolume = std::max(0, chn.nVolume - chn.nOldVolumeSlide);
+		chn.nVolume = std::max(int32(0), chn.nVolume - chn.nOldVolumeSlide);
 	if(chn.autoSlide.IsActive(AutoSlideCommand::VolumeSlideSTK))
 		VolumeSlide(chn, 0);
 	if(chn.autoSlide.IsActive(AutoSlideCommand::GlobalVolumeSlide) && chn.rowCommand.command != CMD_GLOBALVOLSLIDE)