Compare commits
5 Commits
25dc926f24
...
a7ee848f70
Author | SHA1 | Date | |
---|---|---|---|
a7ee848f70 | |||
|
c1c95f538f | ||
|
2f5f917df2 | ||
|
aadd24a4e5 | ||
|
cc6a1e2d6f |
|
@ -277,8 +277,8 @@ Drag::Drag (Editor* e, ArdourCanvas::Item* i, Temporal::TimeDomain td, bool trac
|
|||
, _constraint_pressed (false)
|
||||
, _grab_button (-1)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
timepos_t
|
||||
Drag::pixel_to_time (double x) const
|
||||
{
|
||||
|
|
|
@ -359,8 +359,9 @@ ControlList::list_merge (ControlList const& other, boost::function<double(double
|
|||
void
|
||||
ControlList::_x_scale (ratio_t const & factor)
|
||||
{
|
||||
double double_factor = (double)factor;
|
||||
for (iterator i = _events.begin(); i != _events.end(); ++i) {
|
||||
(*i)->when = (*i)->when.operator* (factor);
|
||||
(*i)->when = timepos_t::from_superclock ((*i)->when.val() * double_factor + 0.5);
|
||||
}
|
||||
|
||||
mark_dirty ();
|
||||
|
|
|
@ -2363,7 +2363,10 @@ TempoMap::set_state (XMLNode const & node, int version)
|
|||
|
||||
/* global map properties */
|
||||
|
||||
/* XXX this should probably be at the global level in the session file because it affects a lot more than just the tempo map, potentially */
|
||||
/* XXX this should probably be at the global level in the session file
|
||||
* because it is the time unit for anything in the audio time domain,
|
||||
* and affects a lot more than just the tempo map
|
||||
*/
|
||||
superclock_t sc;
|
||||
if (node.get_property (X_("superclocks-per-second"), sc)) {
|
||||
set_superclock_ticks_per_second (sc);
|
||||
|
|
|
@ -89,7 +89,7 @@ class _ratio_t {
|
|||
|
||||
int64_t operator* (int64_t v) const { return int_div_round (v * _numerator, _denominator); }
|
||||
|
||||
private:
|
||||
private:
|
||||
T _numerator;
|
||||
T _denominator;
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue
Block a user