diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-13 12:53:28 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-13 12:53:28 -0400 |
commit | a5a75d5e0d4fb9f2c7db7cf3747da2314c2f9586 (patch) | |
tree | 7a00e05e90a8ada96eaba94aaa655e7391e90fe9 /libs/ardour/ardour/slave.h | |
parent | a5a3f713d596fd3d0157017263d6207b5427d133 (diff) |
fixes to get MTC (and probably MIDI clock) slaving working again
incoming MIDI data has to be parsed EVERY process cycle, not just when Slave::speed_and_position() is called.
The private MIDI::Parser owned by the MTC and MClck slaves was irrelevant, since the port has its own.
See comments in midi_port.h on the strangled inheritance heirarchy.
Diffstat (limited to 'libs/ardour/ardour/slave.h')
-rw-r--r-- | libs/ardour/ardour/slave.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/libs/ardour/ardour/slave.h b/libs/ardour/ardour/slave.h index 1d8a7dd965..c60acb1df7 100644 --- a/libs/ardour/ardour/slave.h +++ b/libs/ardour/ardour/slave.h @@ -64,15 +64,6 @@ class Slave { Slave() { } virtual ~Slave() {} - /** The slave should read any incoming information in this method - * and use it adjust its current idea of reality. If no such - * processing is required, it does need to be implemented. - * - * @param nframes specifies the number of frames-worth of data that - * can be read from any ports used by the slave. - */ - virtual int process (pframes_t) { return 0; } - /** * This is the most important function to implement: * Each process cycle, Session::follow_slave will call this method. @@ -263,7 +254,6 @@ class MTC_Slave : public TimecodeSlave { ~MTC_Slave (); void rebind (MidiPort&); - int process (pframes_t); bool speed_and_position (double&, framepos_t&); bool locked() const; @@ -282,7 +272,6 @@ class MTC_Slave : public TimecodeSlave { private: Session& session; MidiPort* port; - MIDI::Parser parser; PBD::ScopedConnectionList port_connections; PBD::ScopedConnection config_connection; bool can_notify_on_unknown_rate; @@ -420,7 +409,6 @@ class MIDIClock_Slave : public Slave { ~MIDIClock_Slave (); void rebind (MidiPort&); - int process (pframes_t); bool speed_and_position (double&, framepos_t&); bool locked() const; @@ -436,8 +424,6 @@ class MIDIClock_Slave : public Slave { protected: ISlaveSessionProxy* session; - MidiPort* port; - MIDI::Parser parser; PBD::ScopedConnectionList port_connections; /// pulses per quarter note for one MIDI clock frame (default 24) |