(Source List) Source property signals (gtk2 part)

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

5 files changed, 1118 insertions, 0 deletions

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index ff587b2fc1..6f52c3e8da 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -109,6 +109,7 @@
 #include "editor_route_groups.h"
 #include "editor_routes.h"
 #include "editor_snapshots.h"
+#include "editor_sources.h"
 #include "editor_summary.h"
 #include "enums_convert.h"
 #include "export_report.h"
@@ -639,6 +640,7 @@ Editor::Editor ()
 	_route_groups = new EditorRouteGroups (this);
 	_routes = new EditorRoutes (this);
 	_regions = new EditorRegions (this);
+	_sources = new EditorSources (this);
 	_snapshots = new EditorSnapshots (this);
 	_locations = new EditorLocations (this);
 	_time_info_box = new TimeInfoBox ("EditorTimeInfo", true);
@@ -649,6 +651,7 @@ Editor::Editor ()
 	Location::end_changed.connect (*this, invalidator (*this), boost::bind (&Editor::location_changed, this, _1), gui_context());
 	Location::changed.connect (*this, invalidator (*this), boost::bind (&Editor::location_changed, this, _1), gui_context());
 
+	add_notebook_page (_("Sources"), _sources->widget ());
 	add_notebook_page (_("Regions"), _regions->widget ());
 	add_notebook_page (_("Tracks & Busses"), _routes->widget ());
 	add_notebook_page (_("Snapshots"), _snapshots->widget ());
@@ -1334,6 +1337,7 @@ Editor::set_session (Session *t)
 	_group_tabs->set_session (_session);
 	_route_groups->set_session (_session);
 	_regions->set_session (_session);
+	_sources->set_session (_session);
 	_snapshots->set_session (_session);
 	_routes->set_session (_session);
 	_locations->set_session (_session);
@@ -6035,6 +6039,7 @@ Editor::session_going_away ()
 	/* rip everything out of the list displays */
 
 	_regions->clear ();
+	_sources->clear ();
 	_routes->clear ();
 	_route_groups->clear ();
 
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index a96738b932..f8de048be4 100644
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -110,6 +110,7 @@ class EditorCursor;
 class EditorGroupTabs;
 class EditorLocations;
 class EditorRegions;
+class EditorSources;
 class EditorRoutes;
 class EditorRouteGroups;
 class EditorSnapshots;
@@ -1606,6 +1607,7 @@ private:
 	friend class DragManager;
 	friend class EditorRouteGroups;
 	friend class EditorRegions;
+	friend class EditorSources;
 
 	/* non-public event handlers */
 
@@ -1895,6 +1897,7 @@ private:
 	EditorRouteGroups* _route_groups;
 	EditorRoutes*      _routes;
 	EditorRegions*     _regions;
+	EditorSources*     _sources;
 	EditorSnapshots*   _snapshots;
 	EditorLocations*   _locations;
 
