[OMPT-svn-commit] OpenMPT r22331 - in branches/OpenMPT-1.31: . soundlib

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

Author: sagamusix
Date: Thu Nov 28 15:39:02 2024
New Revision: 22331
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22331

Log:
Merged revision(s) 22330 from trunk/OpenMPT:
[Fix] When importing a soundfont instrument, its bank number was off by one.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/soundlib/Dlsbank.cpp

Modified: branches/OpenMPT-1.31/soundlib/Dlsbank.cpp
==============================================================================
--- branches/OpenMPT-1.31/soundlib/Dlsbank.cpp	Thu Nov 28 15:38:41 2024	(r22330)
+++ branches/OpenMPT-1.31/soundlib/Dlsbank.cpp	Thu Nov 28 15:39:02 2024	(r22331)
@@ -2127,9 +2127,9 @@
 		}
 	}
 	pIns->nFadeOut = 1024;
-	pIns->nMidiProgram = (uint8)(dlsIns.ulInstrument & 0x7F) + 1;
-	pIns->nMidiChannel = (uint8)(isDrum ? 10 : 0);
-	pIns->wMidiBank = (uint16)(((dlsIns.ulBank & 0x7F00) >> 1) | (dlsIns.ulBank & 0x7F));
+	pIns->nMidiProgram = static_cast<uint8>(1 + (dlsIns.ulInstrument & 0x7F));
+	pIns->nMidiChannel = static_cast<uint8>(isDrum ? 10 : 0);
+	pIns->wMidiBank = static_cast<uint16>(1 + (((dlsIns.ulBank & 0x7F00) >> 1) | (dlsIns.ulBank & 0x7F)));
 	pIns->nNNA = NewNoteAction::NoteOff;
 	pIns->nDCT = DuplicateCheckType::Note;
 	pIns->nDNA = DuplicateNoteAction::NoteFade;
@@ -2146,7 +2146,7 @@
 		const DLSREGION &rgn = dlsIns.Regions[nRgn];
 		if(rgn.IsDummy())
 			continue;
-		// Elimitate Duplicate Regions
+		// Eliminate Duplicate Regions
 		uint32 dupRegion;
 		for(dupRegion = minRegion; dupRegion < nRgn; dupRegion++)
 		{