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 | |
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')
-rw-r--r-- | libs/ardour/ardour/bbt_time.h | 74 | ||||
-rw-r--r-- | libs/ardour/ardour/location.h | 16 | ||||
-rw-r--r-- | libs/ardour/ardour/region.h | 2 | ||||
-rw-r--r-- | libs/ardour/ardour/session.h | 7 | ||||
-rw-r--r-- | libs/ardour/ardour/tempo.h | 72 | ||||
-rw-r--r-- | libs/ardour/ardour/ticker.h | 12 | ||||
-rw-r--r-- | libs/ardour/ardour/timecode.h | 2 | ||||
-rw-r--r-- | libs/ardour/ardour/types.h | 46 | ||||
-rw-r--r-- | libs/ardour/audio_unit.cc | 6 | ||||
-rw-r--r-- | libs/ardour/session_midi.cc | 4 | ||||
-rw-r--r-- | libs/ardour/session_process.cc | 6 | ||||
-rw-r--r-- | libs/ardour/session_time.cc | 10 | ||||
-rw-r--r-- | libs/ardour/tempo.cc | 2 | ||||
-rw-r--r-- | libs/ardour/test/bbt_test.cpp | 2 | ||||
-rw-r--r-- | libs/ardour/test/bbt_test.h | 2 | ||||
-rw-r--r-- | libs/ardour/test/midi_clock_slave_test.h | 4 | ||||
-rw-r--r-- | libs/ardour/ticker.cc | 4 |
17 files changed, 103 insertions, 168 deletions
diff --git a/libs/ardour/ardour/bbt_time.h b/libs/ardour/ardour/bbt_time.h deleted file mode 100644 index 2157e794a2..0000000000 --- a/libs/ardour/ardour/bbt_time.h +++ /dev/null @@ -1,74 +0,0 @@ -/* - Copyright (C) 2002-2009 Paul Davis - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -*/ - -#ifndef __ardour_bbt_time_h__ -#define __ardour_bbt_time_h__ - -#include <ostream> -#include <stdint.h> -#include <iomanip> - -namespace ARDOUR { - -struct BBT_Time { - uint32_t bars; - uint32_t beats; - uint32_t ticks; - - BBT_Time() { - bars = 1; - beats = 1; - ticks = 0; - } - - BBT_Time (uint32_t ba, uint32_t be, uint32_t t) - : bars (ba), beats (be), ticks (t) {} - - bool operator< (const BBT_Time& other) const { - return bars < other.bars || - (bars == other.bars && beats < other.beats) || - (bars == other.bars && beats == other.beats && ticks < other.ticks); - } - - bool operator== (const BBT_Time& other) const { - return bars == other.bars && beats == other.beats && ticks == other.ticks; - } -}; - -} - -inline std::ostream& -operator<< (std::ostream& o, const ARDOUR::BBT_Time& bbt) -{ - o << bbt.bars << '|' << bbt.beats << '|' << bbt.ticks; - return o; -} - -inline std::ostream& -print_padded (std::ostream& o, const ARDOUR::BBT_Time& bbt) -{ - o << std::setfill ('0') << std::right - << std::setw (3) << bbt.bars << "|" - << std::setw (2) << bbt.beats << "|" - << std::setw (4) << bbt.ticks; - - return o; -} - -#endif /* __ardour_bbt_time_h__ */ diff --git a/libs/ardour/ardour/location.h b/libs/ardour/ardour/location.h index c2da2c04cb..9639d9a34d 100644 --- a/libs/ardour/ardour/location.h +++ b/libs/ardour/ardour/location.h @@ -115,14 +115,14 @@ class Location : public SessionHandleRef, public PBD::StatefulDestructible void recompute_frames_from_bbt (); private: - std::string _name; - framepos_t _start; - BBT_Time _bbt_start; - framepos_t _end; - BBT_Time _bbt_end; - Flags _flags; - bool _locked; - PositionLockStyle _position_lock_style; + std::string _name; + framepos_t _start; + Timecode::BBT_Time _bbt_start; + framepos_t _end; + Timecode::BBT_Time _bbt_end; + Flags _flags; + bool _locked; + PositionLockStyle _position_lock_style; void set_mark (bool yn); bool set_flag_internal (bool yn, Flags flag); diff --git a/libs/ardour/ardour/region.h b/libs/ardour/ardour/region.h index ed4923bc40..8a3cb1d9f5 100644 --- a/libs/ardour/ardour/region.h +++ b/libs/ardour/ardour/region.h @@ -369,7 +369,7 @@ class Region framecnt_t _last_length; framepos_t _last_position; mutable RegionEditState _first_edit; - BBT_Time _bbt_time; + Timecode::BBT_Time _bbt_time; AnalysisFeatureList _transients; mutable uint64_t _read_data_count; ///< modified in read() 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 */ diff --git a/libs/ardour/ardour/tempo.h b/libs/ardour/ardour/tempo.h index a1ad8d1f31..de45c788f1 100644 --- a/libs/ardour/ardour/tempo.h +++ b/libs/ardour/ardour/tempo.h @@ -78,15 +78,15 @@ class Meter { class MetricSection { public: - MetricSection (const BBT_Time& start) + MetricSection (const Timecode::BBT_Time& start) : _start (start), _frame (0), _movable (true) {} MetricSection (framepos_t start) : _frame (start), _movable (true) {} virtual ~MetricSection() {} - const BBT_Time& start() const { return _start; } - framepos_t frame() const { return _frame; } + const Timecode::BBT_Time& start() const { return _start; } + framepos_t frame() const { return _frame; } void set_movable (bool yn) { _movable = yn; } bool movable() const { return _movable; } @@ -95,7 +95,7 @@ class MetricSection { _frame = f; } - virtual void set_start (const BBT_Time& w) { + virtual void set_start (const Timecode::BBT_Time& w) { _start = w; } @@ -108,14 +108,14 @@ class MetricSection { int compare (MetricSection *, bool) const; private: - BBT_Time _start; - framepos_t _frame; - bool _movable; + Timecode::BBT_Time _start; + framepos_t _frame; + bool _movable; }; class MeterSection : public MetricSection, public Meter { public: - MeterSection (const BBT_Time& start, double bpb, double note_type) + MeterSection (const Timecode::BBT_Time& start, double bpb, double note_type) : MetricSection (start), Meter (bpb, note_type) {} MeterSection (framepos_t start, double bpb, double note_type) : MetricSection (start), Meter (bpb, note_type) {} @@ -128,7 +128,7 @@ class MeterSection : public MetricSection, public Meter { class TempoSection : public MetricSection, public Tempo { public: - TempoSection (const BBT_Time& start, double qpm, double note_type) + TempoSection (const Timecode::BBT_Time& start, double qpm, double note_type) : MetricSection (start), Tempo (qpm, note_type) {} TempoSection (framepos_t start, double qpm, double note_type) : MetricSection (start), Tempo (qpm, note_type) {} @@ -151,18 +151,18 @@ class TempoMetric { void set_tempo (const Tempo& t) { _tempo = &t; } void set_meter (const Meter& m) { _meter = &m; } void set_frame (framepos_t f) { _frame = f; } - void set_start (const BBT_Time& t) { _start = t; } + void set_start (const Timecode::BBT_Time& t) { _start = t; } const Meter& meter() const { return *_meter; } const Tempo& tempo() const { return *_tempo; } framepos_t frame() const { return _frame; } - const BBT_Time& start() const { return _start; } + const Timecode::BBT_Time& start() const { return _start; } private: - const Meter* _meter; - const Tempo* _tempo; - framepos_t _frame; - BBT_Time _start; + const Meter* _meter; + const Tempo* _tempo; + framepos_t _frame; + Timecode::BBT_Time _start; }; class TempoMap : public PBD::StatefulDestructible @@ -200,11 +200,11 @@ class TempoMap : public PBD::StatefulDestructible BBTPointList *get_points (framepos_t start, framepos_t end) const; - void bbt_time (framepos_t when, BBT_Time&) const; - framecnt_t frame_time (const BBT_Time&) const; - framecnt_t bbt_duration_at (framepos_t, const BBT_Time&, int dir) const; + void bbt_time (framepos_t when, Timecode::BBT_Time&) const; + framecnt_t frame_time (const Timecode::BBT_Time&) const; + framecnt_t bbt_duration_at (framepos_t, const Timecode::BBT_Time&, int dir) const; - void bbt_time_add (framepos_t origin, BBT_Time& start, const BBT_Time& shift); + void bbt_time_add (framepos_t origin, Timecode::BBT_Time& start, const Timecode::BBT_Time& shift); static const Tempo& default_tempo() { return _default_tempo; } static const Meter& default_meter() { return _default_meter; } @@ -214,14 +214,14 @@ class TempoMap : public PBD::StatefulDestructible const TempoSection& tempo_section_at (framepos_t); - void add_tempo(const Tempo&, BBT_Time where); - void add_meter(const Meter&, BBT_Time where); + void add_tempo(const Tempo&, Timecode::BBT_Time where); + void add_meter(const Meter&, Timecode::BBT_Time where); void add_tempo(const Tempo&, framepos_t where); void add_meter(const Meter&, framepos_t where); - void move_tempo (TempoSection&, const BBT_Time& to); - void move_meter (MeterSection&, const BBT_Time& to); + void move_tempo (TempoSection&, const Timecode::BBT_Time& to); + void move_meter (MeterSection&, const Timecode::BBT_Time& to); void remove_tempo(const TempoSection&); void remove_meter(const MeterSection&); @@ -242,13 +242,13 @@ class TempoMap : public PBD::StatefulDestructible void dump (std::ostream&) const; void clear (); - TempoMetric metric_at (BBT_Time bbt) const; + TempoMetric metric_at (Timecode::BBT_Time bbt) const; TempoMetric metric_at (framepos_t) const; - void bbt_time_with_metric (framepos_t, BBT_Time&, const TempoMetric&) const; + void bbt_time_with_metric (framepos_t, Timecode::BBT_Time&, const TempoMetric&) const; - BBT_Time bbt_add (const BBT_Time&, const BBT_Time&, const TempoMetric&) const; - BBT_Time bbt_add (const BBT_Time& a, const BBT_Time& b) const; - BBT_Time bbt_subtract (const BBT_Time&, const BBT_Time&) const; + Timecode::BBT_Time bbt_add (const Timecode::BBT_Time&, const Timecode::BBT_Time&, const TempoMetric&) const; + Timecode::BBT_Time bbt_add (const Timecode::BBT_Time& a, const Timecode::BBT_Time& b) const; + Timecode::BBT_Time bbt_subtract (const Timecode::BBT_Time&, const Timecode::BBT_Time&) const; void change_existing_tempo_at (framepos_t, double bpm, double note_type); void change_initial_tempo (double bpm, double note_type); @@ -265,30 +265,30 @@ class TempoMap : public PBD::StatefulDestructible static Meter _default_meter; Metrics* metrics; - framecnt_t _frame_rate; + framecnt_t _frame_rate; framepos_t last_bbt_when; bool last_bbt_valid; - BBT_Time last_bbt; + Timecode::BBT_Time last_bbt; mutable Glib::RWLock lock; void timestamp_metrics (bool use_bbt); framepos_t round_to_type (framepos_t fr, int dir, BBTPointType); - framepos_t frame_time_unlocked (const BBT_Time&) const; + framepos_t frame_time_unlocked (const Timecode::BBT_Time&) const; - void bbt_time_unlocked (framepos_t, BBT_Time&) const; + void bbt_time_unlocked (framepos_t, Timecode::BBT_Time&) const; - framecnt_t bbt_duration_at_unlocked (const BBT_Time& when, const BBT_Time& bbt, int dir) const; + framecnt_t bbt_duration_at_unlocked (const Timecode::BBT_Time& when, const Timecode::BBT_Time& bbt, int dir) const; const MeterSection& first_meter() const; const TempoSection& first_tempo() const; - framecnt_t count_frames_between (const BBT_Time&, const BBT_Time&) const; + framecnt_t count_frames_between (const Timecode::BBT_Time&, const Timecode::BBT_Time&) const; framecnt_t count_frames_between_metrics (const Meter&, const Tempo&, - const BBT_Time&, const BBT_Time&) const; + const Timecode::BBT_Time&, const Timecode::BBT_Time&) const; - int move_metric_section (MetricSection&, const BBT_Time& to); + int move_metric_section (MetricSection&, const Timecode::BBT_Time& to); void do_insert (MetricSection* section, bool with_bbt); }; diff --git a/libs/ardour/ardour/ticker.h b/libs/ardour/ardour/ticker.h index 42f3d88dc9..07aa1cc522 100644 --- a/libs/ardour/ardour/ticker.h +++ b/libs/ardour/ardour/ticker.h @@ -44,9 +44,9 @@ public: virtual ~Ticker() {} virtual void tick ( - const framepos_t& transport_frames, - const BBT_Time& transport_bbt, - const Timecode::Time& transport_timecode) = 0; + const framepos_t& transport_frames, + const Timecode::BBT_Time& transport_bbt, + const Timecode::Time& transport_timecode) = 0; void set_session (Session* s); }; @@ -68,9 +68,9 @@ public: } void tick( - const framepos_t& transport_frames, - const BBT_Time& transport_bbt, - const Timecode::Time& transport_timecode); + const framepos_t& transport_frames, + const Timecode::BBT_Time& transport_bbt, + const Timecode::Time& transport_timecode); void set_session (Session* s); void session_going_away(); diff --git a/libs/ardour/ardour/timecode.h b/libs/ardour/ardour/timecode.h index f0fb13b16f..7568811e29 100644 --- a/libs/ardour/ardour/timecode.h +++ b/libs/ardour/ardour/timecode.h @@ -19,6 +19,6 @@ #ifndef __libardour_timecode_h__ #define __libardour_timecode_h__ -#include "musictime/time.h" +#include "timecode/time.h" #endif // __libardour_timecode_h__ diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h index 006ec447d7..d214a67ecd 100644 --- a/libs/ardour/ardour/types.h +++ b/libs/ardour/ardour/types.h @@ -30,10 +30,12 @@ #include <inttypes.h> #include <jack/types.h> #include <jack/midiport.h> -#include "musictime/time.h" + +#include "timecode/bbt_time.h" +#include "timecode/time.h" + #include "pbd/id.h" -#include "ardour/bbt_time.h" #include "ardour/chan_count.h" #include <map> @@ -47,7 +49,7 @@ namespace ARDOUR { class Source; class AudioSource; class Route; - class Region; + class Region; typedef jack_default_audio_sample_t Sample; typedef float pan_t; @@ -56,28 +58,28 @@ namespace ARDOUR { typedef uint64_t microseconds_t; typedef jack_nframes_t pframes_t; - /* Any position measured in audio frames. - Assumed to be non-negative but not enforced. - */ + /* Any position measured in audio frames. + Assumed to be non-negative but not enforced. + */ typedef int64_t framepos_t; - /* Any distance from a given framepos_t. - Maybe positive or negative. - */ + /* Any distance from a given framepos_t. + Maybe positive or negative. + */ typedef int64_t frameoffset_t; /* Any count of audio frames. - Assumed to be positive but not enforced. - */ + Assumed to be positive but not enforced. + */ typedef int64_t framecnt_t; - static const framepos_t max_framepos = INT64_MAX; - static const framecnt_t max_framecnt = INT64_MAX; + static const framepos_t max_framepos = INT64_MAX; + static const framecnt_t max_framecnt = INT64_MAX; - // a set of (time) intervals: first of pair is the offset within the region, second is the length of the interval - typedef std::list<std::pair<frameoffset_t,framecnt_t> > AudioIntervalResult; - // associate a set of intervals with regions (e.g. for silence detection) - typedef std::map<boost::shared_ptr<ARDOUR::Region>,AudioIntervalResult> AudioIntervalMap; + // a set of (time) intervals: first of pair is the offset within the region, second is the length of the interval + typedef std::list<std::pair<frameoffset_t,framecnt_t> > AudioIntervalResult; + // associate a set of intervals with regions (e.g. for silence detection) + typedef std::map<boost::shared_ptr<ARDOUR::Region>,AudioIntervalResult> AudioIntervalMap; struct IOChange { @@ -216,8 +218,8 @@ namespace ARDOUR { Type type; - Timecode::Time timecode; - BBT_Time bbt; + Timecode::Time timecode; + Timecode::BBT_Time bbt; union { framecnt_t frames; @@ -250,11 +252,11 @@ namespace ARDOUR { }; struct MusicRange { - BBT_Time start; - BBT_Time end; + Timecode::BBT_Time start; + Timecode::BBT_Time end; uint32_t id; - MusicRange (BBT_Time& s, BBT_Time& e, uint32_t i) + MusicRange (Timecode::BBT_Time& s, Timecode::BBT_Time& e, uint32_t i) : start (s), end (e), id (i) {} bool operator== (const MusicRange& other) const { diff --git a/libs/ardour/audio_unit.cc b/libs/ardour/audio_unit.cc index 6746845f67..171e303f99 100644 --- a/libs/ardour/audio_unit.cc +++ b/libs/ardour/audio_unit.cc @@ -1331,7 +1331,7 @@ AUPlugin::get_beat_and_tempo_callback (Float64* outCurrentBeat, return kAudioUnitErr_CannotDoInCurrentContext; } - BBT_Time bbt; + Timecode::BBT_Time bbt; TempoMetric metric = tmap.metric_at (_session.transport_frame() + current_offset); tmap.bbt_time_with_metric (_session.transport_frame() + current_offset, bbt, metric); @@ -1370,7 +1370,7 @@ AUPlugin::get_musical_time_location_callback (UInt32* outDeltaSampleOffsetToNe return kAudioUnitErr_CannotDoInCurrentContext; } - BBT_Time bbt; + Timecode::BBT_Time bbt; TempoMetric metric = tmap.metric_at (_session.transport_frame() + current_offset); tmap.bbt_time_with_metric (_session.transport_frame() + current_offset, bbt, metric); @@ -1462,7 +1462,7 @@ AUPlugin::get_transport_state_callback (Boolean* outIsPlaying, return kAudioUnitErr_CannotDoInCurrentContext; } - BBT_Time bbt; + Timecode::BBT_Time bbt; if (outCycleStartBeat) { TempoMetric metric = tmap.metric_at (loc->start() + current_offset); diff --git a/libs/ardour/session_midi.cc b/libs/ardour/session_midi.cc index 83a17536e2..43fedefc15 100644 --- a/libs/ardour/session_midi.cc +++ b/libs/ardour/session_midi.cc @@ -32,9 +32,12 @@ #include "midi++/mmc.h" #include "midi++/port.h" #include "midi++/manager.h" + #include "pbd/error.h" #include "pbd/pthread_utils.h" +#include "timecode/time.h" + #include "ardour/configuration.h" #include "ardour/debug.h" #include "ardour/audioengine.h" @@ -45,7 +48,6 @@ #include "ardour/audio_diskstream.h" #include "ardour/slave.h" #include "ardour/cycles.h" -#include "ardour/timecode.h" #include "i18n.h" diff --git a/libs/ardour/session_process.cc b/libs/ardour/session_process.cc index fe85109869..662da4db91 100644 --- a/libs/ardour/session_process.cc +++ b/libs/ardour/session_process.cc @@ -69,15 +69,15 @@ Session::process (pframes_t nframes) } } - _engine.main_thread()->get_buffers (); + _engine.main_thread()->get_buffers (); (this->*process_function) (nframes); - _engine.main_thread()->drop_buffers (); + _engine.main_thread()->drop_buffers (); // the ticker is for sending time information like MidiClock framepos_t transport_frames = transport_frame(); - BBT_Time transport_bbt; + Timecode::BBT_Time transport_bbt; bbt_time(transport_frames, transport_bbt); Timecode::Time transport_timecode; timecode_time(transport_frames, transport_timecode); diff --git a/libs/ardour/session_time.cc b/libs/ardour/session_time.cc index b5137e0d6a..bed5bab7a6 100644 --- a/libs/ardour/session_time.cc +++ b/libs/ardour/session_time.cc @@ -47,7 +47,7 @@ using namespace PBD; /* BBT TIME*/ void -Session::bbt_time (framepos_t when, BBT_Time& bbt) +Session::bbt_time (framepos_t when, Timecode::BBT_Time& bbt) { _tempo_map->bbt_time (when, bbt); } @@ -473,11 +473,11 @@ Session::jack_timebase_callback (jack_transport_state_t /*state*/, jack_position_t* pos, int /*new_position*/) { - BBT_Time bbt; + Timecode::BBT_Time bbt; - if (pos->frame != _transport_frame) { - cerr << "ARDOUR says " << _transport_frame << " JACK says " << pos->frame << endl; - } + if (pos->frame != _transport_frame) { + cerr << "ARDOUR says " << _transport_frame << " JACK says " << pos->frame << endl; + } /* BBT info */ diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc index 8afdfb140b..adb207c752 100644 --- a/libs/ardour/tempo.cc +++ b/libs/ardour/tempo.cc @@ -38,6 +38,8 @@ using namespace std; using namespace ARDOUR; using namespace PBD; +using Timecode::BBT_Time; + /* _default tempo is 4/4 qtr=120 */ Meter TempoMap::_default_meter (4.0, 4.0); diff --git a/libs/ardour/test/bbt_test.cpp b/libs/ardour/test/bbt_test.cpp index 13bf5d48eb..4dab5c6f32 100644 --- a/libs/ardour/test/bbt_test.cpp +++ b/libs/ardour/test/bbt_test.cpp @@ -7,6 +7,8 @@ CPPUNIT_TEST_SUITE_REGISTRATION(BBTTest); using namespace std; using namespace ARDOUR; +using Timecode::BBT_Time; + void BBTTest::addTest () { diff --git a/libs/ardour/test/bbt_test.h b/libs/ardour/test/bbt_test.h index b823b2a071..94a4d96c03 100644 --- a/libs/ardour/test/bbt_test.h +++ b/libs/ardour/test/bbt_test.h @@ -2,7 +2,7 @@ #include <sigc++/sigc++.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> -#include "ardour/bbt_time.h" +#include "timecode/bbt_time.h" class BBTTest : public CppUnit::TestFixture { diff --git a/libs/ardour/test/midi_clock_slave_test.h b/libs/ardour/test/midi_clock_slave_test.h index 7bc73fdab4..4b3572a613 100644 --- a/libs/ardour/test/midi_clock_slave_test.h +++ b/libs/ardour/test/midi_clock_slave_test.h @@ -48,8 +48,8 @@ class TestSlaveSessionProxy : public ISlaveSessionProxy { meter (4.0, 4.0) { _tempo_map = new TempoMap (FRAME_RATE); - _tempo_map->add_tempo (tempo, BBT_Time(1, 1, 0)); - _tempo_map->add_meter (meter, BBT_Time(1, 1, 0)); + _tempo_map->add_tempo (tempo, Timecode::BBT_Time(1, 1, 0)); + _tempo_map->add_meter (meter, Timecode::BBT_Time(1, 1, 0)); } // Controlling the mock object diff --git a/libs/ardour/ticker.cc b/libs/ardour/ticker.cc index 1134cec859..0b4e64e0df 100644 --- a/libs/ardour/ticker.cc +++ b/libs/ardour/ticker.cc @@ -103,7 +103,7 @@ void MidiClockTicker::transport_state_changed() send_stop_event(0); } - tick(position, *((ARDOUR::BBT_Time *) 0), *((Timecode::Time *)0)); + tick(position, *((Timecode::BBT_Time *) 0), *((Timecode::Time *)0)); } void MidiClockTicker::position_changed (framepos_t position) @@ -129,7 +129,7 @@ void MidiClockTicker::transport_looped() _last_tick = loop_location->start() - elapsed_since_last_tick; } -void MidiClockTicker::tick (const framepos_t& transport_frames, const BBT_Time& /*transport_bbt*/, const Timecode::Time& /*transport_smpt*/) +void MidiClockTicker::tick (const framepos_t& transport_frames, const Timecode::BBT_Time& /*transport_bbt*/, const Timecode::Time& /*transport_smpt*/) { if (!Config->get_send_midi_clock() || _session == 0 || _session->transport_speed() != 1.0f || _midi_port == 0) return; |