ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

remove Session::bbt_time() and use TempoMap::use()->bbt_at() explicitly everywhere

Browse Source
This commit is contained in:
Paul Davis 2021-12-14 13:23:07 -07:00
parent 66a114a892
commit 12847b0125
4 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libs/ardour/ardour/session.h
View File

@ -793,7 +793,6 @@ public:
void sync_time_vars();
void bbt_time (Temporal::timepos_t const & when, Temporal::BBT_Time&);
void timecode_to_sample(Timecode::Time& timecode, samplepos_t& sample, bool use_offset, bool use_subframes) const;
void sample_to_timecode(samplepos_t sample, Timecode::Time& timecode, bool use_offset, bool use_subframes) const;
void timecode_time (Timecode::Time &);

8
libs/ardour/session_time.cc
View File

@ -45,14 +45,6 @@ using namespace Temporal;
#define TFSM_EVENT(evtype) { _transport_fsm->enqueue (new TransportFSM::Event (evtype)); }
/* BBT TIME*/
void
Session::bbt_time (timepos_t const & when, Temporal::BBT_Time& bbt)
{
bbt = TempoMap::use()->bbt_at (when);
}
/* Timecode TIME */
double

4
libs/surfaces/mackie/mackie_control_protocol.cc
View File

@ -67,6 +67,8 @@
#include "ardour/audioengine.h"
#include "ardour/vca_manager.h"
#include "temporal/tempo.h"
#include "mackie_control_protocol.h"
#include "midi_byte_array.h"
@ -1155,7 +1157,7 @@ MackieControlProtocol::format_bbt_timecode (samplepos_t now_sample)
{
Temporal::BBT_Time bbt_time;
session->bbt_time (timepos_t (now_sample), bbt_time);
bbt_time = Temporal::TempoMap::use()->bbt_at (timepos_t (now_sample));
// The Mackie protocol spec is built around a BBT time display of
//

4
libs/surfaces/osc/osc_global_observer.cc
View File

@ -27,6 +27,8 @@
#include "ardour/meter.h"
#include "ardour/monitor_processor.h"
#include "temporal/tempo.h"
#include "osc.h"
#include "osc_global_observer.h"
@ -244,7 +246,7 @@ OSCGlobalObserver::tick ()
if (feedback[5]) { // Bar beat enabled
Temporal::BBT_Time bbt_time;
session->bbt_time (timepos_t (now_sample), bbt_time);
bbt_time = Temporal::TempoMap::use()->bbt_at (timepos_t (now_sample));
// semantics: BBB/bb/tttt
ostringstream os;