fix breakage for optimized build caused by semantically critical statement inside...

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

diff --git a/libs/midi++2/midi++/channel.h b/libs/midi++2/midi++/channel.h
index 617ae1443079d8514a95dba9cdbd8fa48994c478..d00ce700c542997b183e7de2dfe3111902c552d3 100644 (file)
--- a/libs/midi++2/midi++/channel.h
+++ b/libs/midi++2/midi++/channel.h
@@ -22,8 +22,7 @@
 
 #include <queue>
 
-#include <boost/signals2.hpp>
-#include "pbd/scoped_connections.h"
+#include "pbd/signals.h"
 
 #include "midi++/types.h"
 #include "midi++/parser.h"
@@ -42,7 +41,7 @@ class Channel : public PBD::ScopedConnectionList {
   public:
        Channel (byte channel_number, Port &);
 
-       Port &midi_port()               { return _port; }
+       Port &midi_port()           { return _port; }
        byte channel()                  { return _channel_number; }
        byte program()                  { return _program_number; }
        byte bank()                     { return _bank_number; }
@@ -113,11 +112,10 @@ class Channel : public PBD::ScopedConnectionList {
 
   protected:
        friend class Port;
-       void connect_input_signals ();
-       void connect_output_signals ();
+       void connect_signals ();
 
   private:
-       Port & _port;
+       Port& _port;
 
        /* Current channel values */
        byte               _channel_number;
@@ -143,7 +141,7 @@ class Channel : public PBD::ScopedConnectionList {
        bool               _mono;
        size_t             _notes_on;
 
-       void reset (timestamp_t timestamp, nframes_t nframes, bool notes_off = true);
+       void reset (timestamp_t timestamp, framecnt_t nframes, bool notes_off = true);
        
        void process_note_off (Parser &, EventTwoBytes *);
        void process_note_on (Parser &, EventTwoBytes *);