diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2015-05-25 20:56:03 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2015-06-29 14:18:15 -0400 |
commit | 0f9cac978eff240c6290978986187334d576156c (patch) | |
tree | 8fa1ad1ff36b4d8808a9c9dd45b9159330dd4c7c /libs/ardour/ardour/slave.h | |
parent | e20242c242bac17548490ad3a234955ea5f2a09f (diff) |
(re)implement Yevgeny's LTC branch changes in the context of ardour-merge-from-tracks (just the libs/* section)
Diffstat (limited to 'libs/ardour/ardour/slave.h')
-rw-r--r-- | libs/ardour/ardour/slave.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/libs/ardour/ardour/slave.h b/libs/ardour/ardour/slave.h index 2beacd7bf7..bda47ceba0 100644 --- a/libs/ardour/ardour/slave.h +++ b/libs/ardour/ardour/slave.h @@ -237,19 +237,21 @@ struct LIBARDOUR_API SafeTime { class LIBARDOUR_API TimecodeSlave : public Slave { public: - TimecodeSlave () {} - - virtual Timecode::TimecodeFormat apparent_timecode_format() const = 0; - - /* this is intended to be used by a UI and polled from a timeout. it should - return a string describing the current position of the TC source. it - should NOT do any computation, but should use a cached value - of the TC source position. - */ - virtual std::string approximate_current_position() const = 0; - - framepos_t timecode_offset; - bool timecode_negative_offset; + TimecodeSlave () {} + + virtual Timecode::TimecodeFormat apparent_timecode_format() const = 0; + + /* this is intended to be used by a UI and polled from a timeout. it should + return a string describing the current position of the TC source. it + should NOT do any computation, but should use a cached value + of the TC source position. + */ + virtual std::string approximate_current_position() const = 0; + + framepos_t timecode_offset; + bool timecode_negative_offset; + + PBD::Signal1<void, bool> ActiveChanged; }; class LIBARDOUR_API MTC_Slave : public TimecodeSlave { @@ -273,8 +275,6 @@ class LIBARDOUR_API MTC_Slave : public TimecodeSlave { std::string approximate_current_position() const; std::string approximate_current_delta() const; - PBD::Signal1<void, bool> ActiveChanged; - private: Session& session; MidiPort* port; |