add missing parts of previous commit re: libmidi++ and JACK (files not saved in emacs...

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

diff --git a/libs/midi++2/midi++/port.h b/libs/midi++2/midi++/port.h
index a2315f72844c7c1cc467b6cac9506227bbfcfa11..4e63d41141653f8e976e1acbf679f6e54eb06869 100644 (file)
--- a/libs/midi++2/midi++/port.h
+++ b/libs/midi++2/midi++/port.h
@@ -22,16 +22,11 @@
 #include <string>
 #include <iostream>
 
-#include <jack/types.h>
-
 #include "pbd/xml++.h"
 #include "pbd/crossthread.h"
 #include "pbd/signals.h"
 #include "pbd/ringbuffer.h"
 
-#include "evoral/Event.hpp"
-#include "evoral/EventRingBuffer.hpp"
-
 #include "midi++/types.h"
 #include "midi++/parser.h"
 
@@ -51,15 +46,8 @@ class Port {
        Port (const XMLNode&);
        virtual ~Port ();
 
-       XMLNode& get_state () const;
-       void set_state (const XMLNode&);
-
-       // FIXME: make Manager a friend of port so these can be hidden?
-
-       /* Only for use by MidiManager.  Don't ever call this. */
-       virtual void cycle_start (pframes_t nframes) {}
-       /* Only for use by MidiManager.  Don't ever call this. */
-       virtual void cycle_end () {}
+       virtual XMLNode& get_state () const;
+       virtual void set_state (const XMLNode&);
 
        /** Write a message to port.
         * @param msg Raw MIDI message to send
@@ -67,7 +55,7 @@ class Port {
         * @param timestamp Time stamp in frames of this message (relative to cycle start)
         * @return number of bytes successfully written
         */
-       virtual int write (byte *msg, size_t msglen, timestamp_t timestamp) = 0;
+       virtual int write (const byte *msg, size_t msglen, timestamp_t timestamp) = 0;
 
        /** Read raw bytes from a port.
         * @param buf memory to store read data in
@@ -82,7 +70,7 @@ class Port {
         * executes any part of a JACK process callback (will 
         * simply return immediately in that situation).
         */
-       virtual void drain (int check_interval_usecs) {}
+       virtual void drain (int /* check_interval_usecs */) {}
 
        /** Write a message to port.
         * @return true on success.