Skip to content

DLS: fix the pitch scale conversions which saturated #217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
git-moss merged 1 commit into from
Jul 24, 2026
Merged

DLS: fix the pitch scale conversions which saturated #217

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 7 additions & 18 deletions src/main/java/de/mossgrabers/convertwithmoss/format/dls/DlsDetector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,15 +235,19 @@ private static void applyArticulations (final DlsInstrument dlsInstrument, final
{
final IEnvelope pitchEnvelope = createEnvelope (dlsInstrument, dlsRegion, true);
final IEnvelopeModulator pitchEnvelopeModulator = zone.getPitchEnvelopeModulator ();
pitchEnvelopeModulator.setDepth (normalizeEG2ToPitch (pitchModulation.get ().getScale ()));
// The scale is a relative pitch in cent, stored as a 32-bit fixed point number with
// 65536 representing one cent
final double depthCents = pitchModulation.get ().getScale () / 65536.0;
pitchEnvelopeModulator.setDepth (Math.clamp (depthCents, -IEnvelope.MAX_ENVELOPE_DEPTH, IEnvelope.MAX_ENVELOPE_DEPTH) / IEnvelope.MAX_ENVELOPE_DEPTH);
pitchEnvelopeModulator.setSource (pitchEnvelope);
}

// Pitch tuning
final Optional<DlsArticulation> pitchTuning = getArticulation (dlsInstrument, dlsRegion, DlsArticulation.CONN_SRC_NONE, DlsArticulation.CONN_DST_PITCH);
if (pitchTuning.isPresent ())
{
final double tuning = normalizeEG2ToPitch (pitchTuning.get ().getScale ());
// The scale is a relative pitch in cent (65536 per cent), the tuning is in semi-tones
final double tuning = pitchTuning.get ().getScale () / 65536.0 / 100.0;
zone.setTuning (zone.getTuning () + tuning);
}

Expand Down Expand Up @@ -281,10 +285,7 @@ private static IEnvelope createEnvelope (final DlsInstrument dlsInstrument, fina
if (isEnvelope1)
sustain = getLevel (dlsInstrument, dlsRegion, DlsArticulation.CONN_DST_EG1_SUSTAINLEVEL);
else
{
final Optional<DlsArticulation> articulation = getArticulation (dlsInstrument, dlsRegion, DlsArticulation.CONN_SRC_NONE, DlsArticulation.CONN_DST_EG2_SUSTAINLEVEL);
sustain = articulation.isEmpty () ? -1 : normalizeEG2ToPitch (articulation.get ().getScale ());
}
sustain = getLevel (dlsInstrument, dlsRegion, DlsArticulation.CONN_DST_EG2_SUSTAINLEVEL);

final IEnvelope envelope = new DefaultEnvelope ();
if (delay >= 0)
Expand Down Expand Up @@ -346,16 +347,4 @@ private static double normalizeKeyNumberToGain (final int scale)
{
return Math.clamp (scale / (655360.0 * 127.0), -1, 1);
}


/**
* Normalizes a DLS Modulation EG to Pitch lScale value to the range 0.0..1.0.
*
* @param cents The raw 32-bit signed relative pitch value
* @return Normalized value in range [0.0, 1.0]
*/
public static double normalizeEG2ToPitch (final int cents)
{
return Math.clamp (cents, -1200, 1200) / 1200.0;
}
}