--- linuxsampler/trunk/src/drivers/midi/MidiInputPort.h 2005/06/22 07:23:48 674 +++ linuxsampler/trunk/src/drivers/midi/MidiInputPort.h 2005/06/22 22:09:28 675 @@ -28,6 +28,7 @@ #include "../../common/Mutex.h" #include "../../common/LinuxSamplerException.h" #include "../DeviceParameter.h" +#include "midi.h" #include "MidiInputDevice.h" #include "../../engines/common/EngineChannel.h" @@ -35,6 +36,7 @@ // just symbol prototyping class MidiInputDevice; + class EngineChannel; class MidiInputPort { public: @@ -42,29 +44,6 @@ ///////////////////////////////////////////////////////////////// // type definitions - /** - * MIDI channels - */ - enum midi_chan_t { - midi_chan_1 = 0, - midi_chan_2 = 1, - midi_chan_3 = 2, - midi_chan_4 = 3, - midi_chan_5 = 4, - midi_chan_6 = 5, - midi_chan_7 = 6, - midi_chan_8 = 7, - midi_chan_9 = 8, - midi_chan_10 = 9, - midi_chan_11 = 10, - midi_chan_12 = 11, - midi_chan_13 = 12, - midi_chan_14 = 13, - midi_chan_15 = 14, - midi_chan_16 = 15, - midi_chan_all = 16 - }; - /** MIDI Port Parameter 'NAME' * * Used to assign an arbitrary name to the MIDI port. @@ -234,7 +213,7 @@ virtual ~MidiInputPort(); friend class MidiInputDevice; - + private: EngineChannel* pPreviousProgramChangeEngineChannel; ///< Points to the engine channel which was connected by the previous DispatchProgramChange() call. };