diff options
author | Wohlstand <admin@wohlnet.ru> | 2020-02-22 13:04:39 +0300 |
---|---|---|
committer | Wohlstand <admin@wohlnet.ru> | 2020-02-22 13:04:39 +0300 |
commit | 6ae9ca1265f8249af680f366b5a56934c7b2d7bb (patch) | |
tree | db29afc329050729852bfcc86b8b3419ad74ea15 /src/midi_sequencer.hpp | |
parent | b92112685b1d1ba0ae376069bc42d61300a97fa1 (diff) | |
parent | 58c5becbdfd451b4181661a5ff2d3e556e4e8501 (diff) | |
download | libADLMIDI-6ae9ca1265f8249af680f366b5a56934c7b2d7bb.tar.gz libADLMIDI-6ae9ca1265f8249af680f366b5a56934c7b2d7bb.tar.bz2 libADLMIDI-6ae9ca1265f8249af680f366b5a56934c7b2d7bb.zip |
Merge branch 'master' into wip-new-embedded-banks
Diffstat (limited to 'src/midi_sequencer.hpp')
-rw-r--r-- | src/midi_sequencer.hpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/midi_sequencer.hpp b/src/midi_sequencer.hpp index 6832492..7ff864c 100644 --- a/src/midi_sequencer.hpp +++ b/src/midi_sequencer.hpp @@ -1,7 +1,7 @@ /* * BW_Midi_Sequencer - MIDI Sequencer for C++ * - * Copyright (c) 2015-2019 Vitaly Novichkov <admin@wohlnet.ru> + * Copyright (c) 2015-2020 Vitaly Novichkov <admin@wohlnet.ru> * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the "Software"), @@ -23,8 +23,8 @@ */ #pragma once -#ifndef BISQUIT_AND_WOHLSTANDS_MIDI_SEQUENCER_HHHHPPP -#define BISQUIT_AND_WOHLSTANDS_MIDI_SEQUENCER_HHHHPPP +#ifndef BW_MIDI_SEQUENCER_HHHHPPP +#define BW_MIDI_SEQUENCER_HHHHPPP #include <list> #include <vector> @@ -454,7 +454,7 @@ private: { if(caughtStackEnd && (stackLevel >= 0) && (stackLevel < static_cast<int>(stack.size()))) { - const LoopStackEntry &e = stack[stackLevel]; + const LoopStackEntry &e = stack[static_cast<size_t>(stackLevel)]; if(e.infinity || (!e.infinity && e.loops > 0)) return true; } @@ -474,7 +474,7 @@ private: LoopStackEntry &getCurStack() { if((stackLevel >= 0) && (stackLevel < static_cast<int>(stack.size()))) - return stack[stackLevel]; + return stack[static_cast<size_t>(stackLevel)]; if(stack.empty()) { LoopStackEntry d; @@ -792,4 +792,4 @@ private: }; -#endif /* BISQUIT_AND_WOHLSTANDS_MIDI_SEQUENCER_HHHHPPP */ +#endif /* BW_MIDI_SEQUENCER_HHHHPPP */ |