Commit c7b706de authored by Anton Baskanov's avatar Anton Baskanov Committed by Alexandre Julliard

dmsynth: Return void from add_mod_from_connection().

parent 95e19ae0
...@@ -1501,7 +1501,7 @@ static BOOL mod_from_connection(USHORT source, USHORT transform, UINT *fluid_sou ...@@ -1501,7 +1501,7 @@ static BOOL mod_from_connection(USHORT source, USHORT transform, UINT *fluid_sou
return TRUE; return TRUE;
} }
static BOOL add_mod_from_connection(fluid_voice_t *fluid_voice, const CONNECTION *conn) static void add_mod_from_connection(fluid_voice_t *fluid_voice, const CONNECTION *conn)
{ {
UINT src1 = FLUID_MOD_NONE, flags1 = 0, src2 = FLUID_MOD_NONE, flags2 = 0; UINT src1 = FLUID_MOD_NONE, flags1 = 0, src2 = FLUID_MOD_NONE, flags2 = 0;
fluid_mod_t *mod; fluid_mod_t *mod;
...@@ -1525,19 +1525,19 @@ static BOOL add_mod_from_connection(fluid_voice_t *fluid_voice, const CONNECTION ...@@ -1525,19 +1525,19 @@ static BOOL add_mod_from_connection(fluid_voice_t *fluid_voice, const CONNECTION
if (conn->usControl != CONN_SRC_NONE && gen != -1) if (conn->usControl != CONN_SRC_NONE && gen != -1)
{ {
if (!mod_from_connection(conn->usControl, (conn->usTransform >> 4) & 0x3f, &src1, &flags1)) if (!mod_from_connection(conn->usControl, (conn->usTransform >> 4) & 0x3f, &src1, &flags1))
return FALSE; return;
} }
else else
{ {
if (!mod_from_connection(conn->usSource, (conn->usTransform >> 10) & 0x3f, &src1, &flags1)) if (!mod_from_connection(conn->usSource, (conn->usTransform >> 10) & 0x3f, &src1, &flags1))
return FALSE; return;
if (!mod_from_connection(conn->usControl, (conn->usTransform >> 4) & 0x3f, &src2, &flags2)) if (!mod_from_connection(conn->usControl, (conn->usTransform >> 4) & 0x3f, &src2, &flags2))
return FALSE; return;
} }
if (gen == -1 && !gen_from_connection(conn, &gen)) return FALSE; if (gen == -1 && !gen_from_connection(conn, &gen)) return;
if (!(mod = new_fluid_mod())) return FALSE; if (!(mod = new_fluid_mod())) return;
fluid_mod_set_source1(mod, src1, flags1); fluid_mod_set_source1(mod, src1, flags1);
fluid_mod_set_source2(mod, src2, flags2); fluid_mod_set_source2(mod, src2, flags2);
fluid_mod_set_dest(mod, gen); fluid_mod_set_dest(mod, gen);
...@@ -1553,8 +1553,6 @@ static BOOL add_mod_from_connection(fluid_voice_t *fluid_voice, const CONNECTION ...@@ -1553,8 +1553,6 @@ static BOOL add_mod_from_connection(fluid_voice_t *fluid_voice, const CONNECTION
fluid_mod_set_amount(mod, value); fluid_mod_set_amount(mod, value);
fluid_voice_add_mod(fluid_voice, mod, FLUID_VOICE_OVERWRITE); fluid_voice_add_mod(fluid_voice, mod, FLUID_VOICE_OVERWRITE);
return TRUE;
} }
static void add_voice_connections(fluid_voice_t *fluid_voice, const CONNECTIONLIST *list, static void add_voice_connections(fluid_voice_t *fluid_voice, const CONNECTIONLIST *list,
......
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