diff options
author | Vitaly Novichkov <admin@wohlnet.ru> | 2018-06-21 08:04:31 +0300 |
---|---|---|
committer | Vitaly Novichkov <admin@wohlnet.ru> | 2018-06-21 08:04:31 +0300 |
commit | 2fcf34cdc43a7ef546887448f49c4cfa084ba935 (patch) | |
tree | fac015e6d2d61844130155a970fd80e5ee3e39ec /src/midi_sequencer.hpp | |
parent | 1b3d6d1a95337e7c87af5eac139842f0e454f768 (diff) | |
download | libADLMIDI-2fcf34cdc43a7ef546887448f49c4cfa084ba935.tar.gz libADLMIDI-2fcf34cdc43a7ef546887448f49c4cfa084ba935.tar.bz2 libADLMIDI-2fcf34cdc43a7ef546887448f49c4cfa084ba935.zip |
MIDI Sequencer: Small clean-up
Diffstat (limited to 'src/midi_sequencer.hpp')
-rw-r--r-- | src/midi_sequencer.hpp | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/midi_sequencer.hpp b/src/midi_sequencer.hpp index a8e04d0..89b4619 100644 --- a/src/midi_sequencer.hpp +++ b/src/midi_sequencer.hpp @@ -189,7 +189,8 @@ class BW_MidiSequencer { //! Was track began playing bool began; - char padding[7]; + //! Reserved + char __padding[7]; //! Waiting time before next event in seconds double wait; //! Absolute time position on the track in seconds @@ -197,15 +198,19 @@ class BW_MidiSequencer //! Track information struct TrackInfo { - size_t ptr; //! Delay to next event in a track uint64_t delay; //! Last handled event type - int lastHandledEvent; - char padding2[4]; + int32_t lastHandledEvent; + //! Reserved + char __padding2[4]; //! MIDI Events queue position iterator MidiTrackQueue::iterator pos; - TrackInfo(): ptr(0), delay(0), lastHandledEvent(0) {} + + TrackInfo() : + delay(0), + lastHandledEvent(0) + {} }; std::vector<TrackInfo> track; Position(): began(false), wait(0.0), absTimePosition(0.0), track() @@ -243,7 +248,7 @@ class BW_MidiSequencer * @param evt MIDI event entry * @param status Recent event type, -1 returned when end of track event was handled. */ - void handleEvent(size_t tk, const MidiEvent &evt, int &status); + void handleEvent(size_t tk, const MidiEvent &evt, int32_t &status); public: /** |