(Source List) Region List rewrite (gtk2 part)

See:  https://docs.google.com/document/d/1sI7p9RoRVZtNx2n67RvBa0_16fuZblV_lNkkKN2g93s/edit?usp=sharing

9 files changed, 296 insertions, 1172 deletions

diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in
index 2e6c003f7c..3e46b56008 100644
--- a/gtk2_ardour/ardour.menus.in
+++ b/gtk2_ardour/ardour.menus.in
@@ -702,26 +702,6 @@
 
   <popup name='RegionListMenu' accelerators='true'>
     <menuitem action='rlAudition'/>
-    <menuitem action='rlHide'/>
-    <menuitem action='rlShow'/>
-    <separator/>
-    <menuitem action='rlShowAll'/>
-    <menuitem action='rlShowAuto'/>
-    <menu name='Sort' action='RegionListSort'>
-      <menuitem action='SortAscending'/>
-      <menuitem action='SortDescending'/>
-      <separator/>
-      <menuitem action='SortByRegionName'/>
-      <menuitem action='SortByRegionLength'/>
-      <menuitem action='SortByRegionPosition'/>
-      <menuitem action='SortByRegionTimestamp'/>
-      <menuitem action='SortByRegionStartinFile'/>
-      <menuitem action='SortByRegionEndinFile'/>
-      <menuitem action='SortBySourceFileName'/>
-      <menuitem action='SortBySourceFileLength'/>
-      <menuitem action='SortBySourceFileCreationDate'/>
-      <menuitem action='SortBySourceFilesystem'/>
-    </menu>
     <separator/>
     <menuitem action='addExternalAudioToRegionList'/>
     <separator/>
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 6f52c3e8da..911f46213e 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -2465,14 +2465,8 @@ Editor::set_state (const XMLNode& node, int version)
 		set_stationary_playhead (yn);
 	}
 
