From b0d850ff76b958a712353dfa3f2079fcc4e6c129 Mon Sep 17 00:00:00 2001 From: Jonathan Moore Liles Date: Wed, 7 Oct 2020 18:09:48 -0700 Subject: [PATCH] nonlib/MIDI: Cleanup some type signatures. --- nonlib/MIDI/midievent.C | 8 ++++---- nonlib/MIDI/midievent.H | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/nonlib/MIDI/midievent.C b/nonlib/MIDI/midievent.C index a8d5716..a24f537 100644 --- a/nonlib/MIDI/midievent.C +++ b/nonlib/MIDI/midievent.C @@ -87,19 +87,19 @@ namespace MIDI memcpy( p, &_data, l ); } - int + byte_t midievent::size ( void ) const { return midievent::event_size( opcode() ); } void - midievent::note_velocity ( int vel ) + midievent::note_velocity ( byte_t vel ) { _data.msb = vel & 0x7F; } - unsigned char + byte_t midievent::note ( void ) const { return _data.lsb; @@ -111,7 +111,7 @@ namespace MIDI _data.lsb = note & 0x7F; } - unsigned char + byte_t midievent::note_velocity ( void ) const { return _data.msb; diff --git a/nonlib/MIDI/midievent.H b/nonlib/MIDI/midievent.H index a4e203b..c2f31fd 100644 --- a/nonlib/MIDI/midievent.H +++ b/nonlib/MIDI/midievent.H @@ -59,7 +59,7 @@ namespace MIDI public: - static inline int + static inline byte_t event_size ( byte_t op ) { switch ( op ) @@ -104,15 +104,15 @@ namespace MIDI void opcode ( byte_t o ); void lsb ( byte_t n ); void msb ( byte_t n ); - int lsb ( void ) const; - int msb ( void ) const; + byte_t lsb ( void ) const; + byte_t msb ( void ) const; int pitch ( void ) const; void pitch ( int n ); void data ( byte_t D1, byte_t D2 ); void data ( byte_t *D1, byte_t *D2 ) const; void raw ( byte_t *p, int l) const; - int size ( void ) const; - void note_velocity ( int vel ); + byte_t size ( void ) const; + void note_velocity ( byte_t vel ); bool is_note_on ( void ) const; bool is_note_off ( void ) const; virtual unsigned char note ( void ) const; @@ -198,13 +198,13 @@ namespace MIDI _data.msb = n & 0x7F; } - inline int + inline byte_t midievent::lsb ( void ) const { return _data.lsb; } - inline int + inline byte_t midievent::msb ( void ) const { return _data.msb;