diff --git a/headers/os/midi2/MidiConsumer.h b/headers/os/midi2/MidiConsumer.h index ea561094bf..f2d2da2301 100644 --- a/headers/os/midi2/MidiConsumer.h +++ b/headers/os/midi2/MidiConsumer.h @@ -19,7 +19,7 @@ private: friend class BMidiRoster; friend class BPrivate::BMidiRosterLooper; - BMidiConsumer(const char* name = NULL); + BMidiConsumer(const char *name = NULL); virtual ~BMidiConsumer(); virtual void _Reserved1(); @@ -41,16 +41,16 @@ class BMidiLocalConsumer : public BMidiConsumer { public: - BMidiLocalConsumer(const char* name = NULL); + BMidiLocalConsumer(const char *name = NULL); void SetLatency(bigtime_t latency); - int32 GetProducerID(void); + int32 GetProducerID(); - void SetTimeout(bigtime_t when, void* data); - virtual void Timeout(void* data); + void SetTimeout(bigtime_t when, void *data); + virtual void Timeout(void *data); virtual void Data( - uchar* data, size_t length, bool atomic, bigtime_t time); + uchar *data, size_t length, bool atomic, bigtime_t time); virtual void NoteOff( uchar channel, uchar note, uchar velocity, bigtime_t time); @@ -93,7 +93,7 @@ protected: private: friend class BMidiRoster; - friend int32 _midi_event_thread(void*); + friend int32 _midi_event_thread(void *); virtual void _Reserved1(); virtual void _Reserved2(); diff --git a/src/documentation/haiku_book/midi/midi2localconsumer.xml b/src/documentation/haiku_book/midi/midi2localconsumer.xml index 2b5b1d81fe..e95e8cbdb3 100644 --- a/src/documentation/haiku_book/midi/midi2localconsumer.xml +++ b/src/documentation/haiku_book/midi/midi2localconsumer.xml @@ -105,7 +105,7 @@ - void BMidiLocalConsumer::SetTimeout(bigtime_t when, void* data) + void BMidiLocalConsumer::SetTimeout(bigtime_t when, void *data) Requests that the Timeout() hook will be called at some point @@ -146,7 +146,7 @@ - void BMidiLocalConsumer::Timeout(void* data) + virtual void BMidiLocalConsumer::Timeout(void *data) Hook function that is called per your own request. @@ -158,8 +158,8 @@ - void BMidiLocalConsumer::Data( - uchar* data, size_t length, bool atomic, bigtime_t time) + virtual void BMidiLocalConsumer::Data( + uchar *data, size_t length, bool atomic, bigtime_t time) Invoked when raw MIDI is received @@ -205,7 +205,7 @@ - void BMidiLocalConsumer::NoteOff( + <title>virtual void BMidiLocalConsumer::NoteOff( uchar channel, uchar note, uchar velocity, bigtime_t time) @@ -218,7 +218,7 @@ - void BMidiLocalConsumer::NoteOn( + <title>virtual void BMidiLocalConsumer::NoteOn( uchar channel, uchar note, uchar velocity, bigtime_t time) @@ -231,7 +231,7 @@ - void BMidiLocalConsumer::KeyPressure( + <title>virtual void BMidiLocalConsumer::KeyPressure( uchar channel, uchar note, uchar pressure, bigtime_t time) @@ -244,7 +244,7 @@ - void BMidiLocalConsumer::ControlChange( + <title>virtual void BMidiLocalConsumer::ControlChange( uchar channel, uchar controlNumber, uchar controlValue, bigtime_t time) @@ -257,7 +257,7 @@ - void BMidiLocalConsumer::ProgramChange( + <title>virtual void BMidiLocalConsumer::ProgramChange( uchar channel, uchar programNumber, bigtime_t time) @@ -270,7 +270,7 @@ - void BMidiLocalConsumer::ChannelPressure( + <title>virtual void BMidiLocalConsumer::ChannelPressure( uchar channel, uchar pressure, bigtime_t time) @@ -283,7 +283,7 @@ - void BMidiLocalConsumer::PitchBend( + <title>virtual void BMidiLocalConsumer::PitchBend( uchar channel, uchar lsb, uchar msb, bigtime_t time) @@ -296,7 +296,7 @@ - void BMidiLocalConsumer::SystemExclusive( + <title>virtual void BMidiLocalConsumer::SystemExclusive( void* data, size_t length, bigtime_t time) @@ -320,7 +320,7 @@ - void BMidiLocalConsumer::SystemCommon( + <title>virtual void BMidiLocalConsumer::SystemCommon( uchar status, uchar data1, uchar data2, bigtime_t time) @@ -337,7 +337,7 @@ - void BMidiLocalConsumer::SystemRealTime( + <title>virtual void BMidiLocalConsumer::SystemRealTime( uchar status, bigtime_t time) @@ -350,7 +350,7 @@ - void BMidiLocalConsumer::TempoChange(int32 beatsPerMinute, bigtime_t time) + virtual void BMidiLocalConsumer::TempoChange(int32 beatsPerMinute, bigtime_t time) Invoked when a Tempo Change event is received @@ -362,7 +362,7 @@ - void BMidiLocalConsumer::AllNotesOff(bool justChannel, bigtime_t time) + virtual void BMidiLocalConsumer::AllNotesOff(bool justChannel, bigtime_t time) Not used diff --git a/src/kits/midi2/MidiLocalConsumer.cpp b/src/kits/midi2/MidiLocalConsumer.cpp index 799db1c447..1ab05a5c1c 100644 --- a/src/kits/midi2/MidiLocalConsumer.cpp +++ b/src/kits/midi2/MidiLocalConsumer.cpp @@ -78,7 +78,7 @@ BMidiLocalConsumer::SetLatency(bigtime_t latency_) int32 -BMidiLocalConsumer::GetProducerID(void) +BMidiLocalConsumer::GetProducerID() { return fCurrentProducer; }