Zebediah Figura <z.figura12(a)gmail.com> writes:
- /* Supports SoundBank, Cue index, Cue instance */ - if (xd->type == XACTNOTIFICATIONTYPE_CUEPREPARED || xd->type == XACTNOTIFICATIONTYPE_CUEPLAY || - xd->type == XACTNOTIFICATIONTYPE_CUESTOP || xd->type == XACTNOTIFICATIONTYPE_CUEDESTROYED || - xd->type == XACTNOTIFICATIONTYPE_MARKER || xd->type == XACTNOTIFICATIONTYPE_LOCALVARIABLECHANGED) + switch (xd->type) { - flags = NOTIFY_SoundBank | NOTIFY_cueIndex | NOTIFY_Cue; - } - /* Supports WaveBank */ - else if (xd->type == XACTNOTIFICATIONTYPE_WAVEBANKDESTROYED || xd->type == XACTNOTIFICATIONTYPE_WAVEBANKPREPARED || - xd->type == XACTNOTIFICATIONTYPE_WAVEBANKSTREAMING_INVALIDCONTENT) - { - flags = NOTIFY_WaveBank; - } - /* Supports NOTIFY_SoundBank */ - else if (xd->type == XACTNOTIFICATIONTYPE_SOUNDBANKDESTROYED) - { - flags = NOTIFY_SoundBank; - } - /* Supports WaveBank, Wave index, Wave instance */ - else if (xd->type == XACTNOTIFICATIONTYPE_WAVEPREPARED || xd->type == XACTNOTIFICATIONTYPE_WAVEDESTROYED) - { - flags = NOTIFY_WaveBank | NOTIFY_waveIndex | NOTIFY_Wave; - } - /* Supports SoundBank, SoundBank, Cue index, Cue instance, WaveBank, Wave instance */ - else if (xd->type == XACTNOTIFICATIONTYPE_WAVEPLAY || xd->type == XACTNOTIFICATIONTYPE_WAVESTOP || - xd->type == XACTNOTIFICATIONTYPE_WAVELOOPED) - { - flags = NOTIFY_SoundBank | NOTIFY_cueIndex | NOTIFY_Cue | NOTIFY_WaveBank | NOTIFY_Wave; + case XACTNOTIFICATIONTYPE_CUEPREPARED: + case XACTNOTIFICATIONTYPE_CUEPLAY: + case XACTNOTIFICATIONTYPE_CUESTOP: + case XACTNOTIFICATIONTYPE_CUEDESTROYED: + case XACTNOTIFICATIONTYPE_MARKER: + case XACTNOTIFICATIONTYPE_LOCALVARIABLECHANGED: + flags = NOTIFY_SoundBank | NOTIFY_cueIndex | NOTIFY_Cue; + break; + + case XACTNOTIFICATIONTYPE_WAVEBANKDESTROYED: + case XACTNOTIFICATIONTYPE_WAVEBANKPREPARED: + case XACTNOTIFICATIONTYPE_WAVEBANKSTREAMING_INVALIDCONTENT: + flags = NOTIFY_WaveBank; + break; + + case XACTNOTIFICATIONTYPE_SOUNDBANKDESTROYED: + flags = NOTIFY_SoundBank; + break;
There's a reason that this wasn't a switch statement ;-) ../wine/dlls/xactengine3_7/xact_dll.c: In function ‘unwrap_notificationdesc’: ../wine/dlls/xactengine3_7/xact_dll.c:1139:9: error: case label does not reduce to an integer constant ../wine/dlls/xactengine3_7/xact_dll.c:1140:9: error: case label does not reduce to an integer constant ../wine/dlls/xactengine3_7/xact_dll.c:1141:9: error: case label does not reduce to an integer constant ../wine/dlls/xactengine3_7/xact_dll.c:1142:9: error: case label does not reduce to an integer constant ../wine/dlls/xactengine3_7/xact_dll.c:1143:9: error: case label does not reduce to an integer constant ../wine/dlls/xactengine3_7/xact_dll.c:1144:9: error: case label does not reduce to an integer constant ../wine/dlls/xactengine3_7/xact_dll.c:1148:9: error: case label does not reduce to an integer constant ../wine/dlls/xactengine3_7/xact_dll.c:1149:9: error: case label does not reduce to an integer constant ../wine/dlls/xactengine3_7/xact_dll.c:1150:9: error: case label does not reduce to an integer constant ../wine/dlls/xactengine3_7/xact_dll.c:1154:9: error: case label does not reduce to an integer constant ../wine/dlls/xactengine3_7/xact_dll.c:1165:9: error: case label does not reduce to an integer constant ../wine/dlls/xactengine3_7/xact_dll.c:1166:9: error: case label does not reduce to an integer constant make: *** [Makefile:180948: dlls/xactengine2_4/xact_dll.o] Error 1 -- Alexandre Julliard julliard(a)winehq.org