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 | |
| 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')
| -rw-r--r-- | src/adlmidi_bankmap.h | 2 | ||||
| -rw-r--r-- | src/adlmidi_private.hpp | 6 | ||||
| -rw-r--r-- | src/chips/dosbox/dbopl.cpp | 1 | ||||
| -rw-r--r-- | src/chips/dosbox/dbopl.h | 8 | ||||
| -rw-r--r-- | src/midi_sequencer.hpp | 2 |
5 files changed, 10 insertions, 9 deletions
diff --git a/src/adlmidi_bankmap.h b/src/adlmidi_bankmap.h index 29643f1..5d747d1 100644 --- a/src/adlmidi_bankmap.h +++ b/src/adlmidi_bankmap.h @@ -74,7 +74,7 @@ private: enum { hash_bits = 8, /* worst case # of collisions: 128^2/2^hash_bits */ - hash_buckets = 1 << hash_bits, + hash_buckets = 1 << hash_bits }; public: diff --git a/src/adlmidi_private.hpp b/src/adlmidi_private.hpp index 6fe7ad2..0a7a1bb 100644 --- a/src/adlmidi_private.hpp +++ b/src/adlmidi_private.hpp @@ -601,7 +601,7 @@ public: enum { MaxNumPhysChans = 2, - MaxNumPhysItemCount = MaxNumPhysChans, + MaxNumPhysItemCount = MaxNumPhysChans }; /** @@ -858,7 +858,7 @@ public: Sustain_None = 0x00, Sustain_Pedal = 0x01, Sustain_Sostenuto = 0x02, - Sustain_ANY = Sustain_Pedal | Sustain_Sostenuto, + Sustain_ANY = Sustain_Pedal | Sustain_Sostenuto }; uint32_t sustained; char _padding[6]; @@ -999,7 +999,7 @@ public: Mode_GM = 0x00, Mode_GS = 0x01, Mode_XG = 0x02, - Mode_GM2 = 0x04, + Mode_GM2 = 0x04 }; //! MIDI Synthesizer mode uint32_t m_synthMode; 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; diff --git a/src/midi_sequencer.hpp b/src/midi_sequencer.hpp index 2009892..a8cbfac 100644 --- a/src/midi_sequencer.hpp +++ b/src/midi_sequencer.hpp @@ -132,7 +132,7 @@ class BW_MidiSequencer //! [Non-Standard] Loop End point with support of multi-loops ST_LOOPSTACK_BREAK = 0xE6,//size == 0 <CUSTOM> //! [Non-Standard] Callback Trigger - ST_CALLBACK_TRIGGER = 0xE7,//size == 1 <CUSTOM> + ST_CALLBACK_TRIGGER = 0xE7//size == 1 <CUSTOM> }; //! Main type of event uint8_t type; |