Fix up tests now that operator= on ScopedConnection disconnects the old connection...

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

diff --git a/libs/midi++2/channel.cc b/libs/midi++2/channel.cc
index e96a4b4edc88ce4fd211e623a34b4e864154f4c6..66ce5ed71ca6ad99f407d7f23f01d94b0ac8cca6 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 (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;