diff options
| author | Vitaly Novichkov <Wohlstand@users.noreply.github.com> | 2018-07-31 04:01:11 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-31 04:01:11 +0300 |
| commit | e76c56784fb072b9866aee816ad240127909da16 (patch) | |
| tree | 3eee2c73c979e0dde7a87a72a9ad77bae5e2f00d /src/chips/dosbox | |
| parent | af214cc7ebf2eed2788cea58cb658285adfe528b (diff) | |
| parent | e098e4285af6d565d7b603279ec6e9770ce88436 (diff) | |
| download | libADLMIDI-e76c56784fb072b9866aee816ad240127909da16.tar.gz libADLMIDI-e76c56784fb072b9866aee816ad240127909da16.tar.bz2 libADLMIDI-e76c56784fb072b9866aee816ad240127909da16.zip | |
Merge pull request #148 from jpcima/fix-warnings
fix some warnings
Diffstat (limited to 'src/chips/dosbox')
| -rw-r--r-- | src/chips/dosbox/dbopl.cpp | 1 | ||||
| -rw-r--r-- | src/chips/dosbox/dbopl.h | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/chips/dosbox/dbopl.cpp b/src/chips/dosbox/dbopl.cpp index 2c00db2..4eb79f8 100644 --- a/src/chips/dosbox/dbopl.cpp +++ b/src/chips/dosbox/dbopl.cpp @@ -465,6 +465,7 @@ Bits Operator::TemplateVolume( ) { return vol; } //In sustain phase, but not sustaining, do regular release + /* fall through */ case RELEASE: vol += RateForward( releaseAdd );; if ( GCC_UNLIKELY(vol >= ENV_MAX) ) { diff --git a/src/chips/dosbox/dbopl.h b/src/chips/dosbox/dbopl.h index c265fc6..429735f 100644 --- a/src/chips/dosbox/dbopl.h +++ b/src/chips/dosbox/dbopl.h @@ -75,13 +75,13 @@ typedef enum { sm3AMAM, sm6Start, sm2Percussion, - sm3Percussion, + sm3Percussion } SynthMode; //Shifts for the values contained in chandata variable enum { SHIFT_KSLBASE = 16, - SHIFT_KEYCODE = 24, + SHIFT_KEYCODE = 24 }; struct Operator { @@ -91,7 +91,7 @@ public: MASK_KSR = 0x10, MASK_SUSTAIN = 0x20, MASK_VIBRATO = 0x40, - MASK_TREMOLO = 0x80, + MASK_TREMOLO = 0x80 }; typedef enum { @@ -99,7 +99,7 @@ public: RELEASE, SUSTAIN, DECAY, - ATTACK, + ATTACK } State; VolumeHandler volHandler; |