-	RegionListSortType sort_type;
-	if (node.get_property ("region-list-sort-type", sort_type)) {
-		_regions->reset_sort_type (sort_type, true);
-	}
+	if (node.get_property ("show-editor-mixer", yn)) {
 
-	yn = false;
-	node.get_property ("show-editor-mixer", yn);
-	{
 		Glib::RefPtr<ToggleAction> tact = ActionManager::get_toggle_action (X_("Editor"), X_("show-editor-mixer"));
 		/* do it twice to force the change */
 		tact->set_active (!yn);
@@ -2582,7 +2576,6 @@ Editor::get_state ()
 	node->set_property ("maximised", _maximised);
 	node->set_property ("follow-playhead", _follow_playhead);
 	node->set_property ("stationary-playhead", _stationary_playhead);
-	node->set_property ("region-list-sort-type", _regions->sort_type ());
 	node->set_property ("mouse-mode", mouse_mode);
 	node->set_property ("join-object-range", smart_mode_action->get_active ());
 
@@ -5721,18 +5714,6 @@ Editor::audition_region_from_region_list ()
 }
 
 void
-Editor::hide_region_from_region_list ()
-{
-	_regions->selection_mapover (sigc::mem_fun (*this, &Editor::hide_a_region));
-}
-
-void
-Editor::show_region_in_region_list ()
-{
-	_regions->selection_mapover (sigc::mem_fun (*this, &Editor::show_a_region));
-}
-
-void
 Editor::step_edit_status_change (bool yn)
 {
 	if (yn) {
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index f8de048be4..71f9968867 100644
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -1283,8 +1283,6 @@ private:
 	void define_one_bar (samplepos_t start, samplepos_t end);
 
 	void audition_region_from_region_list ();
-	void hide_region_from_region_list ();
-	void show_region_in_region_list ();
 
 	void naturalize_region ();
 
diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc
index b01e26f7af..a96c39f4a4 100644
--- a/gtk2_ardour/editor_actions.cc
+++ b/gtk2_ardour/editor_actions.cc
@@ -667,47 +667,10 @@ Editor::register_actions ()
 	RadioAction::Group sort_order_group;
 
 	/* the region list popup menu */
-	ActionManager::register_action (rl_actions, X_("RegionListSort"), _("Sort"));
-
-	act = ActionManager::register_action (rl_actions, X_("rlAudition"), _("Audition"), sigc::mem_fun(*this, &Editor::audition_region_from_region_list));
-	ActionManager::region_list_selection_sensitive_actions.push_back (act);
-
-	act = ActionManager::register_action (rl_actions, X_("rlHide"), _("Hide"), sigc::mem_fun(*this, &Editor::hide_region_from_region_list));
-	ActionManager::region_list_selection_sensitive_actions.push_back (act);
-
-	act = ActionManager::register_action (rl_actions, X_("rlShow"), _("Show"), sigc::mem_fun(*this, &Editor::show_region_in_region_list));
+	act = myactions.register_action (rl_actions, X_("rlAudition"), _("Audition"), sigc::mem_fun(*this, &Editor::audition_region_from_region_list));
 	ActionManager::region_list_selection_sensitive_actions.push_back (act);
 
-	ActionManager::register_toggle_action (rl_actions, X_("rlShowAll"), _("Show All"), sigc::mem_fun(*_regions, &EditorRegions::toggle_full));
-	ActionManager::register_toggle_action (rl_actions, X_("rlShowAuto"), _("Show Automatic Regions"), sigc::mem_fun (*_regions, &EditorRegions::toggle_show_auto_regions));
-
-	ActionManager::register_radio_action (rl_actions, sort_order_group, X_("SortAscending"),  _("Ascending"),
-			sigc::bind (sigc::mem_fun (*_regions, &EditorRegions::reset_sort_direction), true));
-	ActionManager::register_radio_action (rl_actions, sort_order_group, X_("SortDescending"),   _("Descending"),
-			sigc::bind (sigc::mem_fun (*_regions, &EditorRegions::reset_sort_direction), false));
-
-	ActionManager::register_radio_action (rl_actions, sort_type_group, X_("SortByRegionName"),  _("By Region Name"),
-			sigc::bind (sigc::mem_fun (*_regions, &EditorRegions::reset_sort_type), ByName, false));
-	ActionManager::register_radio_action (rl_actions, sort_type_group, X_("SortByRegionLength"),  _("By Region Length"),
-			sigc::bind (sigc::mem_fun (*_regions, &EditorRegions::reset_sort_type), ByLength, false));
-	ActionManager::register_radio_action (rl_actions, sort_type_group, X_("SortByRegionPosition"),  _("By Region Position"),
-			sigc::bind (sigc::mem_fun (*_regions, &EditorRegions::reset_sort_type), ByPosition, false));
-	ActionManager::register_radio_action (rl_actions, sort_type_group, X_("SortByRegionTimestamp"),  _("By Region Timestamp"),
-			sigc::bind (sigc::mem_fun (*_regions, &EditorRegions::reset_sort_type), ByTimestamp, false));
-	ActionManager::register_radio_action (rl_actions, sort_type_group, X_("SortByRegionStartinFile"),  _("By Region Start in File"),
-			sigc::bind (sigc::mem_fun (*_regions, &EditorRegions::reset_sort_type), ByStartInFile, false));
-	ActionManager::register_radio_action (rl_actions, sort_type_group, X_("SortByRegionEndinFile"),  _("By Region End in File"),
-			sigc::bind (sigc::mem_fun (*_regions, &EditorRegions::reset_sort_type), ByEndInFile, false));
-	ActionManager::register_radio_action (rl_actions, sort_type_group, X_("SortBySourceFileName"),  _("By Source File Name"),
-			sigc::bind (sigc::mem_fun (*_regions, &EditorRegions::reset_sort_type), BySourceFileName, false));
-	ActionManager::register_radio_action (rl_actions, sort_type_group, X_("SortBySourceFileLength"),  _("By Source File Length"),
-			sigc::bind (sigc::mem_fun (*_regions, &EditorRegions::reset_sort_type), BySourceFileLength, false));
-	ActionManager::register_radio_action (rl_actions, sort_type_group, X_("SortBySourceFileCreationDate"),  _("By Source File Creation Date"),
-			sigc::bind (sigc::mem_fun (*_regions, &EditorRegions::reset_sort_type), BySourceFileCreationDate, false));
-	ActionManager::register_radio_action (rl_actions, sort_type_group, X_("SortBySourceFilesystem"),  _("By Source Filesystem"),
-			sigc::bind (sigc::mem_fun (*_regions, &EditorRegions::reset_sort_type), BySourceFileFS, false));
-
-	ActionManager::register_action (rl_actions, X_("removeUnusedRegions"), _("Remove Unused"), sigc::mem_fun (*_regions, &EditorRegions::remove_unused_regions));
+	myactions.register_action (rl_actions, X_("removeUnusedRegions"), _("Remove Unused"), sigc::mem_fun (*_regions, &EditorRegions::remove_unused_regions));
 
 	act = reg_sens (editor_actions, X_("addExistingPTFiles"), _("Import PT session"), sigc::mem_fun (*this, &Editor::external_pt_dialog));
 	ActionManager::write_sensitive_actions.push_back (act);
diff --git a/gtk2_ardour/editor_canvas_events.cc b/gtk2_ardour/editor_canvas_events.cc
index a7c61d14e6..911028ee9d 100644
--- a/gtk2_ardour/editor_canvas_events.cc
+++ b/gtk2_ardour/editor_canvas_events.cc
@@ -48,6 +48,7 @@
 #include "editor_drag.h"
 #include "midi_time_axis.h"
 #include "editor_regions.h"
+#include "editor_sources.h"
 #include "ui_config.h"
 #include "verbose_cursor.h"
 
@@ -1114,6 +1115,7 @@ Editor::canvas_note_event (GdkEvent *event, ArdourCanvas::Item* item)
 bool
 Editor::canvas_drop_zone_event (GdkEvent* event)
 {
+printf("canvas_drop_zone_event\n");
 	GdkEventScroll scroll;
 	ArdourCanvas::Duple winpos;
 
@@ -1167,6 +1169,8 @@ Editor::track_canvas_drag_motion (Glib::RefPtr<Gdk::DragContext> const& context,
 		return false;
 	}
 
+printf("DRAGGING:  track_canvas_drag_motion\n");
+
 	event.type = GDK_MOTION_NOTIFY;
 	event.button.x = x;
 	event.button.y = y;
@@ -1197,6 +1201,10 @@ Editor::track_canvas_drag_motion (Glib::RefPtr<Gdk::DragContext> const& context,
 
 	if (can_drop) {
 		region = _regions->get_dragged_region ();
+		if (!region) {
+			boost::shared_ptr<ARDOUR::Source> src = _sources->get_dragged_source ();
+			region = RegionFactory::get_whole_region_for_source (src);
+		}
 
 		if (region) {
 
@@ -1267,6 +1275,11 @@ Editor::drop_regions (const Glib::RefPtr<Gdk::DragContext>& /*context*/,
 	samplepos_t const pos = window_event_sample (&event, &px, &py);
 
 	boost::shared_ptr<Region> region = _regions->get_dragged_region ();
+	if (!region) {
+		boost::shared_ptr<ARDOUR::Source> src = _sources->get_dragged_source ();
+		region = RegionFactory::get_whole_region_for_source (src);
+	}
+
 	if (!region) { return; }
 
 	RouteTimeAxisView* rtav = 0;
diff --git a/gtk2_ardour/editor_regions.cc b/gtk2_ardour/editor_regions.cc
index c8c93bd269..8515efbdcf 100644
--- a/gtk2_ardour/editor_regions.cc
+++ b/gtk2_ardour/editor_regions.cc
@@ -31,6 +31,7 @@
 #include "ardour/silentfilesource.h"
 #include "ardour/region_factory.h"
 #include "ardour/session.h"
+#include "ardour/session_playlist.h"
 #include "ardour/profile.h"
 
 #include "gtkmm2ext/treeutils.h"
@@ -68,6 +69,8 @@ using Gtkmm2ext::Keyboard;
 
 struct ColumnInfo {
 	int         index;
+	int         sort_idx;
+	Gtk::AlignmentEnum al;
 	const char* label;
 	const char* tooltip;
 };
@@ -77,17 +80,13 @@ EditorRegions::EditorRegions (Editor* e)
 	, old_focus (0)
 	, name_editable (0)
 	, _menu (0)
-	, _show_automatic_regions (true)
-	, ignore_region_list_selection_change (false)
-	, ignore_selected_region_change (false)
 	, _no_redisplay (false)
-	, _sort_type ((Editing::RegionListSortType) 0)
-	, expanded (false)
 {
 	_display.set_size_request (100, -1);
 	_display.set_rules_hint (true);
-	_display.set_name ("EditGroupList");
+	_display.set_name ("RegionList");
 	_display.set_fixed_height_mode (true);
+	_display.set_reorderable (false);
 
 	/* Try to prevent single mouse presses from initiating edits.
 	   This relies on a hack in gtktreeview.c:gtk_treeview_button_press()
@@ -95,23 +94,28 @@ EditorRegions::EditorRegions (Editor* e)
 	_display.set_data ("mouse-edits-require-mod1", (gpointer) 0x1);
 
 	_model = TreeStore::create (_columns);
-	_model->set_sort_func (0, sigc::mem_fun (*this, &EditorRegions::sorter));
 	_model->set_sort_column (0, SORT_ASCENDING);
 
 	/* column widths */
-	int bbt_width, check_width, height;
+	int bbt_width, date_width, check_width, height;
 
 	Glib::RefPtr<Pango::Layout> layout = _display.create_pango_layout (X_("000|000|000"));
 	Gtkmm2ext::get_pixel_size (layout, bbt_width, height);
 
+	Glib::RefPtr<Pango::Layout> layout2 = _display.create_pango_layout (X_("2099-10-10 10:10:30"));
+	Gtkmm2ext::get_pixel_size (layout2, date_width, height);
+
 	check_width = 20;
 
 	TreeViewColumn* col_name = manage (new TreeViewColumn ("", _columns.name));
 	col_name->set_fixed_width (120);
 	col_name->set_sizing (TREE_VIEW_COLUMN_FIXED);
-	TreeViewColumn* col_position = manage (new TreeViewColumn ("", _columns.position));
-	col_position->set_fixed_width (bbt_width);
-	col_position->set_sizing (TREE_VIEW_COLUMN_FIXED);
+	TreeViewColumn* col_take = manage (new TreeViewColumn ("", _columns.take_id));
+	col_take->set_fixed_width (date_width);
+	col_take->set_sizing (TREE_VIEW_COLUMN_FIXED);
+	TreeViewColumn* col_start = manage (new TreeViewColumn ("", _columns.start));
+	col_start->set_fixed_width (bbt_width);
+	col_start->set_sizing (TREE_VIEW_COLUMN_FIXED);
 	TreeViewColumn* col_end = manage (new TreeViewColumn ("", _columns.end));
 	col_end->set_fixed_width (bbt_width);
 	col_end->set_sizing (TREE_VIEW_COLUMN_FIXED);
@@ -141,47 +145,62 @@ EditorRegions::EditorRegions (Editor* e)
 	col_opaque->set_sizing (TREE_VIEW_COLUMN_FIXED);
 
 	_display.append_column (*col_name);
-	_display.append_column (*col_position);
+	_display.append_column (*col_take);
+	_display.append_column (*col_start);
+	_display.append_column (*col_locked);
+	_display.append_column (*col_glued);
+	_display.append_column (*col_muted);
+	_display.append_column (*col_opaque);
 	_display.append_column (*col_end);
 	_display.append_column (*col_length);
 	_display.append_column (*col_sync);
 	_display.append_column (*col_fadein);
 	_display.append_column (*col_fadeout);
-	_display.append_column (*col_locked);
-	_display.append_column (*col_glued);
-	_display.append_column (*col_muted);
-	_display.append_column (*col_opaque);
 
 	TreeViewColumn* col;
 	Gtk::Label* l;
 
 	ColumnInfo ci[] = {
-		{ 0,   _("Region"),    _("Region name, with number of channels in []'s") },
-		{ 1,   _("Position"),  _("Position of start of region") },
-		{ 2,   _("End"),       _("Position of end of region") },
-		{ 3,   _("Length"),    _("Length of the region") },
-		{ 4,   _("Sync"),      _("Position of region sync point, relative to start of the region") },
-		{ 5,   _("Fade In"),   _("Length of region fade-in (units: secondary clock), () if disabled") },
-		{ 6,   _("Fade Out"),  _("Length of region fade-out (units: secondary clock), () if disabled") },
-		{ 7,  S_("Lock|L"),    _("Region position locked?") },
-		{ 8,  S_("Gain|G"),    _("Region position glued to Bars|Beats time?") },
-		{ 9,  S_("Mute|M"),    _("Region muted?") },
-		{ 10, S_("Opaque|O"),  _("Region opaque (blocks regions below it from being heard)?") },
-		{ -1, 0, 0 }
+		{ 0,  0,  ALIGN_LEFT,    _("Region"),    _("Region name, with number of channels in []'s") },
+		{ 1,  1,  ALIGN_LEFT,    _("Take"),      _("Take ID (or file creation time)") },
+		{ 2, 15,  ALIGN_RIGHT,   _("Start"),     _("Position of start of region") },
+		{ 3, -1,  ALIGN_CENTER, S_("Lock|L"),    _("Region position locked?") },
+		{ 4, -1,  ALIGN_CENTER, S_("Gain|G"),    _("Region position glued to Bars|Beats time?") },
+		{ 5, -1,  ALIGN_CENTER, S_("Mute|M"),    _("Region muted?") },
+		{ 6, -1,  ALIGN_CENTER, S_("Opaque|O"),  _("Region opaque (blocks regions below it from being heard)?") },
+		{ 7, -1,  ALIGN_RIGHT,  _("End"),       _("Position of end of region") },
+		{ 8, -1,  ALIGN_RIGHT,  _("Length"),    _("Length of the region") },
+		{ 9, -1,  ALIGN_RIGHT,  _("Sync"),      _("Position of region sync point, relative to start of the region") },
+		{ 10,-1,  ALIGN_RIGHT,  _("Fade In"),   _("Length of region fade-in (units: secondary clock), () if disabled") },
+		{ 11,-1,  ALIGN_RIGHT,  _("Fade Out"),  _("Length of region fade-out (units: secondary clock), () if disabled") },
+		{ -1,-1,  ALIGN_CENTER, 0, 0 }
 	};
 
 	for (int i = 0; ci[i].index >= 0; ++i) {
+
 		col = _display.get_column (ci[i].index);
+
+		//add the label
 		l = manage (new Label (ci[i].label));
+		l->set_alignment(ci[i].al);
 		set_tooltip (*l, ci[i].tooltip);
 		col->set_widget (*l);
 		l->show ();
 
-		if (ci[i].index > 6) {
-			col->set_expand (false);
-			col->set_alignment (ALIGN_CENTER);
+		col->set_sort_column(ci[i].sort_idx);
+
+		col->set_expand (false);
+
+		//this sets the alignment of the column header...
+		col->set_alignment (ci[i].al);
+
+		//...and this sets the alignment for the data cells
+		CellRendererText *renderer = dynamic_cast<CellRendererText*>(_display.get_column_cell_renderer (i));
+		if (renderer) {
+			renderer->property_xalign() = ( ci[i].al == ALIGN_RIGHT ? 1.0 : (ci[i].al == ALIGN_LEFT ? 0.0 : 0.5));
 		}
 	}
+
 	_display.set_model (_model);
 
 	_display.set_headers_visible (true);
@@ -189,50 +208,38 @@ EditorRegions::EditorRegions (Editor* e)
 
 	if (UIConfiguration::instance().get_use_tooltips()) {
 		/* show path as the row tooltip */
-		_display.set_tooltip_column (14); /* path */
+		_display.set_tooltip_column (12); /* path */
 	}
+	_display.get_selection()->set_select_function (sigc::mem_fun (*this, &EditorRegions::selection_filter));
 
+	//Region Name:  editable;  and color turns red if source is missing.
 	CellRendererText* region_name_cell = dynamic_cast<CellRendererText*>(_display.get_column_cell_renderer (0));
 	region_name_cell->property_editable() = true;
 	region_name_cell->signal_edited().connect (sigc::mem_fun (*this, &EditorRegions::name_edit));
 	region_name_cell->signal_editing_started().connect (sigc::mem_fun (*this, &EditorRegions::name_editing_started));
 
-	_display.get_selection()->set_select_function (sigc::mem_fun (*this, &EditorRegions::selection_filter));
-
 	TreeViewColumn* tv_col = _display.get_column(0);
 	CellRendererText* renderer = dynamic_cast<CellRendererText*>(_display.get_column_cell_renderer (0));
 	tv_col->add_attribute(renderer->property_text(), _columns.name);
 	tv_col->add_attribute(renderer->property_foreground_gdk(), _columns.color_);
 	tv_col->set_expand (true);
 
-	CellRendererToggle* locked_cell = dynamic_cast<CellRendererToggle*> (_display.get_column_cell_renderer (7));
+	CellRendererToggle* locked_cell = dynamic_cast<CellRendererToggle*> (_display.get_column_cell_renderer (3));
 	locked_cell->property_activatable() = true;
 	locked_cell->signal_toggled().connect (sigc::mem_fun (*this, &EditorRegions::locked_changed));
 
-	TreeViewColumn* locked_col = _display.get_column (7);
-	locked_col->add_attribute (locked_cell->property_visible(), _columns.property_toggles_visible);
-
-	CellRendererToggle* glued_cell = dynamic_cast<CellRendererToggle*> (_display.get_column_cell_renderer (8));
+	CellRendererToggle* glued_cell = dynamic_cast<CellRendererToggle*> (_display.get_column_cell_renderer (4));
 	glued_cell->property_activatable() = true;
 	glued_cell->signal_toggled().connect (sigc::mem_fun (*this, &EditorRegions::glued_changed));
 
-	TreeViewColumn* glued_col = _display.get_column (8);
-	glued_col->add_attribute (glued_cell->property_visible(), _columns.property_toggles_visible);
-
-	CellRendererToggle* muted_cell = dynamic_cast<CellRendererToggle*> (_display.get_column_cell_renderer (9));
+	CellRendererToggle* muted_cell = dynamic_cast<CellRendererToggle*> (_display.get_column_cell_renderer (5));
 	muted_cell->property_activatable() = true;
 	muted_cell->signal_toggled().connect (sigc::mem_fun (*this, &EditorRegions::muted_changed));
 
-	TreeViewColumn* muted_col = _display.get_column (9);
-	muted_col->add_attribute (muted_cell->property_visible(), _columns.property_toggles_visible);
-
-	CellRendererToggle* opaque_cell = dynamic_cast<CellRendererToggle*> (_display.get_column_cell_renderer (10));
+	CellRendererToggle* opaque_cell = dynamic_cast<CellRendererToggle*> (_display.get_column_cell_renderer (6));
 	opaque_cell->property_activatable() = true;
 	opaque_cell->signal_toggled().connect (sigc::mem_fun (*this, &EditorRegions::opaque_changed));
 
-	TreeViewColumn* opaque_col = _display.get_column (10);
-	opaque_col->add_attribute (opaque_cell->property_visible(), _columns.property_toggles_visible);
-
 	_display.get_selection()->set_mode (SELECTION_MULTIPLE);
 	_display.add_object_drag (_columns.region.index(), "regions");
 	_display.set_drag_column (_columns.name.index());
@@ -265,8 +272,6 @@ EditorRegions::EditorRegions (Editor* e)
 
 	//ARDOUR_UI::instance()->secondary_clock.mode_changed.connect (sigc::mem_fun(*this, &Editor::redisplay_regions));
 	ARDOUR_UI::instance()->primary_clock->mode_changed.connect (sigc::mem_fun(*this, &EditorRegions::update_all_rows));
-	ARDOUR::Region::RegionPropertyChanged.connect (region_property_connection, MISSING_INVALIDATOR, boost::bind (&EditorRegions::region_changed, this, _1, _2), gui_context());
-	ARDOUR::RegionFactory::CheckNewRegion.connect (check_new_region_connection, MISSING_INVALIDATOR, boost::bind (&EditorRegions::add_region, this, _1), gui_context());
 
 	e->EditorFreeze.connect (editor_freeze_connection, MISSING_INVALIDATOR, boost::bind (&EditorRegions::freeze_tree_model, this), gui_context());
 	e->EditorThaw.connect (editor_thaw_connection, MISSING_INVALIDATOR, boost::bind (&EditorRegions::thaw_tree_model, this), gui_context());
@@ -333,6 +338,10 @@ void
 EditorRegions::set_session (ARDOUR::Session* s)
 {
 	SessionHandlePtr::set_session (s);
+	
+	ARDOUR::Region::RegionPropertyChanged.connect (region_property_connection, MISSING_INVALIDATOR, boost::bind (&EditorRegions::region_changed, this, _1, _2), gui_context());
+	ARDOUR::RegionFactory::CheckNewRegion.connect (check_new_region_connection, MISSING_INVALIDATOR, boost::bind (&EditorRegions::add_region, this, _1), gui_context());
+
 	redisplay ();
 }
 
@@ -343,154 +352,23 @@ EditorRegions::add_region (boost::shared_ptr<Region> region)
 		return;
 	}
 
-	string str;
-	TreeModel::Row row;
-	Gdk::Color c;
-	bool missing_source = boost::dynamic_pointer_cast<SilentFileSource>(region->source()) != NULL;
-	TreeModel::iterator iter;
-
-	if (!_show_automatic_regions && region->automatic()) {
-		return;
-	}
-
-	if (region->hidden()) {
-
-		iter = _model->get_iter ("0");
-		TreeModel::Row parent;
-
-		if (!iter) {
-			parent = *(_model->append());
-			parent[_columns.name] = _("Hidden");
-			boost::shared_ptr<Region> proxy = parent[_columns.region];
-			proxy.reset ();
-		} else {
-			string s = (*iter)[_columns.name];
-			if (s != _("Hidden")) {
-				parent = *(_model->insert(iter));
-				parent[_columns.name] = _("Hidden");
-				boost::shared_ptr<Region> proxy = parent[_columns.region];
-				proxy.reset ();
-			} else {
-				parent = *iter;
-			}
-		}
-
-		iter = _model->append (parent.children());
-		row = *iter;
-
-	} else if (region->whole_file()) {
-
-		TreeModel::iterator i;
-		TreeModel::Children rows = _model->children();
-
-		for (i = rows.begin(); i != rows.end(); ++i) {
-			boost::shared_ptr<Region> rr = (*i)[_columns.region];
-
-			if (rr && region->region_list_equivalent (rr)) {
-				return;
-			}
-		}
-
-		iter = _model->append();
-		row = *iter;
-
-		if (missing_source) {
-			// c.set_rgb(65535,0,0);     // FIXME: error color from style
-			set_color_from_rgba (c, UIConfiguration::instance().color ("region list missing source"));
-
-		} else if (region->automatic()){
-			// c.set_rgb(0,65535,0);     // FIXME: error color from style
-			set_color_from_rgba (c, UIConfiguration::instance().color ("region list automatic"));
-
-		} else {
-			set_color_from_rgba (c, UIConfiguration::instance().color ("region list whole file"));
-		}
-
-		row[_columns.color_] = c;
-
-		if (region->source()->name()[0] == '/') { // external file
-
-			if (region->whole_file()) {
-
-				boost::shared_ptr<AudioFileSource> afs = boost::dynamic_pointer_cast<AudioFileSource>(region->source());
-				str = ".../";
-
-				if (afs) {
-					str = region_name_from_path (afs->path(), region->n_channels() > 1);
-				} else {
-					str += region->source()->name();
-				}
-
-			} else {
-				str = region->name();
-			}
-
-		} else {
-			str = region->name();
-		}
-
-		populate_row_name (region, row);
-		row[_columns.region] = region;
-		row[_columns.property_toggles_visible] = false;
-
-		if (missing_source) {
-			row[_columns.path] = _("(MISSING) ") + Gtkmm2ext::markup_escape_text (region->source()->name());
-
-		} else {
-			boost::shared_ptr<FileSource> fs = boost::dynamic_pointer_cast<FileSource>(region->source());
-			if (fs) {
-				row[_columns.path] = Gtkmm2ext::markup_escape_text (fs->path());
-			} else {
-				row[_columns.path] = Gtkmm2ext::markup_escape_text (region->source()->name());
-			}
-		}
-
-		region_row_map.insert(pair<boost::shared_ptr<ARDOUR::Region>, Gtk::TreeModel::iterator>(region, iter));
-		parent_regions_sources_map.insert(pair<string, Gtk::TreeModel::RowReference>(region->source_string(), TreeRowReference(_model, TreePath (row))) );
-
-		return;
-
-	} else {
-		// find parent node, add as new child
-		TreeModel::iterator i;
-
-		RegionSourceMap::iterator it;
-
-		it = parent_regions_sources_map.find (region->source_string());
-
-		if (it != parent_regions_sources_map.end()){
-
-			TreeModel::iterator j = _model->get_iter ((*it).second.get_path());
-
-			TreeModel::iterator ii;
-			TreeModel::Children subrows = (*j).children();
-
-			/* XXXX: should we be accounting for all regions? */
-			/*
-			for (ii = subrows.begin(); ii != subrows.end(); ++ii) {
-				boost::shared_ptr<Region> rr = (*ii)[_columns.region];
-
-				if (region->region_list_equivalent (rr)) {
-					return;
-				}
-			}
-			*/
-
-			iter = _model->insert (subrows.end());
-			row = *iter;
-
-		} else {
-			iter = _model->append();
-			row = *iter;
-		}
+	PropertyChange pc;
+	region_changed(region, pc);
+}
 
-		row[_columns.property_toggles_visible] = true;
+void
+EditorRegions::destroy_region (boost::shared_ptr<ARDOUR::Region> region)
+{
+	//UNTESTED
+	//At the time of writing, the only way to remove regions is "cleanup"
+	//by definition, "cleanup" only removes regions that aren't on the timeline
+	//so this would be a no-op anyway
+	//perhaps someday we will allow users to manually destroy regions.
+	RegionRowMap::iterator map_it = region_row_map.find (region);
+	if ( map_it != region_row_map.end() ) {
+		region_row_map.erase(map_it);
+		_model->erase( map_it->second );
 	}
-
-	row[_columns.region] = region;
-	region_row_map.insert (pair<boost::shared_ptr<ARDOUR::Region>,Gtk::TreeModel::iterator> (region,iter));
-	PropertyChange pc;
-	populate_row(region, (*row), pc);
 }
 
 void
@@ -522,81 +400,44 @@ EditorRegions::remove_unused_regions ()
 void
 EditorRegions::region_changed (boost::shared_ptr<Region> r, const PropertyChange& what_changed)
 {
-	//maybe update the grid here
-	PropertyChange grid_interests;
-	grid_interests.add (ARDOUR::Properties::position);
-	grid_interests.add (ARDOUR::Properties::length);
-	grid_interests.add (ARDOUR::Properties::sync_position);
-	if (what_changed.contains (grid_interests)) {
-		_editor->mark_region_boundary_cache_dirty();
-	}
-
-	PropertyChange our_interests;
-
-	our_interests.add (ARDOUR::Properties::name);
-	our_interests.add (ARDOUR::Properties::position);
-	our_interests.add (ARDOUR::Properties::length);
-	our_interests.add (ARDOUR::Properties::start);
-	our_interests.add (ARDOUR::Properties::sync_position);
-	our_interests.add (ARDOUR::Properties::locked);
-	our_interests.add (ARDOUR::Properties::position_lock_style);
-	our_interests.add (ARDOUR::Properties::muted);
-	our_interests.add (ARDOUR::Properties::opaque);
-	our_interests.add (ARDOUR::Properties::fade_in);
-	our_interests.add (ARDOUR::Properties::fade_out);
-	our_interests.add (ARDOUR::Properties::fade_in_active);
-	our_interests.add (ARDOUR::Properties::fade_out_active);
-
-	if (what_changed.contains (our_interests)) {
-		if (last_row != 0) {
-
-			TreeModel::iterator j = _model->get_iter (last_row.get_path());
-			boost::shared_ptr<Region> c = (*j)[_columns.region];
-
-			if (c == r) {
-				populate_row (r, (*j), what_changed);
-
-				if (what_changed.contains (ARDOUR::Properties::hidden)) {
-					redisplay ();
-				}
-
-				return;
-			}
+	RegionRowMap::iterator map_it = region_row_map.find (r);
+
+	boost::shared_ptr<ARDOUR::Playlist> pl = r->playlist();
+	if ( !( pl && _session && _session->playlist_is_active(pl) ) ) {
+		//this region is not on an active playlist
+		//maybe it got deleted, or whatever
+		if ( map_it != region_row_map.end() ) {
+			region_row_map.erase(map_it);
+			_model->erase( map_it->second );
 		}
+		return;
+	}
+		
+	if ( map_it != region_row_map.end() ) {
 
-		RegionRowMap::iterator it;
-
-		it = region_row_map.find (r);
-
-		if (it != region_row_map.end()){
+		//found the region, update its row properties
+		TreeModel::Row row = *(map_it->second);
+		populate_row (r, row, what_changed);
 
-			TreeModel::iterator j = it->second;
-			boost::shared_ptr<Region> c = (*j)[_columns.region];
+	} else {
 
-			if (c == r) {
-				populate_row (r, (*j), what_changed);
+		//new region, add it to the list
+		TreeModel::iterator iter = _model->append();
+		TreeModel::Row row = *iter;
+		region_row_map.insert (pair<boost::shared_ptr<ARDOUR::Region>,Gtk::TreeModel::iterator> (r,iter));
 
-				if (what_changed.contains (ARDOUR::Properties::hidden)) {
-					redisplay ();
-				}
+		//set the properties that don't change
+		row[_columns.region] = r;
 
-				return;
-			}
-		}
-	}
+		//now populate the properties that might change...
+		populate_row (r, row, PropertyChange());
 
-	if (what_changed.contains (ARDOUR::Properties::hidden)) {
-		redisplay ();
 	}
 }
 
 void
 EditorRegions::selection_changed ()
 {
-	if (ignore_region_list_selection_change) {
-		return;
-	}
-
 	_editor->_region_selection_change_updates_region_list = false;
 
 	if (_display.get_selection()->count_selected_rows() > 0) {
@@ -657,47 +498,21 @@ EditorRegions::redisplay ()
 		return;
 	}
 
-	bool tree_expanded = false;
-
-	/* If the list was expanded prior to rebuilding, expand it again afterwards */
-	if (toggle_full_action()->get_active()) {
-		tree_expanded = true;
-	}
-
 	_display.set_model (Glib::RefPtr<Gtk::TreeStore>(0));
 	_model->clear ();
 	_model->set_sort_column (-2, SORT_ASCENDING); //Disable sorting to gain performance
 
 	region_row_map.clear();
-	parent_regions_sources_map.clear();
-
-	/* now add everything we have, via a temporary list used to help with sorting */
 
 	const RegionFactory::RegionMap& regions (RegionFactory::regions());
-
 	for (RegionFactory::RegionMap::const_iterator i = regions.begin(); i != regions.end(); ++i) {
-
-		if ( i->second->whole_file()) {
-			/* add automatic regions first so that children can find their parents as we add them */
+		if ( ! i->second->whole_file() ) {
 			add_region (i->second);
-			continue;
 		}
-
-		tmp_region_list.push_front (i->second);
-	}
-
-	for (list<boost::shared_ptr<Region> >::iterator r = tmp_region_list.begin(); r != tmp_region_list.end(); ++r) {
-		add_region (*r);
 	}
 
 	_model->set_sort_column (0, SORT_ASCENDING); // renabale sorting
 	_display.set_model (_model);
-
-	tmp_region_list.clear();
-
-	if (tree_expanded) {
-		_display.expand_all();
-	}
 }
 
 void
@@ -733,10 +548,8 @@ EditorRegions::update_all_rows ()
 
 		boost::shared_ptr<Region> region = (*j)[_columns.region];
 
-		if (!region->automatic()) {
-			PropertyChange c;
-			populate_row(region, (*j), c);
-		}
+		PropertyChange c;
+		populate_row(region, (*j), c);
 	}
 }
 
@@ -812,40 +625,61 @@ EditorRegions::format_position (samplepos_t pos, char* buf, size_t bufsize, bool
 void
 EditorRegions::populate_row (boost::shared_ptr<Region> region, TreeModel::Row const &row, PBD::PropertyChange const &what_changed)
 {
+	//the grid is most interested in the regions that are *visible* in the editor.  this is a perfect place to flag changes to the grid cache
+	//maybe update the grid here
+	PropertyChange grid_interests;
+	grid_interests.add (ARDOUR::Properties::position);
+	grid_interests.add (ARDOUR::Properties::length);
+	grid_interests.add (ARDOUR::Properties::sync_position);
+	if (what_changed.contains (grid_interests)) {
+		_editor->mark_region_boundary_cache_dirty();
+	}
+
+	//note: do this in populate_row
+	{
+		Gdk::Color c;
+		bool missing_source = boost::dynamic_pointer_cast<SilentFileSource>(region->source()) != NULL;
+		if (missing_source) {
+			// c.set_rgb(65535,0,0);     // FIXME: error color from style
+			set_color_from_rgba (c, UIConfiguration::instance().color ("region list missing source"));
+		} else {
+			set_color_from_rgba (c, UIConfiguration::instance().color ("region list whole file"));
+		}
+
+		row[_columns.color_] = c;
+	}
+	
 	boost::shared_ptr<AudioRegion> audioregion = boost::dynamic_pointer_cast<AudioRegion>(region);
-	//uint32_t used = _session->playlists->region_use_count (region);
-	/* Presently a region is only used once so let's save on the sequential scan to determine use count */
-	uint32_t used = 1;
 
 	PropertyChange c;
 	const bool all = what_changed == c;
 
 	if (all || what_changed.contains (Properties::position)) {
-		populate_row_position (region, row, used);
+		populate_row_position (region, row);
 	}
 	if (all || what_changed.contains (Properties::start) || what_changed.contains (Properties::sync_position)) {
-		populate_row_sync (region, row, used);
+		populate_row_sync (region, row);
 	}
 	if (all || what_changed.contains (Properties::fade_in)) {
-		populate_row_fade_in (region, row, used, audioregion);
+		populate_row_fade_in (region, row, audioregion);
 	}
 	if (all || what_changed.contains (Properties::fade_out)) {
-		populate_row_fade_out (region, row, used, audioregion);
+		populate_row_fade_out (region, row, audioregion);
 	}
 	if (all || what_changed.contains (Properties::locked)) {
-		populate_row_locked (region, row, used);
+		populate_row_locked (region, row);
 	}
 	if (all || what_changed.contains (Properties::position_lock_style)) {
-		populate_row_glued (region, row, used);
+		populate_row_glued (region, row);
 	}
 	if (all || what_changed.contains (Properties::muted)) {
-		populate_row_muted (region, row, used);
+		populate_row_muted (region, row);
 	}
 	if (all || what_changed.contains (Properties::opaque)) {
-		populate_row_opaque (region, row, used);
+		populate_row_opaque (region, row);
 	}
 	if (all || what_changed.contains (Properties::length)) {
-		populate_row_end (region, row, used);
+		populate_row_end (region, row);
 		populate_row_length (region, row);
 	}
 	if (all) {
@@ -854,9 +688,6 @@ EditorRegions::populate_row (boost::shared_ptr<Region> region, TreeModel::Row co
 	if (all || what_changed.contains (Properties::name)) {
 		populate_row_name (region, row);
 	}
-	if (all) {
-		populate_row_used (region, row, used);
-	}
 }
 
 #if 0
@@ -891,14 +722,6 @@ EditorRegions::populate_row (boost::shared_ptr<Region> region, TreeModel::Row co
 #endif
 
 void
-EditorRegions::populate_row_used (boost::shared_ptr<Region>, TreeModel::Row const& row, uint32_t used)
-{
-	char buf[8];
-	snprintf (buf, sizeof (buf), "%4d" , used);
-	row[_columns.used] = buf;
-}
-
-void
 EditorRegions::populate_row_length (boost::shared_ptr<Region> region, TreeModel::Row const &row)
 {
 	char buf[16];
@@ -915,13 +738,9 @@ EditorRegions::populate_row_length (boost::shared_ptr<Region> region, TreeModel:
 }
 
 void
-EditorRegions::populate_row_end (boost::shared_ptr<Region> region, TreeModel::Row const &row, uint32_t used)
+EditorRegions::populate_row_end (boost::shared_ptr<Region> region, TreeModel::Row const &row)
 {
-	if (region->whole_file()) {
-		row[_columns.end] = "";
-	} else if (used > 1) {
-		row[_columns.end] = _("Mult.");
-	} else if (region->last_sample() >= region->first_sample()) {
+	if (region->last_sample() >= region->first_sample()) {
 		char buf[16];
 		format_position (region->last_sample(), buf, sizeof (buf));
 		row[_columns.end] = buf;
@@ -931,115 +750,79 @@ EditorRegions::populate_row_end (boost::shared_ptr<Region> region, TreeModel::Ro
 }
 
 void
-EditorRegions::populate_row_position (boost::shared_ptr<Region> region, TreeModel::Row const &row, uint32_t used)
+EditorRegions::populate_row_position (boost::shared_ptr<Region> region, TreeModel::Row const &row)
 {
-	if (region->whole_file()) {
-		row[_columns.position] = "";
-	} else if (used > 1) {
-		row[_columns.position] = _("Mult.");
-	} else {
-		char buf[16];
-		format_position (region->position(), buf, sizeof (buf));
-		row[_columns.position] = buf;
-	}
+	row[_columns.position] = region->position();
+
+	char buf[16];
+	format_position (region->position(), buf, sizeof (buf));
+	row[_columns.start] = buf;
 }
 
 void
-EditorRegions::populate_row_sync (boost::shared_ptr<Region> region, TreeModel::Row const &row, uint32_t used)
+EditorRegions::populate_row_sync (boost::shared_ptr<Region> region, TreeModel::Row const &row)
 {
-	if (region->whole_file()) {
-		row[_columns.sync] = "";
-	} else if (used > 1) {
-		row[_columns.sync] = _("Mult."); /* translators: a short phrase for "multiple" as in "many" */
+	if (region->sync_position() == region->position()) {
+		row[_columns.sync] = _("Start");
+	} else if (region->sync_position() == (region->last_sample())) {
+		row[_columns.sync] = _("End");
 	} else {
-		if (region->sync_position() == region->position()) {
-			row[_columns.sync] = _("Start");
-		} else if (region->sync_position() == (region->last_sample())) {
-			row[_columns.sync] = _("End");
-		} else {
-			char buf[16];
-			format_position (region->sync_position(), buf, sizeof (buf));
-			row[_columns.sync] = buf;
-		}
+		char buf[16];
+		format_position (region->sync_position(), buf, sizeof (buf));
+		row[_columns.sync] = buf;
 	}
 }
 
 void
-EditorRegions::populate_row_fade_in (boost::shared_ptr<Region> region, TreeModel::Row const &row, uint32_t used, boost::shared_ptr<AudioRegion> audioregion)
+EditorRegions::populate_row_fade_in (boost::shared_ptr<Region> region, TreeModel::Row const &row, boost::shared_ptr<AudioRegion> audioregion)
 {
-	if (!audioregion || region->whole_file()) {
+	if (!audioregion) {
 		row[_columns.fadein] = "";
 	} else {
-		if (used > 1) {
-			row[_columns.fadein] = _("Multiple");
-		} else {
-			char buf[32];
-			format_position (audioregion->fade_in()->back()->when, buf, sizeof (buf), audioregion->fade_in_active());
-			row[_columns.fadein] = buf;
-		}
+		char buf[32];
+		format_position (audioregion->fade_in()->back()->when, buf, sizeof (buf), audioregion->fade_in_active());
+		row[_columns.fadein] = buf;
 	}
 }
 
 void
-EditorRegions::populate_row_fade_out (boost::shared_ptr<Region> region, TreeModel::Row const &row, uint32_t used, boost::shared_ptr<AudioRegion> audioregion)
+EditorRegions::populate_row_fade_out (boost::shared_ptr<Region> region, TreeModel::Row const &row, boost::shared_ptr<AudioRegion> audioregion)
 {
-	if (!audioregion || region->whole_file()) {
+	if (!audioregion) {
 		row[_columns.fadeout] = "";
 	} else {
-		if (used > 1) {
-			row[_columns.fadeout] = _("Multiple");
-		} else {
-			char buf[32];
-			format_position (audioregion->fade_out()->back()->when, buf, sizeof (buf), audioregion->fade_out_active());
-			row[_columns.fadeout] = buf;
-		}
+		char buf[32];
+		format_position (audioregion->fade_out()->back()->when, buf, sizeof (buf), audioregion->fade_out_active());
+		row[_columns.fadeout] = buf;
 	}
 }
 
 void
-EditorRegions::populate_row_locked (boost::shared_ptr<Region> region, TreeModel::Row const &row, uint32_t used)
+EditorRegions::populate_row_locked (boost::shared_ptr<Region> region, TreeModel::Row const &row)
 {
-	if (region->whole_file()) {
-		row[_columns.locked] = false;
-	} else if (used > 1) {
-		row[_columns.locked] = false;
-	} else {
-		row[_columns.locked] = region->locked();
-	}
+	row[_columns.locked] = region->locked();
 }
 
 void
-EditorRegions::populate_row_glued (boost::shared_ptr<Region> region, TreeModel::Row const &row, uint32_t used)
+EditorRegions::populate_row_glued (boost::shared_ptr<Region> region, TreeModel::Row const &row)
 {
-	if (region->whole_file() || used > 1) {
-		row[_columns.glued] = false;
+	if (region->position_lock_style() == MusicTime) {
+		row[_columns.glued] = true;
 	} else {
-		if (region->position_lock_style() == MusicTime) {
-			row[_columns.glued] = true;
-		} else {
-			row[_columns.glued] = false;
-		}
+		row[_columns.glued] = false;
 	}
 }
 
 void
-EditorRegions::populate_row_muted (boost::shared_ptr<Region> region, TreeModel::Row const &row, uint32_t used)
+EditorRegions::populate_row_muted (boost::shared_ptr<Region> region, TreeModel::Row const &row)
 {
-	if (region->whole_file() || used > 1) {
-		row[_columns.muted] = false;
-	} else {
-		row[_columns.muted] = region->muted();
-	}
+	row[_columns.muted] = region->muted();
 }
 
 void
-EditorRegions::populate_row_opaque (boost::shared_ptr<Region> region, TreeModel::Row const &row, uint32_t used)
+EditorRegions::populate_row_opaque (boost::shared_ptr<Region> region, TreeModel::Row const &row)
 {
-	if (region->whole_file() || used > 1) {
-		row[_columns.opaque] = false;
-	} else {
-		row[_columns.opaque] = region->opaque();
-	}
+	row[_columns.opaque] = region->opaque();
 }
 
 void
@@ -1060,31 +843,8 @@ EditorRegions::populate_row_source (boost::shared_ptr<Region> region, TreeModel:
 	} else {
 		row[_columns.path] = Gtkmm2ext::markup_escape_text (region->source()->name());
 	}
-}
-
-void
-EditorRegions::toggle_show_auto_regions ()
-{
-	_show_automatic_regions = toggle_show_auto_regions_action()->get_active();
-	redisplay ();
-}
 
-void
-EditorRegions::toggle_full ()
-{
-	set_full (toggle_full_action()->get_active ());
-}
-
-void
-EditorRegions::set_full (bool f)
-{
-	if (f) {
-		_display.expand_all ();
-		expanded = true;
-	} else {
-		_display.collapse_all ();
-		expanded = false;
-	}
+	row[_columns.take_id] = region->source()->take_id();  //TODO:  what if there is no take-id?  anything else we can use?
 }
 
 void
@@ -1100,27 +860,6 @@ EditorRegions::show_context_menu (int button, int time)
 		ActionManager::set_sensitive (ActionManager::region_list_selection_sensitive_actions, false);
 	}
 
-	/* Enable the "Show" option if any selected regions are hidden, and vice versa for "Hide" */
-
-	bool have_shown = false;
-	bool have_hidden = false;
-
-	TreeView::Selection::ListHandle_Path rows = _display.get_selection()->get_selected_rows ();
-	for (TreeView::Selection::ListHandle_Path::iterator i = rows.begin(); i != rows.end(); ++i) {
-		TreeIter t = _model->get_iter (*i);
-		boost::shared_ptr<Region> r = (*t)[_columns.region];
-		if (r) {
-			if (r->hidden ()) {
-				have_hidden = true;
-			} else {
-				have_shown = true;
-			}
-		}
-	}
-
-	hide_action()->set_sensitive (have_shown);
-	show_action()->set_sensitive (have_hidden);
-
 	_menu->popup (button, time);
 }
 
@@ -1188,113 +927,6 @@ EditorRegions::button_press (GdkEventButton *ev)
 	return false;
 }
 
-int
-EditorRegions::sorter (TreeModel::iterator a, TreeModel::iterator b)
-{
-	int cmp = 0;
-
-	boost::shared_ptr<Region> r1 = (*a)[_columns.region];
-	boost::shared_ptr<Region> r2 = (*b)[_columns.region];
-
-	/* handle rows without regions, like "Hidden" */
-
-	if (r1 == 0) {
-		return -1;
-	}
-
-	if (r2 == 0) {
-		return 1;
-	}
-
-	boost::shared_ptr<AudioRegion> region1 = boost::dynamic_pointer_cast<AudioRegion> (r1);
-	boost::shared_ptr<AudioRegion> region2 = boost::dynamic_pointer_cast<AudioRegion> (r2);
-
-	if (region1 == 0 || region2 == 0) {
-		std::string s1;
-		std::string s2;
-		switch (_sort_type) {
-		case ByName:
-			s1 = (*a)[_columns.name];
-			s2 = (*b)[_columns.name];
-			return (s1.compare (s2));
-		default:
-			return 0;
-		}
-	}
-
-	switch (_sort_type) {
-	case ByName:
-		cmp = region1->name().compare(region2->name());
-		break;
-
-	case ByLength:
-		cmp = region1->length() - region2->length();
-		break;
-
-	case ByPosition:
-		cmp = region1->position() - region2->position();
-		break;
-
-	case ByTimestamp:
-		cmp = region1->source()->timestamp() - region2->source()->timestamp();
-		break;
-
-	case ByStartInFile:
-		cmp = region1->start() - region2->start();
-		break;
-
-	case ByEndInFile:
-		// cerr << "Compare " << (region1->start() + region1->length()) << " and " << (region2->start() + region2->length()) << endl;
-		cmp = (region1->start() + region1->length()) - (region2->start() + region2->length());
-		break;
-
-	case BySourceFileName:
-		cmp = region1->source()->name().compare(region2->source()->name());
-		break;
-
-	case BySourceFileLength:
-		cmp = region1->source_length(0) - region2->source_length(0);
-		break;
-
-	case BySourceFileCreationDate:
-		cmp = region1->source()->timestamp() - region2->source()->timestamp();
-		break;
-
-	case BySourceFileFS:
-		if (region1->source()->name() == region2->source()->name()) {
-			cmp = region1->name().compare(region2->name());
-		} else {
-			cmp = region1->source()->name().compare(region2->source()->name());
-		}
-		break;
-	}
-
-	// cerr << "Comparison on " << enum_2_string (_sort_type) << " gives " << cmp << endl;
-
-	if (cmp < 0) {
-		return -1;
-	} else if (cmp > 0) {
-		return 1;
-	} else {
-		return 0;
-	}
-}
-
-void
-EditorRegions::reset_sort_type (RegionListSortType type, bool force)
-{
-	if (type != _sort_type || force) {
-		_sort_type = type;
-		_model->set_sort_func (0, (sigc::mem_fun (*this, &EditorRegions::sorter)));
-	}
-}
-
-void
-EditorRegions::reset_sort_direction (bool up)
-{
-	_model->set_sort_column (0, up ? SORT_ASCENDING : SORT_DESCENDING);
-}
-
 void
 EditorRegions::selection_mapover (sigc::slot<void,boost::shared_ptr<Region> > sl)
 {
@@ -1453,7 +1085,6 @@ EditorRegions::clear ()
 
 	/* Clean up the maps */
 	region_row_map.clear();
-	parent_regions_sources_map.clear();
 }
 
 boost::shared_ptr<Region>
@@ -1487,14 +1118,10 @@ EditorRegions::freeze_tree_model (){
 }
 
 void
-EditorRegions::thaw_tree_model (){
-
+EditorRegions::thaw_tree_model ()
+{
 	_model->set_sort_column (0, SORT_ASCENDING); // renabale sorting
 	_display.set_model (_model);
-
-	if (toggle_full_action()->get_active()) {
-		_display.expand_all();
-	}
 }
 
 void
@@ -1554,13 +1181,9 @@ EditorRegions::get_state () const
 {
 	XMLNode* node = new XMLNode (X_("RegionList"));
 
-	node->set_property (X_("sort-type"), _sort_type);
-
-	RefPtr<Action> act = ActionManager::get_action (X_("RegionList"), X_("SortAscending"));
-	bool const ascending = RefPtr<RadioAction>::cast_dynamic(act)->get_active ();
-	node->set_property (X_("sort-ascending"), ascending);
-	node->set_property (X_("show-all"), toggle_full_action()->get_active());
-	node->set_property (X_("show-automatic-regions"), _show_automatic_regions);
+	//TODO
+//	node->set_property (X_("sort-col"), _sort_type);
+//	node->set_property (X_("sort-asc"), _sort_type);
 
 	return *node;
 }
@@ -1574,136 +1197,13 @@ EditorRegions::set_state (const XMLNode & node)
 		return;
 	}
 
-	Editing::RegionListSortType t;
-	if (node.get_property (X_("sort-type"), t)) {
-
-		if (_sort_type != t) {
-			changed = true;
-		}
-
-		reset_sort_type (t, true);
-		RefPtr<RadioAction> ract = sort_type_action (t);
-		ract->set_active ();
-	}
-
-	bool yn;
-	if (node.get_property (X_("sort-ascending"), yn)) {
-		SortType old_sort_type;
-		int old_sort_column;
-
-		_model->get_sort_column_id (old_sort_column, old_sort_type);
-
-		if (old_sort_type != (yn ? SORT_ASCENDING : SORT_DESCENDING)) {
-			changed = true;
-		}
-
-		reset_sort_direction (yn);
-		RefPtr<Action> act;
-
-		if (yn) {
-			act = ActionManager::get_action (X_("RegionList"), X_("SortAscending"));
-		} else {
-			act = ActionManager::get_action (X_("RegionList"), X_("SortDescending"));
-		}
-
-		RefPtr<RadioAction>::cast_dynamic(act)->set_active ();
-	}
-
-	if (node.get_property (X_("show-all"), yn)) {
-		if (expanded != yn) {
-			changed = true;
-		}
-
-		set_full (yn);
-		toggle_full_action()->set_active (yn);
-	}
-
-	if (node.get_property (X_("show-automatic-regions"), yn)) {
-		if (yn != _show_automatic_regions) {
-			_show_automatic_regions = yn;
-			toggle_show_auto_regions_action()->set_active (yn);
-			changed = true;
-		}
-	}
-
 	if (changed) {
 		redisplay ();
 	}
 }
 
-RefPtr<RadioAction>
-EditorRegions::sort_type_action (Editing::RegionListSortType t) const
-{
-	const char* action = 0;
-
-	switch (t) {
-	case Editing::ByName:
-		action = X_("SortByRegionName");
-		break;
-	case Editing::ByLength:
-		action = X_("SortByRegionLength");
-		break;
-	case Editing::ByPosition:
-		action = X_("SortByRegionPosition");
-		break;
-	case Editing::ByTimestamp:
-		action = X_("SortByRegionTimestamp");
-		break;
-	case Editing::ByStartInFile:
-		action = X_("SortByRegionStartinFile");
-		break;
-	case Editing::ByEndInFile:
-		action = X_("SortByRegionEndinFile");
-		break;
-	case Editing::BySourceFileName:
-		action = X_("SortBySourceFileName");
-		break;
-	case Editing::BySourceFileLength:
-		action = X_("SortBySourceFileLength");
-		break;
-	case Editing::BySourceFileCreationDate:
-		action = X_("SortBySourceFileCreationDate");
-		break;
-	case Editing::BySourceFileFS:
-		action = X_("SortBySourceFilesystem");
-		break;
-	default:
-		fatal << string_compose (_("programming error: %1: %2"), "EditorRegions: impossible sort type", (int) t) << endmsg;
-		abort(); /*NOTREACHED*/
-	}
-
-	RefPtr<Action> act = ActionManager::get_action (X_("RegionList"), action);
-	assert (act);
-
-	return RefPtr<RadioAction>::cast_dynamic (act);
-}
-
-RefPtr<Action>
-EditorRegions::hide_action () const
-{
-	return ActionManager::get_action (X_("RegionList"), X_("rlHide"));
-}
-
-RefPtr<Action>
-EditorRegions::show_action () const
-{
-	return ActionManager::get_action (X_("RegionList"), X_("rlShow"));
-}
-
 RefPtr<Action>
 EditorRegions::remove_unused_regions_action () const
 {
 	return ActionManager::get_action (X_("RegionList"), X_("removeUnusedRegions"));
 }
-
-RefPtr<ToggleAction>
-EditorRegions::toggle_full_action () const
-{
-	return ActionManager::get_toggle_action (X_("RegionList"), X_("rlShowAll"));
-}
-
-RefPtr<ToggleAction>
-EditorRegions::toggle_show_auto_regions_action () const
-{
-	return ActionManager::get_toggle_action (X_("RegionList"), X_("rlShowAuto"));
-}
diff --git a/gtk2_ardour/editor_regions.h b/gtk2_ardour/editor_regions.h
index 4b491e673d..f3543bac0b 100644
--- a/gtk2_ardour/editor_regions.h
+++ b/gtk2_ardour/editor_regions.h
@@ -41,20 +41,12 @@ public:
 
 	void clear ();
 
-	void toggle_full ();
-	void toggle_show_auto_regions ();
-	void reset_sort_direction (bool);
-	void reset_sort_type (Editing::RegionListSortType, bool);
 	void set_selected (RegionSelection &);
 	void selection_mapover (sigc::slot<void,boost::shared_ptr<ARDOUR::Region> >);
 
 	boost::shared_ptr<ARDOUR::Region> get_dragged_region ();
 	boost::shared_ptr<ARDOUR::Region> get_single_selection ();
 
-	Editing::RegionListSortType sort_type () const {
-		return _sort_type;
-	}
-
 	void redisplay ();
 
 	void suspend_redisplay () {
@@ -84,9 +76,8 @@ private:
 	struct Columns : public Gtk::TreeModel::ColumnRecord {
 		Columns () {
 			add (name);
-			add (region);
-			add (color_);
-			add (position);
+			add (take_id);
+			add (start);
 			add (end);
 			add (length);
 			add (sync);
@@ -96,15 +87,16 @@ private:
 			add (glued);
 			add (muted);
 			add (opaque);
-			add (used);
 			add (path);
-			add (property_toggles_visible);
+			add (region);
+			add (color_);
+			add (position);
 		}
 
 		Gtk::TreeModelColumn<std::string> name;
-		Gtk::TreeModelColumn<boost::shared_ptr<ARDOUR::Region> > region;
-		Gtk::TreeModelColumn<Gdk::Color> color_;
-		Gtk::TreeModelColumn<std::string> position;
+		Gtk::TreeModelColumn<std::string> take_id;
+		Gtk::TreeModelColumn<samplepos_t> position;
+		Gtk::TreeModelColumn<std::string> start;
 		Gtk::TreeModelColumn<std::string> end;
 		Gtk::TreeModelColumn<std::string> length;
 		Gtk::TreeModelColumn<std::string> sync;
@@ -114,10 +106,9 @@ private:
 		Gtk::TreeModelColumn<bool> glued;
 		Gtk::TreeModelColumn<bool> muted;
 		Gtk::TreeModelColumn<bool> opaque;
-		Gtk::TreeModelColumn<std::string> used;
 		Gtk::TreeModelColumn<std::string> path;
-		/** used to indicate whether the locked/glued/muted/opaque should be visible or not */
-		Gtk::TreeModelColumn<bool> property_toggles_visible;
+		Gtk::TreeModelColumn<boost::shared_ptr<ARDOUR::Region> > region;
+		Gtk::TreeModelColumn<Gdk::Color> color_;
 	};
 
 	Columns _columns;
@@ -153,23 +144,22 @@ private:
 
 	void show_context_menu (int button, int time);
 
-	int sorter (Gtk::TreeModel::iterator, Gtk::TreeModel::iterator);
-
 	void format_position (ARDOUR::samplepos_t pos, char* buf, size_t bufsize, bool onoff = true);
 
 	void add_region (boost::shared_ptr<ARDOUR::Region>);
+	void destroy_region (boost::shared_ptr<ARDOUR::Region>);
 
 	void populate_row (boost::shared_ptr<ARDOUR::Region>, Gtk::TreeModel::Row const &, PBD::PropertyChange const &);
-	void populate_row_used (boost::shared_ptr<ARDOUR::Region> region, Gtk::TreeModel::Row const& row, uint32_t used);
-	void populate_row_position (boost::shared_ptr<ARDOUR::Region> region, Gtk::TreeModel::Row const& row, uint32_t used);
-	void populate_row_end (boost::shared_ptr<ARDOUR::Region> region, Gtk::TreeModel::Row const& row, uint32_t used);
-	void populate_row_sync (boost::shared_ptr<ARDOUR::Region> region, Gtk::TreeModel::Row const& row, uint32_t used);
-	void populate_row_fade_in (boost::shared_ptr<ARDOUR::Region> region, Gtk::TreeModel::Row const& row, uint32_t used, boost::shared_ptr<ARDOUR::AudioRegion>);
-	void populate_row_fade_out (boost::shared_ptr<ARDOUR::Region> region, Gtk::TreeModel::Row const& row, uint32_t used, boost::shared_ptr<ARDOUR::AudioRegion>);
-	void populate_row_locked (boost::shared_ptr<ARDOUR::Region> region, Gtk::TreeModel::Row const& row, uint32_t used);
-	void populate_row_muted (boost::shared_ptr<ARDOUR::Region> region, Gtk::TreeModel::Row const& row, uint32_t used);
-	void populate_row_glued (boost::shared_ptr<ARDOUR::Region> region, Gtk::TreeModel::Row const& row, uint32_t used);
-	void populate_row_opaque (boost::shared_ptr<ARDOUR::Region> region, Gtk::TreeModel::Row const& row, uint32_t used);
+	void populate_row_used (boost::shared_ptr<ARDOUR::Region> region, Gtk::TreeModel::Row const& row);
+	void populate_row_position (boost::shared_ptr<ARDOUR::Region> region, Gtk::TreeModel::Row const& row);
+	void populate_row_end (boost::shared_ptr<ARDOUR::Region> region, Gtk::TreeModel::Row const& row);
+	void populate_row_sync (boost::shared_ptr<ARDOUR::Region> region, Gtk::TreeModel::Row const& row);
+	void populate_row_fade_in (boost::shared_ptr<ARDOUR::Region> region, Gtk::TreeModel::Row const& row, boost::shared_ptr<ARDOUR::AudioRegion>);
+	void populate_row_fade_out (boost::shared_ptr<ARDOUR::Region> region, Gtk::TreeModel::Row const& row, boost::shared_ptr<ARDOUR::AudioRegion>);
+	void populate_row_locked (boost::shared_ptr<ARDOUR::Region> region, Gtk::TreeModel::Row const& row);
+	void populate_row_muted (boost::shared_ptr<ARDOUR::Region> region, Gtk::TreeModel::Row const& row);
+	void populate_row_glued (boost::shared_ptr<ARDOUR::Region> region, Gtk::TreeModel::Row const& row);
+	void populate_row_opaque (boost::shared_ptr<ARDOUR::Region> region, Gtk::TreeModel::Row const& row);
 	void populate_row_length (boost::shared_ptr<ARDOUR::Region> region, Gtk::TreeModel::Row const& row);
 	void populate_row_name (boost::shared_ptr<ARDOUR::Region> region, Gtk::TreeModel::Row const& row);
 	void populate_row_source (boost::shared_ptr<ARDOUR::Region> region, Gtk::TreeModel::Row const& row);
@@ -177,20 +167,11 @@ private:
 	void update_row (boost::shared_ptr<ARDOUR::Region>);
 	void update_all_rows ();
 
-	void insert_into_tmp_regionlist (boost::shared_ptr<ARDOUR::Region>);
-
 	void drag_data_received (
 		Glib::RefPtr<Gdk::DragContext> const &, gint, gint, Gtk::SelectionData const &, guint, guint
 		);
 
-	Glib::RefPtr<Gtk::RadioAction> sort_type_action (Editing::RegionListSortType) const;
-	void set_full (bool);
-
-	Glib::RefPtr<Gtk::Action> hide_action () const;
-	Glib::RefPtr<Gtk::Action> show_action () const;
 	Glib::RefPtr<Gtk::Action> remove_unused_regions_action () const;
-	Glib::RefPtr<Gtk::ToggleAction> toggle_full_action () const;
-	Glib::RefPtr<Gtk::ToggleAction> toggle_show_auto_regions_action () const;
 
 	Gtk::Menu* _menu;
 	Gtk::ScrolledWindow _scroller;
@@ -200,28 +181,17 @@ private:
 
 	Glib::RefPtr<Gtk::TreeStore> _model;
 
-	bool _show_automatic_regions;
-	bool ignore_region_list_selection_change;
-	bool ignore_selected_region_change;
 	bool _no_redisplay;
 
-	Editing::RegionListSortType _sort_type;
-
-	std::list<boost::shared_ptr<ARDOUR::Region> > tmp_region_list;
-
 	typedef boost::unordered_map<boost::shared_ptr<ARDOUR::Region>, Gtk::TreeModel::iterator> RegionRowMap;
-	typedef boost::unordered_map<std::string, Gtk::TreeModel::RowReference > RegionSourceMap;
 
 	RegionRowMap region_row_map;
-	RegionSourceMap parent_regions_sources_map;
 
 	PBD::ScopedConnection region_property_connection;
 	PBD::ScopedConnection check_new_region_connection;
 
 	PBD::ScopedConnection editor_freeze_connection;
 	PBD::ScopedConnection editor_thaw_connection;
-
-	bool expanded;
 };
 
 #endif /* __gtk_ardour_editor_regions_h__ */
diff --git a/gtk2_ardour/editor_sources.cc b/gtk2_ardour/editor_sources.cc
index 15a96ce504..5834aa4eaf 100644
--- a/gtk2_ardour/editor_sources.cc
+++ b/gtk2_ardour/editor_sources.cc
@@ -77,11 +77,7 @@ struct ColumnInfo {
 EditorSources::EditorSources (Editor* e)
 	: EditorComponent (e)
 	, old_focus (0)
-	, name_editable (0)
 	, _menu (0)
-	, ignore_region_list_selection_change (false)
-	, ignore_selected_region_change (false)
-	, _sort_type ((Editing::RegionListSortType) 0)
 	, _selection (0)
 {
 	_display.set_size_request (100, -1);
@@ -95,7 +91,6 @@ EditorSources::EditorSources (Editor* e)
 	_display.set_data ("mouse-edits-require-mod1", (gpointer) 0x1);
 
 	_model = TreeStore::create (_columns);
-	_model->set_sort_func (0, sigc::mem_fun (*this, &EditorSources::sorter));
 	_model->set_sort_column (0, SORT_ASCENDING);
 
 	/* column widths */
@@ -110,18 +105,22 @@ EditorSources::EditorSources (Editor* e)
 	TreeViewColumn* col_name = manage (new TreeViewColumn ("", _columns.name));
 	col_name->set_fixed_width (bbt_width*2);
 	col_name->set_sizing (TREE_VIEW_COLUMN_FIXED);
-
-	TreeViewColumn* col_nat_pos = manage (new TreeViewColumn ("", _columns.natural_pos));
-	col_nat_pos->set_fixed_width (bbt_width);
-	col_nat_pos->set_sizing (TREE_VIEW_COLUMN_FIXED);
+	col_name->set_sort_column(0);
 
 	TreeViewColumn* col_take_id = manage (new TreeViewColumn ("", _columns.take_id));
 	col_take_id->set_fixed_width (date_width);
 	col_take_id->set_sizing (TREE_VIEW_COLUMN_FIXED);
+	col_take_id->set_sort_column(1);
+
+	TreeViewColumn* col_nat_pos = manage (new TreeViewColumn ("", _columns.natural_pos));
+	col_nat_pos->set_fixed_width (bbt_width);
+	col_nat_pos->set_sizing (TREE_VIEW_COLUMN_FIXED);
+	col_nat_pos->set_sort_column(6);
 
 	TreeViewColumn* col_path = manage (new TreeViewColumn ("", _columns.path));
 	col_path->set_fixed_width (bbt_width);
 	col_path->set_sizing (TREE_VIEW_COLUMN_FIXED);
+	col_path->set_sort_column(3);
 
 	_display.append_column (*col_name);
 	_display.append_column (*col_take_id);
@@ -134,7 +133,7 @@ EditorSources::EditorSources (Editor* e)
 	ColumnInfo ci[] = {
 		{ 0,   _("Source"),    _("Source name, with number of channels in []'s") },
 		{ 1,   _("Take ID"),   _("Take ID") },
-		{ 2,   _("Nat Pos"),   _("Natural Position of the file on timeline") },
+		{ 2,   _("Orig Pos"),  _("Original Position of the file on timeline, when it was recorded") },
 		{ 3,   _("Path"),      _("Path (folder) of the file locationlosition of end of region") },
 		{ -1, 0, 0 }
 	};
@@ -151,11 +150,6 @@ EditorSources::EditorSources (Editor* e)
 	_display.set_headers_visible (true);
 	_display.set_rules_hint ();
 
-	CellRendererText* source_name_cell = dynamic_cast<CellRendererText*>(_display.get_column_cell_renderer (0));
-	source_name_cell->property_editable() = true;
-	source_name_cell->signal_edited().connect (sigc::mem_fun (*this, &EditorSources::name_edit));
-	source_name_cell->signal_editing_started().connect (sigc::mem_fun (*this, &EditorSources::name_editing_started));
-
 	_display.get_selection()->set_select_function (sigc::mem_fun (*this, &EditorSources::selection_filter));
 
 	//set the color of the name field
@@ -163,7 +157,14 @@ EditorSources::EditorSources (Editor* e)
 	CellRendererText* renderer = dynamic_cast<CellRendererText*>(_display.get_column_cell_renderer (0));
 	tv_col->add_attribute(renderer->property_text(), _columns.name);
 	tv_col->add_attribute(renderer->property_foreground_gdk(), _columns.color_);
-//	tv_col->set_expand (true);
+
+	//right-align the Natural Pos column
+	TreeViewColumn* nat_col = _display.get_column(2);
+	nat_col->set_alignment (ALIGN_RIGHT);
+	renderer = dynamic_cast<CellRendererText*>(_display.get_column_cell_renderer (2));
+	if (renderer) {
+		renderer->property_xalign() = ( ALIGN_RIGHT );
+	}
 
 	//the PATH field should expand when the pane is opened wider
 	tv_col = _display.get_column(3);
@@ -172,7 +173,7 @@ EditorSources::EditorSources (Editor* e)
 	tv_col->set_expand (true);
 
 	_display.get_selection()->set_mode (SELECTION_MULTIPLE);
-	_display.add_object_drag (_columns.source.index(), "sources");
+	_display.add_object_drag (_columns.source.index(), "regions");
 	_display.set_drag_column (_columns.name.index());
 
 	/* setup DnD handling */
@@ -219,8 +220,6 @@ EditorSources::focus_in (GdkEventFocus*)
 		old_focus = 0;
 	}
 
-	name_editable = 0;
-
 	/* try to do nothing on focus in (doesn't work, hence selection_count nonsense) */
 	return true;
 }
@@ -233,18 +232,12 @@ EditorSources::focus_out (GdkEventFocus*)
 		old_focus = 0;
 	}
 
-	name_editable = 0;
-
 	return false;
 }
 
 bool
 EditorSources::enter_notify (GdkEventCrossing*)
 {
-	if (name_editable) {
-		return true;
-	}
-
 	/* arm counter so that ::selection_filter() will deny selecting anything for the
 	   next two attempts to change selection status.
 	*/
@@ -355,8 +348,11 @@ EditorSources::populate_row (TreeModel::Row row, boost::shared_ptr<ARDOUR::Sourc
 
 	row[_columns.take_id] = source->take_id();
 
-	//Natural Position
-	//note:  this format changes to follow master clock.  see  populate_row_position
+
+	//Natural Position (samples, an invisible column for sorting)
+	row[_columns.natural_s] = source->natural_position();
+
+	//Natural Position (text representation)
 	char buf[64];
 	snprintf(buf, 16, "--" );
 	if (source->natural_position() > 0) {
@@ -427,12 +423,7 @@ EditorSources::source_changed (boost::shared_ptr<ARDOUR::Source> source)
 void
 EditorSources::selection_changed ()
 {
-/*
- * 	if (ignore_region_list_selection_change) {
-		return;
-	}
-
-	_editor->_region_selection_change_updates_region_list = false;
+//	_editor->_region_selection_change_updates_region_list = false;
 
 	if (_display.get_selection()->count_selected_rows() > 0) {
 
@@ -445,17 +436,18 @@ EditorSources::selection_changed ()
 
 			if ((iter = _model->get_iter (*i))) {
 
-				boost::shared_ptr<Region> region = (*iter)[_columns.region];
+				boost::shared_ptr<ARDOUR::Source> source = (*iter)[_columns.source];
+				if (source) {
 
-				// they could have clicked on a row that is just a placeholder, like "Hidden"
-				// although that is not allowed by our selection filter. check it anyway
-				// since we need a region ptr.
+					set<boost::shared_ptr<Region> > regions;
+					RegionFactory::get_regions_using_source ( source, regions );
 
-				if (region) {
-
-					_change_connection.block (true);
-					_editor->set_selected_regionview_from_region_list (region, Selection::Add);
-					_change_connection.block (false);
+					for (set<boost::shared_ptr<Region> >::iterator region = regions.begin(); region != regions.end(); region++ ) {
+						_change_connection.block (true);
+						_editor->set_selected_regionview_from_region_list (*region, Selection::Add);
+						_change_connection.block (false);
+	
+					}
 				}
 			}
 
@@ -464,46 +456,18 @@ EditorSources::selection_changed ()
 		_editor->get_selection().clear_regions ();
 	}
 
-	_editor->_region_selection_change_updates_region_list = true;
-*/
-}
-
-void
-EditorSources::update_row (boost::shared_ptr<Region> region)
-{
-/*	if (!region || !_session) {
-		return;
-	}
-
-	RegionRowMap::iterator it;
-
-	it = region_row_map.find (region);
-
-	if (it != region_row_map.end()){
-		PropertyChange c;
-		TreeModel::iterator j = _model->get_iter ((*it).second.get_path());
-		populate_row(region, (*j), c);
-	}
-*/
+//	_editor->_region_selection_change_updates_region_list = true;
 }
 
 void
 EditorSources::update_all_rows ()
 {
-/*
- * 	if (!_session) {
-		return;
-	}
-
-	RegionRowMap::iterator i;
-
-	for (i = region_row_map.begin(); i != region_row_map.end(); ++i) {
-
-		TreeModel::iterator j = _model->get_iter ((*i).second.get_path());
-
-		boost::shared_ptr<Region> region = (*j)[_columns.region];
+	TreeModel::iterator i;
+	TreeModel::Children rows = _model->children();
+	for (i = rows.begin(); i != rows.end(); ++i) {
+		boost::shared_ptr<ARDOUR::Source> ss = (*i)[_columns.source];
+		populate_row(*i, ss);
 	}
-	**/
 }
 
 void
@@ -576,110 +540,6 @@ EditorSources::format_position (samplepos_t pos, char* buf, size_t bufsize, bool
 }
 
 void
-EditorSources::populate_row (boost::shared_ptr<Region> region, TreeModel::Row const &row, PBD::PropertyChange const &what_changed)
-{
-/*
- * 	boost::shared_ptr<AudioRegion> audioregion = boost::dynamic_pointer_cast<AudioRegion>(region);
-	//uint32_t used = _session->playlists->region_use_count (region);
-	uint32_t used = 1;
-
-	PropertyChange c;
-	const bool all = what_changed == c;
-
-	if (all || what_changed.contains (Properties::position)) {
-		populate_row_position (region, row, used);
-	}
-	if (all || what_changed.contains (Properties::start) || what_changed.contains (Properties::sync_position)) {
-		populate_row_sync (region, row, used);
-	}
-	if (all || what_changed.contains (Properties::fade_in)) {
-		populate_row_fade_in (region, row, used, audioregion);
-	}
-	if (all || what_changed.contains (Properties::fade_out)) {
-		populate_row_fade_out (region, row, used, audioregion);
-	}
-	if (all || what_changed.contains (Properties::locked)) {
-		populate_row_locked (region, row, used);
-	}
-	if (all || what_changed.contains (Properties::position_lock_style)) {
-		populate_row_glued (region, row, used);
-	}
-	if (all || what_changed.contains (Properties::muted)) {
-		populate_row_muted (region, row, used);
-	}
-	if (all || what_changed.contains (Properties::opaque)) {
-		populate_row_opaque (region, row, used);
-	}
-	if (all || what_changed.contains (Properties::length)) {
-		populate_row_end (region, row, used);
-		populate_row_length (region, row);
-	}
-	if (all) {
-		populate_row_source (region, row);
-	}
-	if (all || what_changed.contains (Properties::name)) {
-		populate_row_name (region, row);
-	}
-	if (all) {
-		populate_row_used (region, row, used);
-	}
-*/
-}
-
-#if 0
-	if (audioRegion && fades_in_seconds) {
-
-		samplepos_t left;
-		int mins;
-		int millisecs;
-
-		left = audioRegion->fade_in()->back()->when;
-		mins = (int) floor (left / (_session->sample_rate() * 60.0f));
-		left -= (samplepos_t) floor (mins * _session->sample_rate() * 60.0f);
-		millisecs = (int) floor ((left * 1000.0f) / _session->sample_rate());
-
-		if (audioRegion->fade_in()->back()->when >= _session->sample_rate()) {
-			sprintf (fadein_str, "%01dM %01dmS", mins, millisecs);
-		} else {
-			sprintf (fadein_str, "%01dmS", millisecs);
-		}
-
-		left = audioRegion->fade_out()->back()->when;
-		mins = (int) floor (left / (_session->sample_rate() * 60.0f));
-		left -= (samplepos_t) floor (mins * _session->sample_rate() * 60.0f);
-		millisecs = (int) floor ((left * 1000.0f) / _session->sample_rate());
-
-		if (audioRegion->fade_out()->back()->when >= _session->sample_rate()) {
-			sprintf (fadeout_str, "%01dM %01dmS", mins, millisecs);
-		} else {
-			sprintf (fadeout_str, "%01dmS", millisecs);
-		}
-	}
-#endif
-
-void
-EditorSources::populate_row_name (boost::shared_ptr<Region> region, TreeModel::Row const &row)
-{
-/*	if (region->n_channels() > 1) {
-		row[_columns.name] = string_compose("%1  [%2]", Gtkmm2ext::markup_escape_text (region->name()), region->n_channels());
-	} else {
-		row[_columns.name] = Gtkmm2ext::markup_escape_text (region->name());
-	}
-*/
-}
-
-void
-EditorSources::populate_row_source (boost::shared_ptr<Region> region, TreeModel::Row const &row)
-{
-/*	if (boost::dynamic_pointer_cast<SilentFileSource>(region->source())) {
-		row[_columns.path] = _("MISSING ") + Gtkmm2ext::markup_escape_text (region->source()->name());
-	} else {
-		row[_columns.path] = Gtkmm2ext::markup_escape_text (region->source()->name());
-	}
-*/
-}
-
-void
 EditorSources::show_context_menu (int button, int time)
 {
 
@@ -688,7 +548,7 @@ EditorSources::show_context_menu (int button, int time)
 bool
 EditorSources::key_press (GdkEventKey* ev)
 {
-
+	return false;
 }
 
 bool
@@ -715,23 +575,6 @@ EditorSources::button_press (GdkEventButton *ev)
 	return false;
 }
 
-int
-EditorSources::sorter (TreeModel::iterator a, TreeModel::iterator b)
-{
-
-}
-
-void
-EditorSources::reset_sort_type (RegionListSortType type, bool force)
-{
-
-}
-
-void
-EditorSources::reset_sort_direction (bool up)
-{
-}
-
 void
 EditorSources::selection_mapover (sigc::slot<void,boost::shared_ptr<Region> > sl)
 {
@@ -751,26 +594,23 @@ EditorSources::drag_data_received (const RefPtr<Gdk::DragContext>& context,
 bool
 EditorSources::selection_filter (const RefPtr<TreeModel>& model, const TreeModel::Path& path, bool already_selected)
 {
-
-}
-
-void
-EditorSources::name_editing_started (CellEditable* ce, const Glib::ustring& path)
-{
-
-}
-
-void
-EditorSources::name_edit (const std::string& path, const std::string& new_text)
-{
-
+	return true;
 }
 
 /** @return Region that has been dragged out of the list, or 0 */
-boost::shared_ptr<Region>
-EditorSources::get_dragged_region ()
+boost::shared_ptr<ARDOUR::Source>
+EditorSources::get_dragged_source ()
 {
+	list<boost::shared_ptr<ARDOUR::Source> > sources;
+	TreeView* source;
+	_display.get_object_drag_data (sources, &source);
 
+	if (sources.empty()) {
+		return boost::shared_ptr<ARDOUR::Source> ();
+	}
+
+	assert (sources.size() == 1);
+	return sources.front ();
 }
 
 void
@@ -781,10 +621,26 @@ EditorSources::clear ()
 	_display.set_model (_model);
 }
 
-boost::shared_ptr<Region>
+boost::shared_ptr<ARDOUR::Source>
 EditorSources::get_single_selection ()
 {
+	Glib::RefPtr<TreeSelection> selected = _display.get_selection();
+
+	if (selected->count_selected_rows() != 1) {
+		return boost::shared_ptr<ARDOUR::Source> ();
+	}
+
+	TreeView::Selection::ListHandle_Path rows = selected->get_selected_rows ();
+
+	/* only one row selected, so rows.begin() is it */
 
+	TreeIter iter = _model->get_iter (*rows.begin());
+
+	if (!iter) {
+		return boost::shared_ptr<ARDOUR::Source> ();
+	}
+
+	return (*iter)[_columns.source];
 }
 
 void
@@ -806,11 +662,7 @@ EditorSources::get_state () const
 {
 	XMLNode* node = new XMLNode (X_("SourcesList"));
 
-	node->set_property (X_("sort-type"), _sort_type);
-
-	RefPtr<Action> act = ActionManager::get_action (X_("SourcesList"), X_("SortAscending"));
-	bool const ascending = RefPtr<RadioAction>::cast_dynamic(act)->get_active ();
-	node->set_property (X_("sort-ascending"), ascending);
+	//TODO:  save sort state?
 
 	return *node;
 }
@@ -820,105 +672,6 @@ EditorSources::set_state (const XMLNode & node)
 {
 	bool changed = false;
 
-	if (node.name() != X_("SourcesList")) {
-		return;
-	}
-
-	Editing::RegionListSortType t;
-	if (node.get_property (X_("sort-type"), t)) {
-
-		if (_sort_type != t) {
-			changed = true;
-		}
-
-		reset_sort_type (t, true);
-		RefPtr<RadioAction> ract = sort_type_action (t);
-		ract->set_active ();
-	}
-
-	bool yn;
-	if (node.get_property (X_("sort-ascending"), yn)) {
-		SortType old_sort_type;
-		int old_sort_column;
-
-		_model->get_sort_column_id (old_sort_column, old_sort_type);
-
-		if (old_sort_type != (yn ? SORT_ASCENDING : SORT_DESCENDING)) {
-			changed = true;
-		}
-
-		reset_sort_direction (yn);
-		RefPtr<Action> act;
-
-		if (yn) {
-			act = ActionManager::get_action (X_("SourcesList"), X_("SortAscending"));
-		} else {
-			act = ActionManager::get_action (X_("SourcesList"), X_("SortDescending"));
-		}
-
-		RefPtr<RadioAction>::cast_dynamic(act)->set_active ();
-	}
-
-}
-
-RefPtr<RadioAction>
-EditorSources::sort_type_action (Editing::RegionListSortType t) const
-{
-	const char* action = 0;
-
-	switch (t) {
-	case Editing::ByName:
-		action = X_("SortByRegionName");
-		break;
-	case Editing::ByLength:
-		action = X_("SortByRegionLength");
-		break;
-	case Editing::ByPosition:
-		action = X_("SortByRegionPosition");
-		break;
-	case Editing::ByTimestamp:
-		action = X_("SortByRegionTimestamp");
-		break;
-	case Editing::ByStartInFile:
-		action = X_("SortByRegionStartinFile");
-		break;
-	case Editing::ByEndInFile:
-		action = X_("SortByRegionEndinFile");
-		break;
-	case Editing::BySourceFileName:
-		action = X_("SortBySourceFileName");
-		break;
-	case Editing::BySourceFileLength:
-		action = X_("SortBySourceFileLength");
-		break;
-	case Editing::BySourceFileCreationDate:
-		action = X_("SortBySourceFileCreationDate");
-		break;
-	case Editing::BySourceFileFS:
-		action = X_("SortBySourceFilesystem");
-		break;
-	default:
-		fatal << string_compose (_("programming error: %1: %2"), "EditorSources: impossible sort type", (int) t) << endmsg;
-		abort(); /*NOTREACHED*/
-	}
-
-	RefPtr<Action> act = ActionManager::get_action (X_("RegionList"), action);
-	assert (act);
-
-	return RefPtr<RadioAction>::cast_dynamic (act);
-}
-
-RefPtr<Action>
-EditorSources::hide_action () const
-{
-	return ActionManager::get_action (X_("SourcesList"), X_("rlHide"));
-
-}
-
-RefPtr<Action>
-EditorSources::show_action () const
-{
-	return ActionManager::get_action (X_("SourcesList"), X_("rlShow"));
 }
 
 RefPtr<Action>
diff --git a/gtk2_ardour/editor_sources.h b/gtk2_ardour/editor_sources.h
index 88ef60f316..89b5e418d9 100644
--- a/gtk2_ardour/editor_sources.h
+++ b/gtk2_ardour/editor_sources.h
@@ -45,16 +45,10 @@ public:
 
 	void clear ();
 
-	void reset_sort_direction (bool);
-	void reset_sort_type (Editing::RegionListSortType, bool);
 	void selection_mapover (sigc::slot<void,boost::shared_ptr<ARDOUR::Region> >);
 
-	boost::shared_ptr<ARDOUR::Region> get_dragged_region ();
-	boost::shared_ptr<ARDOUR::Region> get_single_selection ();
-
-	Editing::RegionListSortType sort_type () const {
-		return _sort_type;
-	}
+	boost::shared_ptr<ARDOUR::Source> get_dragged_source ();
+	boost::shared_ptr<ARDOUR::Source> get_single_selection ();
 
 	void block_change_connection (bool b) {
 		_change_connection.block (b);
@@ -74,11 +68,12 @@ private:
 	struct Columns : public Gtk::TreeModel::ColumnRecord {
 		Columns () {
 			add (name);
-			add (source);
-			add (color_);
+			add (take_id);
 			add (natural_pos);
 			add (path);
-			add (take_id);
+			add (color_);
+			add (source);
+			add (natural_s);
 		}
 
 		Gtk::TreeModelColumn<std::string> name;
@@ -87,6 +82,7 @@ private:
 		Gtk::TreeModelColumn<std::string> natural_pos;
 		Gtk::TreeModelColumn<std::string> path;
 		Gtk::TreeModelColumn<std::string> take_id;
+		Gtk::TreeModelColumn<samplepos_t> natural_s;
 	};
 
 	Columns _columns;
@@ -104,10 +100,6 @@ private:
 	bool selection_filter (const Glib::RefPtr<Gtk::TreeModel>& model, const Gtk::TreeModel::Path& path, bool yn);
 
 	Gtk::Widget* old_focus;
-	Gtk::CellEditable* name_editable;
-	void name_editing_started (Gtk::CellEditable*, const Glib::ustring&);
-
-	void name_edit (const std::string&, const std::string&);
 
 	bool key_press (GdkEventKey *);
 	bool button_press (GdkEventButton *);
@@ -119,53 +111,27 @@ private:
 
 	void show_context_menu (int button, int time);
 
-	int sorter (Gtk::TreeModel::iterator, Gtk::TreeModel::iterator);
-
 	void format_position (ARDOUR::samplepos_t pos, char* buf, size_t bufsize, bool onoff = true);
 
 	void add_source (boost::shared_ptr<ARDOUR::Source>);
 	void remove_source (boost::shared_ptr<ARDOUR::Source>);
 
-	void populate_row (boost::shared_ptr<ARDOUR::Region>, Gtk::TreeModel::Row const &, PBD::PropertyChange const &);
-	void populate_row_name (boost::shared_ptr<ARDOUR::Region> region, Gtk::TreeModel::Row const& row);
-	void populate_row_source (boost::shared_ptr<ARDOUR::Region> region, Gtk::TreeModel::Row const& row);
-
-	void update_row (boost::shared_ptr<ARDOUR::Region>);
 	void update_all_rows ();
 
-	void insert_into_tmp_regionlist (boost::shared_ptr<ARDOUR::Region>);
-
 	void drag_data_received (
 		Glib::RefPtr<Gdk::DragContext> const &, gint, gint, Gtk::SelectionData const &, guint, guint
 		);
 
-	Glib::RefPtr<Gtk::RadioAction> sort_type_action (Editing::RegionListSortType) const;
-
-	Glib::RefPtr<Gtk::Action> hide_action () const;
-	Glib::RefPtr<Gtk::Action> show_action () const;
-	Glib::RefPtr<Gtk::Action> remove_unused_regions_action () const;
+	Glib::RefPtr<Gtk::Action> remove_unused_regions_action () const;  //TODO: what is the equivalent?
 
 	Gtk::Menu* _menu;
 	Gtk::ScrolledWindow _scroller;
 	Gtk::Frame _frame;
 
-	Gtkmm2ext::DnDTreeView<boost::shared_ptr<ARDOUR::Region> > _display;
+	Gtkmm2ext::DnDTreeView<boost::shared_ptr<ARDOUR::Source> > _display;  //TODO .. try changing this to region
 
 	Glib::RefPtr<Gtk::TreeStore> _model;
 
-	bool ignore_region_list_selection_change;
-	bool ignore_selected_region_change;
-
-	Editing::RegionListSortType _sort_type;
-
-	std::list<boost::shared_ptr<ARDOUR::Region> > tmp_region_list;
-
-	typedef boost::unordered_map<boost::shared_ptr<ARDOUR::Region>, Gtk::TreeModel::RowReference> RegionRowMap;
-	typedef boost::unordered_map<std::string, Gtk::TreeModel::RowReference > RegionSourceMap;
-
-	RegionRowMap region_row_map;
-	RegionSourceMap parent_regions_sources_map;
-
 	PBD::ScopedConnection source_property_connection;
 
 	PBD::ScopedConnection source_added_connection;