diff --git a/gtk2_ardour/editor_sources.cc b/gtk2_ardour/editor_sources.cc
new file mode 100644
index 0000000000..15a96ce504
--- /dev/null
+++ b/gtk2_ardour/editor_sources.cc
@@ -0,0 +1,928 @@
+/*
+    Copyright (C) 2000-2005 Paul Davis
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <cstdlib>
+#include <cmath>
+#include <algorithm>
+#include <string>
+#include <sstream>
+
+#include "pbd/basename.h"
+#include "pbd/enumwriter.h"
+
+#include "ardour/audioregion.h"
+#include "ardour/source.h"
+#include "ardour/audiofilesource.h"
+#include "ardour/silentfilesource.h"
+#include "ardour/region_factory.h"
+#include "ardour/session.h"
+#include "ardour/profile.h"
+
+#include "gtkmm2ext/treeutils.h"
+#include "gtkmm2ext/utils.h"
+
+#include "widgets/choice.h"
+#include "widgets/tooltips.h"
+
+#include "audio_clock.h"
+#include "editor.h"
+#include "editing.h"
+#include "editing_convert.h"
+#include "keyboard.h"
+#include "ardour_ui.h"
+#include "gui_thread.h"
+#include "actions.h"
+#include "region_view.h"
+#include "utils.h"
+#include "editor_drag.h"
+#include "main_clock.h"
+#include "ui_config.h"
+
+#include "pbd/i18n.h"
+
+#include "editor_sources.h"
+
+using namespace std;
+using namespace ARDOUR;
+using namespace ArdourWidgets;
+using namespace ARDOUR_UI_UTILS;
+using namespace PBD;
+using namespace Gtk;
+using namespace Glib;
+using namespace Editing;
+using Gtkmm2ext::Keyboard;
+
+struct ColumnInfo {
+	int         index;
+	const char* label;
+	const char* tooltip;
+};
+
+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);
+	_display.set_rules_hint (true);
+	_display.set_name ("SourcesList");
+	_display.set_fixed_height_mode (true);
+
+	/* Try to prevent single mouse presses from initiating edits.
+	   This relies on a hack in gtktreeview.c:gtk_treeview_button_press()
+	*/
+	_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 */
+	int bbt_width, date_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_("2018-10-14 12:12:30"));
+	Gtkmm2ext::get_pixel_size (layout2, date_width, height);
+
+	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);
+
+	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);
+
+	TreeViewColumn* col_path = manage (new TreeViewColumn ("", _columns.path));
+	col_path->set_fixed_width (bbt_width);
+	col_path->set_sizing (TREE_VIEW_COLUMN_FIXED);
+
+	_display.append_column (*col_name);
+	_display.append_column (*col_take_id);
+	_display.append_column (*col_nat_pos);
+	_display.append_column (*col_path);
+
+	TreeViewColumn* col;
+	Gtk::Label* l;
+
+	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") },
+		{ 3,   _("Path"),      _("Path (folder) of the file locationlosition of end of region") },
+		{ -1, 0, 0 }
+	};
+
+	for (int i = 0; ci[i].index >= 0; ++i) {
+		col = _display.get_column (ci[i].index);
+		l = manage (new Label (ci[i].label));
+		set_tooltip (*l, ci[i].tooltip);
+		col->set_widget (*l);
+		l->show ();
+	}
+	_display.set_model (_model);
+
+	_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
+	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);
+
+	//the PATH field should expand when the pane is opened wider
+	tv_col = _display.get_column(3);
+	renderer = dynamic_cast<CellRendererText*>(_display.get_column_cell_renderer (3));
+	tv_col->add_attribute(renderer->property_text(), _columns.path);
+	tv_col->set_expand (true);
+
+	_display.get_selection()->set_mode (SELECTION_MULTIPLE);
+	_display.add_object_drag (_columns.source.index(), "sources");
+	_display.set_drag_column (_columns.name.index());
+
+	/* setup DnD handling */
+
+	list<TargetEntry> region_list_target_table;
+
+	region_list_target_table.push_back (TargetEntry ("text/plain"));
+	region_list_target_table.push_back (TargetEntry ("text/uri-list"));
+	region_list_target_table.push_back (TargetEntry ("application/x-rootwin-drop"));
+
+	_display.add_drop_targets (region_list_target_table);
+	_display.signal_drag_data_received().connect (sigc::mem_fun(*this, &EditorSources::drag_data_received));
+
+	_scroller.add (_display);
+	_scroller.set_policy (POLICY_AUTOMATIC, POLICY_AUTOMATIC);
+
+	_display.signal_button_press_event().connect (sigc::mem_fun(*this, &EditorSources::button_press), false);
+	_change_connection = _display.get_selection()->signal_changed().connect (sigc::mem_fun(*this, &EditorSources::selection_changed));
+
+	_scroller.signal_key_press_event().connect (sigc::mem_fun(*this, &EditorSources::key_press), false);
+	_scroller.signal_focus_in_event().connect (sigc::mem_fun (*this, &EditorSources::focus_in), false);
+	_scroller.signal_focus_out_event().connect (sigc::mem_fun (*this, &EditorSources::focus_out));
+
+	_display.signal_enter_notify_event().connect (sigc::mem_fun (*this, &EditorSources::enter_notify), false);
+	_display.signal_leave_notify_event().connect (sigc::mem_fun (*this, &EditorSources::leave_notify), false);
+
+	// _display.signal_popup_menu().connect (sigc::bind (sigc::mem_fun (*this, &Editor::show__display_context_menu), 1, 0));
+
+	//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, &EditorSources::update_all_rows));
+
+	e->EditorFreeze.connect (editor_freeze_connection, MISSING_INVALIDATOR, boost::bind (&EditorSources::freeze_tree_model, this), gui_context());
+	e->EditorThaw.connect (editor_thaw_connection, MISSING_INVALIDATOR, boost::bind (&EditorSources::thaw_tree_model, this), gui_context());
+}
+
+bool
+EditorSources::focus_in (GdkEventFocus*)
+{
+	Window* win = dynamic_cast<Window*> (_scroller.get_toplevel ());
+
+	if (win) {
+		old_focus = win->get_focus ();
+	} else {
+		old_focus = 0;
+	}
+
+	name_editable = 0;
+
+	/* try to do nothing on focus in (doesn't work, hence selection_count nonsense) */
+	return true;
+}
+
+bool
+EditorSources::focus_out (GdkEventFocus*)
+{
+	if (old_focus) {
+		old_focus->grab_focus ();
+		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.
+	*/
+	_scroller.grab_focus ();
+	Keyboard::magic_widget_grab_focus ();
+	return false;
+}
+
+bool
+EditorSources::leave_notify (GdkEventCrossing*)
+{
+	if (old_focus) {
+		old_focus->grab_focus ();
+		old_focus = 0;
+	}
+
+	Keyboard::magic_widget_drop_focus ();
+	return false;
+}
+
+void
+EditorSources::set_session (ARDOUR::Session* s)
+{
+	SessionHandlePtr::set_session (s);
+	
+	if (s) {
+		//get all existing sources
+		s->foreach_source (sigc::mem_fun (*this, &EditorSources::add_source));
+	
+		//register to get new sources that are recorded/imported
+		s->SourceAdded.connect (source_added_connection, MISSING_INVALIDATOR, boost::bind (&EditorSources::add_source, this, _1), gui_context());
+		s->SourceRemoved.connect (source_removed_connection, MISSING_INVALIDATOR, boost::bind (&EditorSources::remove_source, this, _1), gui_context());
+
+		//register for source property changes ( some things like take_id aren't immediately available at construction )
+		ARDOUR::Source::SourcePropertyChanged.connect (source_property_connection, MISSING_INVALIDATOR, boost::bind (&EditorSources::source_changed, this, _1), gui_context());
+	} else {
+		clear();	
+	}
+}
+
+void
+EditorSources::remove_source (boost::shared_ptr<ARDOUR::Source> source)
+{
+	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];
+		if (source == ss) {
+			_model->erase(i);
+			break;
+		}
+	}
+}
+
+void
+EditorSources::populate_row (TreeModel::Row row, boost::shared_ptr<ARDOUR::Source> source)
+{
+	ENSURE_GUI_THREAD (*this, &ARDOUR_UI::record_state_changed, row, source);
+
+	if (!source) {
+		return;
+	}
+	
+	string str;
+	Gdk::Color c;
+
+	bool missing_source = boost::dynamic_pointer_cast<SilentFileSource>(source) != NULL;
+	if (missing_source) {
+		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;
+
+	if (source->name()[0] == '/') { // external file
+
+		str = ".../";
+
+		boost::shared_ptr<AudioFileSource> afs = boost::dynamic_pointer_cast<AudioFileSource>(source);
+		if (afs) {
+			str += source->name();
+			str += "[";
+			str += afs->n_channels();  //ToDo:   num channels may be its own column?
+			str += "]";
+		} else {
+			str += source->name();
+		}
+
+	} else {
+		str = source->name();
+	}
+
+	row[_columns.name] = str;
+	row[_columns.source] = source;
+
+	if (missing_source) {
+		row[_columns.path] = _("(MISSING) ") + Gtkmm2ext::markup_escape_text (source->name());
+
+	} else {
+		boost::shared_ptr<FileSource> fs = boost::dynamic_pointer_cast<FileSource>(source);
+		if (fs) {
+			row[_columns.path] = Gtkmm2ext::markup_escape_text (fs->path());
+		} else {
+			row[_columns.path] = Gtkmm2ext::markup_escape_text (source->name());
+		}
+	}
+
+	row[_columns.take_id] = source->take_id();
+
+	//Natural Position
+	//note:  this format changes to follow master clock.  see  populate_row_position
+	char buf[64];
+	snprintf(buf, 16, "--" );
+	if (source->natural_position() > 0) {
+		format_position (source->natural_position(), buf, sizeof (buf));
+	}
+	row[_columns.natural_pos] = buf;
+}
+
+void
+EditorSources::add_source (boost::shared_ptr<ARDOUR::Source> source)
+{
+	if (!source || !_session ) {
+		return;
+	}
+
+	boost::shared_ptr<FileSource> fs = boost::dynamic_pointer_cast<FileSource> (source);
+
+	if (!fs || fs->empty()) {
+		return;
+	}
+
+	TreeModel::Row row = *(_model->append());
+	populate_row (row, source);
+}
+
+
+void
+EditorSources::remove_unused_regions ()
+{
+/*	vector<string> choices;
+	string prompt;
+
+	if (!_session) {
+		return;
+	}
+
+	prompt = _("Do you really want to remove unused regions?"
+	           "\n(This is destructive and cannot be undone)");
+
+	choices.push_back (_("No, do nothing."));
+	choices.push_back (_("Yes, remove."));
+
+	ArdourWidgets::Choice prompter (_("Remove unused regions"), prompt, choices);
+
+	if (prompter.run () == 1) {
+		_no_redisplay = true;
+		_session->cleanup_regions ();
+		_no_redisplay = false;
+		redisplay ();
+	}
+*/
+}
+
+void
+EditorSources::source_changed (boost::shared_ptr<ARDOUR::Source> source)
+{
+	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];
+		if (source == ss) {
+			populate_row(*i, source);
+			break;
+		}
+	}
+}
+
+void
+EditorSources::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) {
+
+		TreeIter iter;
+		TreeView::Selection::ListHandle_Path rows = _display.get_selection()->get_selected_rows ();
+
+		_editor->get_selection().clear_regions ();
+
+		for (TreeView::Selection::ListHandle_Path::iterator i = rows.begin(); i != rows.end(); ++i) {
+
+			if ((iter = _model->get_iter (*i))) {
+
+				boost::shared_ptr<Region> region = (*iter)[_columns.region];
+
+				// 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.
+
+				if (region) {
+
+					_change_connection.block (true);
+					_editor->set_selected_regionview_from_region_list (region, Selection::Add);
+					_change_connection.block (false);
+				}
+			}
+
+		}
+	} else {
+		_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);
+	}
+*/
+}
+
+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];
+	}
+	**/
+}
+
+void
+EditorSources::format_position (samplepos_t pos, char* buf, size_t bufsize, bool onoff)
+{
+	Timecode::BBT_Time bbt;
+	Timecode::Time timecode;
+
+	if (pos < 0) {
+		error << string_compose (_("EditorSources::format_position: negative timecode position: %1"), pos) << endmsg;
+		snprintf (buf, bufsize, "invalid");
+		return;
+	}
+
+	switch (ARDOUR_UI::instance()->primary_clock->mode ()) {
+	case AudioClock::BBT:
+		bbt = _session->tempo_map().bbt_at_sample (pos);
+		if (onoff) {
+			snprintf (buf, bufsize, "%03d|%02d|%04d" , bbt.bars, bbt.beats, bbt.ticks);
+		} else {
+			snprintf (buf, bufsize, "(%03d|%02d|%04d)" , bbt.bars, bbt.beats, bbt.ticks);
+		}
+		break;
+
+	case AudioClock::MinSec:
+		samplepos_t left;
+		int hrs;
+		int mins;
+		float secs;
+
+		left = pos;
+		hrs = (int) floor (left / (_session->sample_rate() * 60.0f * 60.0f));
+		left -= (samplecnt_t) floor (hrs * _session->sample_rate() * 60.0f * 60.0f);
+		mins = (int) floor (left / (_session->sample_rate() * 60.0f));
+		left -= (samplecnt_t) floor (mins * _session->sample_rate() * 60.0f);
+		secs = left / (float) _session->sample_rate();
+		if (onoff) {
+			snprintf (buf, bufsize, "%02d:%02d:%06.3f", hrs, mins, secs);
+		} else {
+			snprintf (buf, bufsize, "(%02d:%02d:%06.3f)", hrs, mins, secs);
+		}
+		break;
+
+	case AudioClock::Seconds:
+		if (onoff) {
+			snprintf (buf, bufsize, "%.1f", pos / (float)_session->sample_rate());
+		} else {
+			snprintf (buf, bufsize, "(%.1f)", pos / (float)_session->sample_rate());
+		}
+		break;
+
+	case AudioClock::Samples:
+		if (onoff) {
+			snprintf (buf, bufsize, "%" PRId64, pos);
+		} else {
+			snprintf (buf, bufsize, "(%" PRId64 ")", pos);
+		}
+		break;
+
+	case AudioClock::Timecode:
+	default:
+		_session->timecode_time (pos, timecode);
+		if (onoff) {
+			snprintf (buf, bufsize, "%02d:%02d:%02d:%02d", timecode.hours, timecode.minutes, timecode.seconds, timecode.frames);
+		} else {
+			snprintf (buf, bufsize, "(%02d:%02d:%02d:%02d)", timecode.hours, timecode.minutes, timecode.seconds, timecode.frames);
+		}
+		break;
+	}
+}
+
+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)
+{
+
+}
+
+bool
+EditorSources::key_press (GdkEventKey* ev)
+{
+
+}
+
+bool
+EditorSources::button_press (GdkEventButton *ev)
+{
+	boost::shared_ptr<ARDOUR::Source> source;
+	TreeIter iter;
+	TreeModel::Path path;
+	TreeViewColumn* column;
+	int cellx;
+	int celly;
+
+	if (_display.get_path_at_pos ((int)ev->x, (int)ev->y, path, column, cellx, celly)) {
+		if ((iter = _model->get_iter (path))) {
+			source = (*iter)[_columns.source];
+		}
+	}
+
+	if (Keyboard::is_context_menu_event (ev)) {
+		show_context_menu (ev->button, ev->time);
+		return false;
+	}
+
+	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)
+{
+
+}
+
+
+void
+EditorSources::drag_data_received (const RefPtr<Gdk::DragContext>& context,
+                                   int x, int y,
+                                   const SelectionData& data,
+                                   guint info, guint time)
+{
+
+}
+
+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 Region that has been dragged out of the list, or 0 */
+boost::shared_ptr<Region>
+EditorSources::get_dragged_region ()
+{
+
+}
+
+void
+EditorSources::clear ()
+{
+	_display.set_model (Glib::RefPtr<Gtk::TreeStore> (0));
+	_model->clear ();
+	_display.set_model (_model);
+}
+
+boost::shared_ptr<Region>
+EditorSources::get_single_selection ()
+{
+
+}
+
+void
+EditorSources::freeze_tree_model ()
+{
+	_display.set_model (Glib::RefPtr<Gtk::TreeStore>(0));
+	_model->set_sort_column (-2, SORT_ASCENDING); //Disable sorting to gain performance
+}
+
+void
+EditorSources::thaw_tree_model (){
+
+	_model->set_sort_column (0, SORT_ASCENDING); // renabale sorting
+	_display.set_model (_model);
+}
+
+XMLNode &
+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);
+
+	return *node;
+}
+
+void
+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>
+EditorSources::remove_unused_regions_action () const
+{
+	return ActionManager::get_action (X_("SourcesList"), X_("removeUnusedRegions"));
+}
diff --git a/gtk2_ardour/editor_sources.h b/gtk2_ardour/editor_sources.h
new file mode 100644
index 0000000000..88ef60f316
--- /dev/null
+++ b/gtk2_ardour/editor_sources.h
@@ -0,0 +1,181 @@
+/*
+    Copyright (C) 2000-2009 Paul Davis
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+#ifndef __gtk_ardour_editor_sources_h__
+#define __gtk_ardour_editor_sources_h__
+
+#include <boost/unordered_map.hpp>
+
+#include <gtkmm/scrolledwindow.h>
+#include <gtkmm/treemodel.h>
+#include <gtkmm/treerowreference.h>
+#include <gtkmm/treestore.h>
+
+#include "editor_component.h"
+
+#include "selection.h"
+
+class EditorSources : public EditorComponent, public ARDOUR::SessionHandlePtr
+{
+public:
+	EditorSources (Editor *);
+
+	void set_session (ARDOUR::Session *);
+
+	void set_selection (Selection *sel) { _selection = sel; }
+
+	Gtk::Widget& widget () {
+		return _scroller;
+	}
+
+	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;
+	}
+
+	void block_change_connection (bool b) {
+		_change_connection.block (b);
+	}
+
+	void unselect_all () {
+		_display.get_selection()->unselect_all ();
+	}
+
+	void remove_unused_regions ();
+
+	XMLNode& get_state () const;
+	void set_state (const XMLNode &);
+
+private:
+
+	struct Columns : public Gtk::TreeModel::ColumnRecord {
+		Columns () {
+			add (name);
+			add (source);
+			add (color_);
+			add (natural_pos);
+			add (path);
+			add (take_id);
+		}
+
+		Gtk::TreeModelColumn<std::string> name;
+		Gtk::TreeModelColumn<boost::shared_ptr<ARDOUR::Source> > source;
+		Gtk::TreeModelColumn<Gdk::Color> color_;
+		Gtk::TreeModelColumn<std::string> natural_pos;
+		Gtk::TreeModelColumn<std::string> path;
+		Gtk::TreeModelColumn<std::string> take_id;
+	};
+
+	Columns _columns;
+
+	Gtk::TreeModel::RowReference last_row;
+
+	void freeze_tree_model ();
+	void thaw_tree_model ();
+	void source_changed (boost::shared_ptr<ARDOUR::Source>);
+	void populate_row (Gtk::TreeModel::Row row, boost::shared_ptr<ARDOUR::Source> source);
+	void selection_changed ();
+
+	sigc::connection _change_connection;
+
+	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 *);
+
+	bool focus_in (GdkEventFocus*);
+	bool focus_out (GdkEventFocus*);
+	bool enter_notify (GdkEventCrossing*);
+	bool leave_notify (GdkEventCrossing*);
+
+	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;
+
+	Gtk::Menu* _menu;
+	Gtk::ScrolledWindow _scroller;
+	Gtk::Frame _frame;
+
+	Gtkmm2ext::DnDTreeView<boost::shared_ptr<ARDOUR::Region> > _display;
+
+	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;
+	PBD::ScopedConnection source_removed_connection;
+
+	PBD::ScopedConnection editor_freeze_connection;
+	PBD::ScopedConnection editor_thaw_connection;
+
+	Selection* _selection;
+
+};
+
+#endif /* __gtk_ardour_editor_regions_h__ */
diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index 7064b85004..af0b6d6f27 100644
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -91,6 +91,7 @@ gtk2_ardour_sources = [
         'editor_rulers.cc',
         'editor_selection.cc',
         'editor_snapshots.cc',
+        'editor_sources.cc',
         'editor_summary.cc',
         'editor_tempodisplay.cc',
         'editor_timefx.cc',