merge with master

[ardour.git] / libs / midi++2 / channel.cc

diff --git a/libs/midi++2/channel.cc b/libs/midi++2/channel.cc
index e96a4b4edc88ce4fd211e623a34b4e864154f4c6..ed8f4da5bc2b56c7910fd263f5aa7140a4d306ae 100644 (file)
--- a/libs/midi++2/channel.cc
+++ b/libs/midi++2/channel.cc
@@ -25,7 +25,8 @@
 
 using namespace MIDI;
 
-Channel::Channel (byte channelnum, Port &p) : _port (p)
+Channel::Channel (MIDI::byte channelnum, Port &p) 
+       : _port (p)
 {
        _channel_number = channelnum;
 
@@ -47,7 +48,7 @@ Channel::connect_signals ()
 }
 
 void
-Channel::reset (timestamp_t timestamp, nframes_t /*nframes*/, bool notes_off)
+Channel::reset (timestamp_t timestamp, framecnt_t /*nframes*/, bool notes_off)
 {
        _program_number = _channel_number;
        _bank_number = 0;
@@ -181,13 +182,13 @@ Channel::process_controller (Parser & /*parser*/, EventTwoBytes *tb)
 }
 
 void
-Channel::process_program_change (Parser & /*parser*/, byte val) 
+Channel::process_program_change (Parser & /*parser*/, MIDI::byte val) 
 {
        _program_number = val;
 }
 
 void
-Channel::process_chanpress (Parser & /*parser*/, byte val) 
+Channel::process_chanpress (Parser & /*parser*/, MIDI::byte val) 
 {
        _chanpress = val;
 }
@@ -214,7 +215,7 @@ Channel::process_reset (Parser & /*parser*/)
  * \return true if success
  */
 bool
-Channel::channel_msg (byte id, byte val1, byte val2, timestamp_t timestamp)
+Channel::channel_msg (MIDI::byte id, MIDI::byte val1, MIDI::byte val2, timestamp_t timestamp)
 {
        unsigned char msg[3];
        int len = 0;