summaryrefslogtreecommitdiff
path: root/libs/ardour/ardour/slave.h
diff options
context:
space:
mode:
authorHans Baier <hansfbaier@googlemail.com>2009-02-12 10:14:22 +0000
committerHans Baier <hansfbaier@googlemail.com>2009-02-12 10:14:22 +0000
commitb1cd1835113a21670efc0ad1264c7df160a93147 (patch)
tree3cc049e723e48b03759135a7e739502c9188d455 /libs/ardour/ardour/slave.h
parent0522149d208d92bd68898dda521a6ebda4999c93 (diff)
* MIDI clock slave: issues 2541 and 2542 ready for testing (cant test myself due to lack of hardware)
* tempo.cc/tempo.h: formatting / whitespace git-svn-id: svn://localhost/ardour2/branches/3.0@4538 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/slave.h')
-rw-r--r--libs/ardour/ardour/slave.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/libs/ardour/ardour/slave.h b/libs/ardour/ardour/slave.h
index 1f2610e028..fe764d555d 100644
--- a/libs/ardour/ardour/slave.h
+++ b/libs/ardour/ardour/slave.h
@@ -266,10 +266,12 @@ class MIDIClock_Slave : public Slave, public sigc::trackable {
void reset ();
void start (MIDI::Parser& parser, nframes_t timestamp);
+ void contineu (MIDI::Parser& parser, nframes_t timestamp);
void stop (MIDI::Parser& parser, nframes_t timestamp);
+ void position (MIDI::Parser& parser, MIDI::byte* message, size_t size);
// we can't use continue because it is a C++ keyword
- void contineu (MIDI::Parser& parser, nframes_t timestamp);
void calculate_one_ppqn_in_frames_at(nframes_t time);
+ nframes_t calculate_song_position(uint16_t song_position_in_sixteenth_notes);
void calculate_filter_coefficients();
void update_midi_clock (MIDI::Parser& parser, nframes_t timestamp);
void read_current (SafeTime *) const;