Skip to content

W
wine-winehq
Commit b0ad8b8c authored by Anton Baskanov's avatar Anton Baskanov Committed by Alexandre Julliard
Browse files
Options

dmsynth: Use FLUID_MOD_KEY for CONN_SRC_KEYNUMBER.

Fixes incorrect EG key number scale and offset that caused missing lower notes of some instruments (e.g. Acoustic Grand Piano).
parent 02853687
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 15 deletions
dlls/dmsynth/synth.c
View file @ b0ad8b8c
......@@ -1483,17 +1483,6 @@ static BOOL set_gen_from_connection(fluid_voice_t *fluid_voice, const CONNECTION
{
if (!gen_from_connection(conn, &gen)) return FALSE;
}
else if (conn->usSource == CONN_SRC_KEYNUMBER)
{
switch (conn->usDestination)
{
case CONN_DST_EG2_HOLDTIME: gen = GEN_KEYTOMODENVHOLD; break;
case CONN_DST_EG2_DECAYTIME: gen = GEN_KEYTOMODENVDECAY; break;
case CONN_DST_EG1_HOLDTIME: gen = GEN_KEYTOVOLENVHOLD; break;
case CONN_DST_EG1_DECAYTIME: gen = GEN_KEYTOVOLENVDECAY; break;
default: return FALSE;
}
}
else if (conn->usSource == CONN_SRC_LFO)
{
switch (conn->usDestination)
......@@ -1588,10 +1577,6 @@ static void add_mod_from_connection(fluid_voice_t *fluid_voice, const CONNECTION
case MAKELONG(CONN_SRC_LFO, CONN_DST_FILTER_CUTOFF): gen = GEN_MODLFOTOFILTERFC; break;
case MAKELONG(CONN_SRC_EG2, CONN_DST_FILTER_CUTOFF): gen = GEN_MODENVTOFILTERFC; break;
case MAKELONG(CONN_SRC_LFO, CONN_DST_GAIN): gen = GEN_MODLFOTOVOL; break;
case MAKELONG(CONN_SRC_KEYNUMBER, CONN_DST_EG2_HOLDTIME): gen = GEN_KEYTOMODENVHOLD; break;
case MAKELONG(CONN_SRC_KEYNUMBER, CONN_DST_EG2_DECAYTIME): gen = GEN_KEYTOMODENVDECAY; break;
case MAKELONG(CONN_SRC_KEYNUMBER, CONN_DST_EG1_HOLDTIME): gen = GEN_KEYTOVOLENVHOLD; break;
case MAKELONG(CONN_SRC_KEYNUMBER, CONN_DST_EG1_DECAYTIME): gen = GEN_KEYTOVOLENVDECAY; break;
}
if (conn->usControl != CONN_SRC_NONE && gen != -1)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment