diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2012-12-14 16:18:47 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-12-14 16:18:47 +0000 |
| commit | c9c94ca1c247adfc1a78fda0eda185a9a7589696 (patch) | |
| tree | 52d520020e7ff2455b8abf83fbcc69a4ba02b9ca /libs/ardour/ardour/slave.h | |
| parent | fd1414f6668712c641da6c7d51f4b3e2bf6fae5a (diff) | |
merge robin gareus' libltc into ardour source tree for convenience
git-svn-id: svn://localhost/ardour2/branches/3.0@13665 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/slave.h')
| -rw-r--r-- | libs/ardour/ardour/slave.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libs/ardour/ardour/slave.h b/libs/ardour/ardour/slave.h index d5cb79c522..471a632f6e 100644 --- a/libs/ardour/ardour/slave.h +++ b/libs/ardour/ardour/slave.h @@ -29,14 +29,12 @@ #include "pbd/signals.h" #include "timecode/time.h" +#include "ltc/ltc.h" #include "ardour/types.h" #include "midi++/parser.h" #include "midi++/types.h" -#ifdef HAVE_LTC -#include <ltc.h> -#endif /* used for approximate_current_delta(): */ #define PLUSMINUS(A) ( ((A)<0) ? "-" : (((A)>0) ? "+" : "\u00B1") ) @@ -335,7 +333,6 @@ class MTC_Slave : public TimecodeSlave { void parameter_changed(std::string const & p); }; -#ifdef HAVE_LTC class LTC_Slave : public TimecodeSlave { public: LTC_Slave (Session&); @@ -403,7 +400,6 @@ public: double e2; ///< second order loop error double b, c; ///< DLL filter coefficients }; -#endif class MIDIClock_Slave : public Slave { public: |