Remove _midi_regions_use_bbt_beats from Session, _start_pulse and _length_pulse from MidiRegion.

	- _start/length_beats are now quarter notes regardless
	  of loaded session version.

	- also restores note colour update

3 files changed, 4 insertions, 12 deletions

diff --git a/libs/ardour/ardour/midi_region.h b/libs/ardour/ardour/midi_region.h
index b19751aaa5..4f76200c35 100644
--- a/libs/ardour/ardour/midi_region.h
+++ b/libs/ardour/ardour/midi_region.h
@@ -107,11 +107,10 @@ class LIBARDOUR_API MidiRegion : public Region
 
 	void fix_negative_start ();
 	Evoral::Beats start_beats () {return _start_beats.val(); }
+	void set_start_beats (const Evoral::Beats start_beats) {_start_beats = start_beats; }
  	Evoral::Beats length_beats () {return _length_beats.val(); }
-	double start_pulse () const {return _start_pulse; }
-	void set_start_pulse (const double start_pulse) {_start_pulse = start_pulse; }
-	double length_pulse () const {return _length_pulse; }
-	void set_length_pulse (const double length_pulse) {_length_pulse = length_pulse; }
+	void set_length_beats (const Evoral::Beats length_beats) {_length_beats = length_beats; }
+
   protected:
 
 	virtual bool can_trim_start_before_source_start () const {
@@ -123,9 +122,6 @@ class LIBARDOUR_API MidiRegion : public Region
 	PBD::Property<Evoral::Beats> _start_beats;
 	PBD::Property<Evoral::Beats> _length_beats;
 
-	double _start_pulse;
-	double _length_pulse;
-
 	MidiRegion (const SourceList&);
 	MidiRegion (boost::shared_ptr<const MidiRegion>);
 	MidiRegion (boost::shared_ptr<const MidiRegion>, frameoffset_t offset, const int32_t sub_num = 0);
diff --git a/libs/ardour/ardour/midi_source.h b/libs/ardour/ardour/midi_source.h
index 5e3484bb2f..0d0450bfc4 100644
--- a/libs/ardour/ardour/midi_source.h
+++ b/libs/ardour/ardour/midi_source.h
@@ -98,7 +98,7 @@ class LIBARDOUR_API MidiSource : virtual public Source, public boost::enable_sha
 	                              MidiChannelFilter*                 filter,
 	                              const std::set<Evoral::Parameter>& filtered,
 				      const double                       pulse,
-				      const double                       start_pulse) const;
+				      const double                       start_beats) const;
 
 	/** Write data from a MidiRingBuffer to this source.
 	 *  @param source Source to read from.
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index 213e9dcf4b..af8f1952f1 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -1149,8 +1149,6 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop
 
 	VCAManager& vca_manager() { return *_vca_manager; }
 
-	bool midi_regions_use_bbt_beats () { return _midi_regions_use_bbt_beats; }
-
   protected:
 	friend class AudioEngine;
 	void set_block_size (pframes_t nframes);
@@ -2030,8 +2028,6 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop
 	boost::shared_ptr<Route> get_midi_nth_route_by_id (PresentationInfo::order_t n) const;
 
 	std::string created_with;
-
-	bool _midi_regions_use_bbt_beats;
 };