aboutsummaryrefslogtreecommitdiff
path: root/src/adlmidi_private.hpp
diff options
context:
space:
mode:
authorWohlstand <admin@wohlnet.ru>2017-10-25 20:43:06 +0300
committerWohlstand <admin@wohlnet.ru>2017-10-25 20:43:06 +0300
commitbf1503ad7150820100e1b7dc83a5bcfbe42c4a1a (patch)
treec9e3011326a8be79190c3215f4cbfbac0149c009 /src/adlmidi_private.hpp
parent3ae7b8fa172671fb7ee6fd3bca88910cc767494b (diff)
downloadlibADLMIDI-bf1503ad7150820100e1b7dc83a5bcfbe42c4a1a.tar.gz
libADLMIDI-bf1503ad7150820100e1b7dc83a5bcfbe42c4a1a.tar.bz2
libADLMIDI-bf1503ad7150820100e1b7dc83a5bcfbe42c4a1a.zip
Small re-factoring of new MIDI event classes for correctness
- MidiTrackPos renamed into MidiTrackRow - TempoMarker renamed into TempoChangePoint
Diffstat (limited to 'src/adlmidi_private.hpp')
-rw-r--r--src/adlmidi_private.hpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/adlmidi_private.hpp b/src/adlmidi_private.hpp
index 83ac72e..0468ff3 100644
--- a/src/adlmidi_private.hpp
+++ b/src/adlmidi_private.hpp
@@ -372,10 +372,10 @@ private:
* Created with purpose to sort events by type in the same position
* (for example, to keep controllers always first than note on events or lower than note-off events)
*/
- class MidiTrackPos
+ class MidiTrackRow
{
public:
- MidiTrackPos();
+ MidiTrackRow();
void reset();
//! Absolute time position in seconds
double time;
@@ -393,15 +393,16 @@ private:
};
/**
- * @brief Tempo maker entry. Used in the MIDI data building function only.
+ * @brief Tempo change point entry. Used in the MIDI data building function only.
*/
- struct TempoMarker
+ struct TempoChangePoint
{
uint64_t absPos;
fraction<uint64_t> tempo;
};
+ //P.S. I declared it here instead of local in-function because C++99 can't process templates with locally-declared structures
- typedef std::list<MidiTrackPos> MidiTrackQueue;
+ typedef std::list<MidiTrackRow> MidiTrackQueue;
// Information about each track
struct PositionNew