This commit is contained in:
Jonas Kulla 2014-08-02 06:50:14 +02:00
parent 751fdc599e
commit cc7218c19d
1 changed files with 11 additions and 10 deletions

View File

@ -93,7 +93,7 @@ struct NoteTouchEvent : ChannelEvent
struct PitchBendEvent : ChannelEvent struct PitchBendEvent : ChannelEvent
{ {
uint16_t val; uint16_t val;
}; };
struct CCEvent : ChannelEvent struct CCEvent : ChannelEvent
@ -104,7 +104,7 @@ struct CCEvent : ChannelEvent
struct PCEvent : ChannelEvent struct PCEvent : ChannelEvent
{ {
uint8_t prog; uint8_t prog;
}; };
struct TempoEvent struct TempoEvent
@ -116,7 +116,8 @@ struct MidiEvent
{ {
MidiEventType type; MidiEventType type;
uint32_t delta; uint32_t delta;
union { union
{
ChannelEvent chan; ChannelEvent chan;
NoteOnEvent noteOn; NoteOnEvent noteOn;
NoteOffEvent noteOff; NoteOffEvent noteOff;
@ -472,12 +473,12 @@ struct Track
bool atEnd; bool atEnd;
Track() Track()
: length(0), : length(0),
loopI(-1), loopI(-1),
loopOffsetEnd(0), loopOffsetEnd(0),
loopOffsetStart(0), loopOffsetStart(0),
valid(false), valid(false),
index(0), index(0),
wrapAroundFlag(false), wrapAroundFlag(false),
atEnd(false) atEnd(false)
{} {}
@ -561,11 +562,11 @@ struct MidiSource : ALDataSource, MidiReadHandler
MidiSource(SDL_RWops &ops, MidiSource(SDL_RWops &ops,
bool looped) bool looped)
: freq(SYNTH_SAMPLERATE), : freq(SYNTH_SAMPLERATE),
looped(looped), looped(looped),
dpb(480), dpb(480),
pitchShift(0), pitchShift(0),
genDeltasCarry(0), genDeltasCarry(0),
curTrack(-1) curTrack(-1)
{ {
uint8_t *data = 0; uint8_t *data = 0;