summaryrefslogtreecommitdiff
path: root/libs/ardour
diff options
context:
space:
mode:
authornick_m <mainsbridge@gmail.com>2016-09-28 22:46:52 +1000
committernick_m <mainsbridge@gmail.com>2016-09-29 01:27:42 +1000
commitdcae6c42b6089be2f21d5d46624ce66365d1a625 (patch)
tree69a5da5cfab55db8c5cd0831271e5430326681b4 /libs/ardour
parent83fd39547615b2683ff2a8a70c41155cff079500 (diff)
Remove _length_pulse from MidiSource.
Diffstat (limited to 'libs/ardour')
-rw-r--r--libs/ardour/ardour/midi_source.h2
-rw-r--r--libs/ardour/midi_source.cc3
-rw-r--r--libs/ardour/smf_source.cc6
3 files changed, 0 insertions, 11 deletions
diff --git a/libs/ardour/ardour/midi_source.h b/libs/ardour/ardour/midi_source.h
index 0d0450bfc4..29f88773a9 100644
--- a/libs/ardour/ardour/midi_source.h
+++ b/libs/ardour/ardour/midi_source.h
@@ -171,7 +171,6 @@ class LIBARDOUR_API MidiSource : virtual public Source, public boost::enable_sha
void set_length_beats(TimeType l) { _length_beats = l; }
TimeType length_beats() const { return _length_beats; }
- double length_pulse() const { return _length_pulse; }
virtual void load_model(const Glib::Threads::Mutex::Lock& lock, bool force_reload=false) = 0;
virtual void destroy_model(const Glib::Threads::Mutex::Lock& lock) = 0;
@@ -237,7 +236,6 @@ class LIBARDOUR_API MidiSource : virtual public Source, public boost::enable_sha
mutable bool _model_iter_valid;
mutable Evoral::Beats _length_beats;
- mutable double _length_pulse;
mutable framepos_t _last_read_end;
/** The total duration of the current capture. */
diff --git a/libs/ardour/midi_source.cc b/libs/ardour/midi_source.cc
index d104fa7949..ac2a3c410e 100644
--- a/libs/ardour/midi_source.cc
+++ b/libs/ardour/midi_source.cc
@@ -63,7 +63,6 @@ MidiSource::MidiSource (Session& s, string name, Source::Flag flags)
, _writing(false)
, _model_iter_valid(false)
, _length_beats(0.0)
- , _length_pulse(0.0)
, _last_read_end(0)
, _capture_length(0)
, _capture_loop_length(0)
@@ -75,7 +74,6 @@ MidiSource::MidiSource (Session& s, const XMLNode& node)
, _writing(false)
, _model_iter_valid(false)
, _length_beats(0.0)
- , _length_pulse(0.0)
, _last_read_end(0)
, _capture_length(0)
, _capture_loop_length(0)
@@ -387,7 +385,6 @@ MidiSource::mark_write_starting_now (framecnt_t position,
TempoMap& map (_session.tempo_map());
BeatsFramesConverter converter(map, position);
_length_beats = converter.from(capture_length);
- _length_pulse = map.pulse_at_frame (position + capture_length) - map.pulse_at_frame (position);
}
void
diff --git a/libs/ardour/smf_source.cc b/libs/ardour/smf_source.cc
index 22245abe52..33ba6e2a00 100644
--- a/libs/ardour/smf_source.cc
+++ b/libs/ardour/smf_source.cc
@@ -439,8 +439,6 @@ SMFSource::append_event_beats (const Glib::Threads::Mutex::Lock& lock,
}
_length_beats = max(_length_beats, time);
- /* midi is in quarter note format as distinct from ardour beat */
- _length_pulse = _length_beats.to_double() / 4.0;
const Evoral::Beats delta_time_beats = time - _last_ev_time_beats;
const uint32_t delta_time_ticks = delta_time_beats.to_ticks(ppqn());
@@ -490,8 +488,6 @@ SMFSource::append_event_frames (const Glib::Threads::Mutex::Lock& lock,
}
_length_beats = max(_length_beats, ev_time_beats);
- /* midi is in quarter note format as distinct from ardour beat */
- _length_pulse = _length_beats.to_double() / 4.0;
const Evoral::Beats last_time_beats = converter.from (_last_ev_time_frames);
const Evoral::Beats delta_time_beats = ev_time_beats - last_time_beats;
@@ -704,8 +700,6 @@ SMFSource::load_model (const Glib::Threads::Mutex::Lock& lock, bool force_reload
size = scratch_size;
_length_beats = max(_length_beats, event_time);
- /* midi is in quarter note format as distinct from ardour beat */
- _length_pulse = _length_beats.to_double() / 4.0;
}
/* event ID's must immediately precede the event they are for */