diff options
| author | Hans Baier <hansfbaier@googlemail.com> | 2013-12-18 09:55:15 +0700 |
|---|---|---|
| committer | Hans Baier <hansfbaier@googlemail.com> | 2013-12-18 09:55:15 +0700 |
| commit | caac41a9cb2d86985595c590b151b0197b7b0c4c (patch) | |
| tree | 093e49097e128da1b984d89fb4a1cc5dae14f951 /libs/ardour/ardour/slave.h | |
| parent | bc5d23d5fa69494fa6bbf0afa69f739615b036e9 (diff) | |
midi_clock_slave: fix wrong calculation of loop error
since transport_frame refers to cycle start, the should be position has
to account for position of the midi clock event.
Diffstat (limited to 'libs/ardour/ardour/slave.h')
| -rw-r--r-- | libs/ardour/ardour/slave.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/libs/ardour/ardour/slave.h b/libs/ardour/ardour/slave.h index d736a0948a..364929eaab 100644 --- a/libs/ardour/ardour/slave.h +++ b/libs/ardour/ardour/slave.h @@ -183,13 +183,14 @@ class Slave { class ISlaveSessionProxy { public: virtual ~ISlaveSessionProxy() {} - virtual TempoMap& tempo_map() const { return *((TempoMap *) 0); } - virtual framecnt_t frame_rate() const { return 0; } - virtual pframes_t frames_per_cycle() const { return 0; } - virtual framepos_t audible_frame () const { return 0; } - virtual framepos_t transport_frame () const { return 0; } - virtual pframes_t frames_since_cycle_start () const { return 0; } - virtual framepos_t frame_time () const { return 0; } + virtual TempoMap& tempo_map() const { return *((TempoMap *) 0); } + virtual framecnt_t frame_rate() const { return 0; } + virtual pframes_t frames_per_cycle() const { return 0; } + virtual framepos_t audible_frame () const { return 0; } + virtual framepos_t transport_frame () const { return 0; } + virtual pframes_t frames_since_cycle_start () const { return 0; } + virtual pframes_t sample_time_at_cycle_start() const { return 0; } + virtual framepos_t frame_time () const { return 0; } virtual void request_locate (framepos_t /*frame*/, bool with_roll = false) { (void) with_roll; @@ -211,6 +212,7 @@ class SlaveSessionProxy : public ISlaveSessionProxy { framepos_t audible_frame () const; framepos_t transport_frame () const; pframes_t frames_since_cycle_start () const; + pframes_t sample_time_at_cycle_start() const; framepos_t frame_time () const; void request_locate (framepos_t frame, bool with_roll = false); |