allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

manual fixups after rebase against master (general libs edition)

Browse Source
This commit is contained in:
Paul Davis
2020-12-06 16:33:34 -07:00
parent c76c61d202
commit bed76798f3
7 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/backends/jack/jack_session.cc
View File

@@ -140,8 +140,8 @@ JACKSession::timebase_callback (jack_transport_state_t /*state*/,
pos->ticks_per_beat = Temporal::ticks_per_beat;
pos->beats_per_minute = metric.tempo().note_types_per_minute();
double current_tick = tempo_map.quarter_note_at_bbt_rt (bbt) / 4 * pos->beat_type * pos->ticks_per_beat;
pos->bar_start_tick = current_tick - ((pos->beat - 1) * pos->ticks_per_beat + pos->tick);
Beats current_tick = metric.quarters_at (bbt) / 4 * pos->beat_type * pos->ticks_per_beat;
pos->bar_start_tick = current_tick.to_ticks() - ((pos->beat - 1) * pos->ticks_per_beat + pos->tick);
pos->valid = jack_position_bits_t (pos->valid | JackPositionBBT);

2
libs/evoral/ControlList.cc
View File

@@ -1643,7 +1643,7 @@ ControlList::rt_safe_earliest_event_discrete_unlocked (timepos_t const & start_t
* \return true if event is found (and \a x and \a y are valid).
*/
bool
ControlList::rt_safe_earliest_event_linear_unlocked (Temporal::timepos_t const & start_time, Temporal::timepos_t & x, double& y, bool inclusive, timepos_t const & min_x_delta) const
ControlList::rt_safe_earliest_event_linear_unlocked (Temporal::timepos_t const & start_time, Temporal::timepos_t & x, double& y, bool inclusive, Temporal::timecnt_t min_x_delta) const
{
timepos_t start = start_time;

2
libs/evoral/evoral/ControlList.h
View File

@@ -308,7 +308,7 @@ public:
double unlocked_eval (Temporal::timepos_t const & x) const;
bool rt_safe_earliest_event_discrete_unlocked (Temporal::timepos_t const & start, Temporal::timepos_t & x, double& y, bool inclusive) const;
bool rt_safe_earliest_event_linear_unlocked (Temporal::timepos_t const & start, Temporal::timepos_t & x, double& y, bool inclusive, Temporal::timepos_t min_x_delta = Temporal::timepos_t ()) const;
bool rt_safe_earliest_event_linear_unlocked (Temporal::timepos_t const & start, Temporal::timepos_t & x, double& y, bool inclusive, Temporal::timecnt_t min_x_delta = Temporal::timecnt_t ()) const;
void create_curve();
void destroy_curve();

4
libs/pbd/pbd/rcu.h
View File

@@ -146,12 +146,12 @@ class /*LIBPBD_API*/ SerializedRCUManager : public RCUManager<T>
public:
SerializedRCUManager(T* new_rcu_value)
: RCUManager<T>(new_rcu_value)
, current_write_old (0)
, _current_write_old (0)
{
}
void init (boost::shared_ptr<T> new_rcu_value) {
assert (*RCUManager<T>::x.m_rcu_value == boost::shared_ptr<T> ());
assert (*RCUManager<T>::x.rcu_value == boost::shared_ptr<T> ());
boost::shared_ptr<T>* new_spp = new boost::shared_ptr<T> (new_rcu_value);
g_atomic_pointer_set (&RCUManager<T>::x.gptr, new_spp);

2
libs/surfaces/osc/osc.cc
View File

@@ -1305,7 +1305,7 @@ OSC::osc_toggle_roll (bool ret2strt)
} else {
if (session->get_play_loop() && Config->get_loop_is_mode()) {
session->request_locate (session->locations()->auto_loop_location()->start(), MustRoll);
session->request_locate (session->locations()->auto_loop_location()->start().samples(), MustRoll);
} else {
session->request_roll (TRS_UI);
}

2
libs/surfaces/websockets/feedback.cc
View File

@@ -231,7 +231,7 @@ ArdourFeedback::observe_transport ()
boost::bind<void> (RecordStateObserver (), this), event_loop ());
#warning NUTEMPO this is not right. the actual map can change. static signal?
Temporal::TempoMap::use()->Changed.connect (_signal_connections, MISSING_INVALIDATOR,
Temporal::TempoMap::use()->Changed.connect (_transport_connections, MISSING_INVALIDATOR,
boost::bind<void> (TempoObserver (), this), event_loop ());
}

4
libs/temporal/temporal/beats.h
View File

@@ -88,8 +88,8 @@ public:
// Work with positive beats and ticks to normalize
const int32_t sign = _beats < 0 ? -1 : _ticks < 0 ? -1 : 1;
int32_t beats = abs(_beats);
int32_t ticks = abs(_ticks);
int32_t beats = ::abs(_beats);
int32_t ticks = ::abs(_ticks);
// Fix ticks greater than 1 beat
while (ticks >= PPQN) {