added support for MidiMetaEvents to midiEvent, added MidiMetaPanning event

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1912 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Tobias Doerffel
2008-12-14 00:45:05 +00:00
parent 53a9b25fb1
commit 5cd89eafec
2 changed files with 14 additions and 1 deletions

View File

@@ -1,3 +1,9 @@
2008-12-14 Tobias Doerffel <tobydox/at/users/dot/sourceforge/dot/net>
* include/midi.h:
- added support for MidiMetaEvents to midiEvent
- added MidiMetaPanning event
2008-12-12 Andrew Kelley <superjoe30/at/gmail/dot/com>
* include/note.h:

View File

@@ -63,6 +63,7 @@ enum MidiEventTypes
enum MidiMetaEvents
{
MidiMetaInvalid = 0x00,
MidiCopyright = 0x02,
MidiTrackName = 0x03,
MidiInstName = 0x04,
@@ -75,7 +76,9 @@ enum MidiMetaEvents
MidiSMPTEOffset = 0x54,
MidiTimeSignature = 0x58,
MidiKeySignature = 0x59,
MidiSequencerEvent = 0x7f
MidiSequencerEvent = 0x7f,
MidiMetaCustom = 0x80,
MidiNotePanning
} ;
@@ -92,6 +95,7 @@ struct midiEvent
Sint16 _param1 = 0,
Sint16 _param2 = 0 ) :
m_type( _type ),
m_metaEvent( MidiMetaInvalid ),
m_channel( _channel ),
m_sysExData( NULL )
{
@@ -101,6 +105,7 @@ struct midiEvent
midiEvent( MidiEventTypes _type, const char * _sysex_data,
int _data_len ) :
m_type( _type ),
m_metaEvent( MidiMetaInvalid ),
m_channel( 0 ),
m_sysExData( _sysex_data )
{
@@ -109,6 +114,7 @@ struct midiEvent
midiEvent( const midiEvent & _copy ) :
m_type( _copy.m_type ),
m_metaEvent( _copy.m_metaEvent ),
m_channel( _copy.m_channel ),
m_data( _copy.m_data ),
m_sysExData( _copy.m_sysExData )
@@ -147,6 +153,7 @@ struct midiEvent
MidiEventTypes m_type; // MIDI event type
MidiMetaEvents m_metaEvent; // Meta event (mostly unused)
Sint8 m_channel; // MIDI channel
union
{