Committed filthy mess of a working copy solely for moving between machines.

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

diff --git a/libs/midi++2/midiport.cc b/libs/midi++2/midiport.cc
index a7c4ba09401f6ea333f0092321c041dbe670b6f3..7f31b909d377f985b71471e03abc1cf195040847 100644 (file)
--- a/libs/midi++2/midiport.cc
+++ b/libs/midi++2/midiport.cc
@@ -32,7 +32,8 @@ using namespace MIDI;
 size_t Port::nports = 0;
 
 Port::Port (PortRequest &req)
-
+       : _currently_in_cycle(false)
+       , _nframes_this_cycle(0)
 {
        _ok = false;  /* derived class must set to true if constructor
                         succeeds.
@@ -87,48 +88,28 @@ Port::~Port ()
  * \return true on success.
  */
 bool
-Port::clock ()
-       
+Port::clock (timestamp_t timestamp)
 {
        static byte clockmsg = 0xf8;
        
        if (_mode != O_RDONLY) {
-               return midimsg (&clockmsg, 1);
+               return midimsg (&clockmsg, 1, timestamp);
        }
        
        return false;
 }
 
 void
-Port::selector_read_callback (Selectable *s, Select::Condition cond) 
-
-{
-       byte buf[64];
-       read (buf, sizeof (buf));
-}
-
-void
-Port::xforms_read_callback (int cond, int fd, void *ptr) 
-
-{
-       byte buf[64];
-       
-       ((Port *)ptr)->read (buf, sizeof (buf));
-}
-
-void
-Port::gtk_read_callback (void *ptr, int fd, int cond)
-
+Port::cycle_start (nframes_t nframes)
 {
-       byte buf[64];
-       
-       ((Port *)ptr)->read (buf, sizeof (buf));
+       _currently_in_cycle = true;
+       _nframes_this_cycle = nframes;
 }
 
 void
-Port::write_callback (byte *msg, unsigned int len, void *ptr)
-       
+Port::cycle_end ()
 {
-       ((Port *)ptr)->write (msg, len);
+       _currently_in_cycle = false;
+       _nframes_this_cycle = 0;
 }