diff options
| author | David Robillard <d@drobilla.net> | 2010-12-14 18:13:37 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2010-12-14 18:13:37 +0000 |
| commit | 4b861e603972148a29638cade51cee27ebc997a2 (patch) | |
| tree | 1ff879960fa5abfece3c560a0562b92189d8adf9 /libs/ardour/ardour/session.h | |
| parent | 341c409fa1d77cf1259f044a3045dc3250b7c030 (diff) | |
Rename libmusictime libtimecode (consistent with already used namespace "Timecode").
Move BBT_Time to libtimecode.
git-svn-id: svn://localhost/ardour2/branches/3.0@8271 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/session.h')
| -rw-r--r-- | libs/ardour/ardour/session.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index 4966c19b69..565681aa78 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -43,6 +43,8 @@ #include "midi++/types.h" +#include "timecode/time.h" + #include "ardour/ardour.h" #include "ardour/click.h" #include "ardour/chan_count.h" @@ -50,7 +52,6 @@ #include "ardour/session_configuration.h" #include "ardour/session_event.h" #include "ardour/location.h" -#include "ardour/timecode.h" #include "ardour/interpolation.h" #include "ardour/speakers.h" @@ -449,7 +450,7 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi void sync_time_vars(); - void bbt_time (framepos_t when, BBT_Time&); + void bbt_time (framepos_t when, Timecode::BBT_Time&); void timecode_to_sample(Timecode::Time& timecode, framepos_t& sample, bool use_offset, bool use_subframes) const; void sample_to_timecode(framepos_t sample, Timecode::Time& timecode, bool use_offset, bool use_subframes) const; void timecode_time (Timecode::Time &); @@ -478,7 +479,7 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi TempoMap& tempo_map() { return *_tempo_map; } /// signals the current transport position in frames, bbt and timecode time (in that order) - PBD::Signal3<void, const framepos_t &, const BBT_Time&, const Timecode::Time&> tick; + PBD::Signal3<void, const framepos_t &, const Timecode::BBT_Time&, const Timecode::Time&> tick; /* region info */ |