5 files changed, 9 insertions, 8 deletions
diff --git a/libs/ardour/ardour/midi_stretch.h b/libs/ardour/ardour/midi_stretch.h
index 90c75bbc18..9b4fba80ce 100644
--- a/libs/ardour/ardour/midi_stretch.h
+++ b/libs/ardour/ardour/midi_stretch.h
@@ -26,13 +26,13 @@ namespace ARDOUR {
 
 class MidiStretch : public Filter {
   public:
-	MidiStretch (ARDOUR::Session&, TimeFXRequest&);
+	MidiStretch (ARDOUR::Session&, const TimeFXRequest&);
 	~MidiStretch ();
 
 	int run (boost::shared_ptr<ARDOUR::Region>, Progress* progress = 0);
 
   private:
-	TimeFXRequest& _request;
+	const TimeFXRequest& _request;
 };
 
 } /* namespace ARDOUR */
diff --git a/libs/ardour/ardour/playlist.h b/libs/ardour/ardour/playlist.h
index 022fdb3ccb..1f66310877 100644
--- a/libs/ardour/ardour/playlist.h
+++ b/libs/ardour/ardour/playlist.h
@@ -81,7 +81,6 @@ class RegionListProperty : public PBD::SequenceProperty<std::list<boost::shared_
 class Playlist : public SessionObject , public boost::enable_shared_from_this<Playlist>
 {
 public:
-	typedef std::list<boost::shared_ptr<Region> > RegionList;
 	static void make_property_quarks ();
 
 	Playlist (Session&, const XMLNode&, DataType type, bool hidden = false);
diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h
index c2c7289329..c34869bc2b 100644
--- a/libs/ardour/ardour/types.h
+++ b/libs/ardour/ardour/types.h
@@ -82,6 +82,8 @@ namespace ARDOUR {
 	// associate a set of intervals with regions (e.g. for silence detection)
 	typedef std::map<boost::shared_ptr<ARDOUR::Region>,AudioIntervalResult> AudioIntervalMap;
 
+	typedef std::list<boost::shared_ptr<Region> > RegionList;
+
 	struct IOChange {
 
 		enum Type {
diff --git a/libs/ardour/midi_stretch.cc b/libs/ardour/midi_stretch.cc
index 7a4164427a..83b845bbfc 100644
--- a/libs/ardour/midi_stretch.cc
+++ b/libs/ardour/midi_stretch.cc
@@ -33,7 +33,7 @@ using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
-MidiStretch::MidiStretch (Session& s, TimeFXRequest& req)
+MidiStretch::MidiStretch (Session& s, const TimeFXRequest& req)
 	: Filter (s)
 	, _request (req)
 {
diff --git a/libs/ardour/playlist.cc b/libs/ardour/playlist.cc
index bc11b863eb..a17d72c4eb 100644
--- a/libs/ardour/playlist.cc
+++ b/libs/ardour/playlist.cc
@@ -1634,7 +1634,7 @@ Playlist::flush_notifications (bool from_undo)
   FINDING THINGS
   **********************************************************************/
 
-boost::shared_ptr<Playlist::RegionList>
+boost::shared_ptr<RegionList>
 Playlist::regions_at (framepos_t frame)
 {
 	RegionLock rlock (this);
@@ -1703,7 +1703,7 @@ Playlist::regions_at (framepos_t frame)
 	 return region;
  }
 
-boost::shared_ptr<Playlist::RegionList>
+boost::shared_ptr<RegionList>
 Playlist::regions_to_read (framepos_t start, framepos_t end)
 {
 	 /* Caller must hold lock */
@@ -1838,7 +1838,7 @@ Playlist::regions_to_read (framepos_t start, framepos_t end)
 	 return rlist;
  }
 
-boost::shared_ptr<Playlist::RegionList>
+boost::shared_ptr<RegionList>
 Playlist::find_regions_at (framepos_t frame)
 {
 	/* Caller must hold lock */
@@ -1854,7 +1854,7 @@ Playlist::find_regions_at (framepos_t frame)
 	return rlist;
 }
 
-boost::shared_ptr<Playlist::RegionList>
+boost::shared_ptr<RegionList>
 Playlist::regions_touched (framepos_t start, framepos_t end)
 {
 	RegionLock rlock (this);