From 4b861e603972148a29638cade51cee27ebc997a2 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Tue, 14 Dec 2010 18:13:37 +0000 Subject: 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 --- libs/ardour/ardour/bbt_time.h | 74 ------------------------------------------- libs/ardour/ardour/location.h | 16 +++++----- libs/ardour/ardour/region.h | 2 +- libs/ardour/ardour/session.h | 7 ++-- libs/ardour/ardour/tempo.h | 72 ++++++++++++++++++++--------------------- libs/ardour/ardour/ticker.h | 12 +++---- libs/ardour/ardour/timecode.h | 2 +- libs/ardour/ardour/types.h | 46 ++++++++++++++------------- 8 files changed, 80 insertions(+), 151 deletions(-) delete mode 100644 libs/ardour/ardour/bbt_time.h (limited to 'libs/ardour/ardour') 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 -#include -#include - -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 tick; + PBD::Signal3 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 #include #include -#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 @@ -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 > AudioIntervalResult; - // associate a set of intervals with regions (e.g. for silence detection) - typedef std::map,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 > AudioIntervalResult; + // associate a set of intervals with regions (e.g. for silence detection) + typedef std::map,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 { -- cgit v1.2.3