fixes for 98% of all the warnings/errors reported by OS X gcc on tiger
[ardour.git] / gtk2_ardour / editor_regions.cc
index 697c46bba57d31c57be888ef94e8d35edce2caf9..c6c8f1e9149874165e16117c8a16b300337bb4de 100644 (file)
 #include <sstream>
 
 #include "pbd/basename.h"
+#include "pbd/enumwriter.h"
 
 #include "ardour/audioregion.h"
 #include "ardour/audiofilesource.h"
+#include "ardour/region_factory.h"
+#include "ardour/session.h"
+#include "ardour/session_playlists.h"
 #include "ardour/silentfilesource.h"
-#include "ardour/session_region.h"
 #include "ardour/profile.h"
 
-#include <gtkmm2ext/stop_signal.h>
+#include "gtkmm2ext/choice.h"
+#include "gtkmm2ext/treeutils.h"
 
+#include "audio_clock.h"
 #include "editor.h"
 #include "editing.h"
 #include "keyboard.h"
 #include "region_view.h"
 #include "utils.h"
 #include "editor_regions.h"
+#include "editor_drag.h"
 
 #include "i18n.h"
 
 using namespace std;
-using namespace sigc;
 using namespace ARDOUR;
 using namespace PBD;
 using namespace Gtk;
 using namespace Glib;
 using namespace Editing;
+using Gtkmm2ext::Keyboard;
 
 EditorRegions::EditorRegions (Editor* e)
-       : EditorComponent (e),
-         _menu (0),
-         _show_automatic_regions (true),
-         _sort_type ((Editing::RegionListSortType) 0),
-         _no_redisplay (false)
+       : EditorComponent (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_name ("RegionListDisplay");
+       _display.set_rules_hint (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, mem_fun (*this, &EditorRegions::sorter));
+       _model->set_sort_func (0, sigc::mem_fun (*this, &EditorRegions::sorter));
        _model->set_sort_column (0, SORT_ASCENDING);
 
        _display.set_model (_model);
+
        _display.append_column (_("Regions"), _columns.name);
-       _display.append_column (_("Start"), _columns.start);
+       _display.append_column (_("Position"), _columns.position);
        _display.append_column (_("End"), _columns.end);
        _display.append_column (_("Length"), _columns.length);
        _display.append_column (_("Sync"), _columns.sync);
@@ -83,22 +97,54 @@ EditorRegions::EditorRegions (Editor* e)
        _display.append_column (_("G"), _columns.glued);
        _display.append_column (_("M"), _columns.muted);
        _display.append_column (_("O"), _columns.opaque);
-       _display.append_column (_("Used"), _columns.used);
-       _display.append_column (_("Path"), _columns.path);
+       // _display.append_column (_("Used"), _columns.used);
+       // _display.append_column (_("Path"), _columns.path);
        _display.set_headers_visible (true);
        //_display.set_grid_lines (TREE_VIEW_GRID_LINES_BOTH);
 
+       /* show path as the row tooltip */
+       _display.set_tooltip_column (15); /* path */
+
        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 (mem_fun (*this, &EditorRegions::name_edit));
+       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 (mem_fun (*this, &EditorRegions::selection_filter));
+       _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_);
 
+       CellRendererToggle* locked_cell = dynamic_cast<CellRendererToggle*> (_display.get_column_cell_renderer (7));
+       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));
+       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));
+       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));
+       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");
 
@@ -111,78 +157,94 @@ EditorRegions::EditorRegions (Editor* e)
        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 (mem_fun(*this, &EditorRegions::drag_data_received));
+       _display.signal_drag_data_received().connect (sigc::mem_fun(*this, &EditorRegions::drag_data_received));
 
        _scroller.add (_display);
        _scroller.set_policy (POLICY_AUTOMATIC, POLICY_AUTOMATIC);
 
-       _display.signal_key_press_event().connect (mem_fun(*this, &EditorRegions::key_press));
-       _display.signal_key_release_event().connect (mem_fun(*this, &EditorRegions::key_release));
-       _display.signal_button_press_event().connect (mem_fun(*this, &EditorRegions::button_press), false);
-       _display.signal_button_release_event().connect (mem_fun(*this, &EditorRegions::button_release));
-       _change_connection = _display.get_selection()->signal_changed().connect (mem_fun(*this, &EditorRegions::selection_changed));
-       // _display.signal_popup_menu().connect (bind (mem_fun (*this, &Editor::show__display_context_menu), 1, 0));
+       _display.signal_button_press_event().connect (sigc::mem_fun(*this, &EditorRegions::button_press), false);
+       _change_connection = _display.get_selection()->signal_changed().connect (sigc::mem_fun(*this, &EditorRegions::selection_changed));
 
-       //ARDOUR_UI::instance()->secondary_clock.mode_changed.connect (mem_fun(*this, &Editor::redisplay_regions));
-       ARDOUR_UI::instance()->secondary_clock.mode_changed.connect (mem_fun(*this, &EditorRegions::update_all_rows));
-       ARDOUR::Region::RegionPropertyChanged.connect (mem_fun(*this, &EditorRegions::update_row));
+       _scroller.signal_key_press_event().connect (sigc::mem_fun(*this, &EditorRegions::key_press), false);
+       _scroller.signal_focus_in_event().connect (sigc::mem_fun (*this, &EditorRegions::focus_in), false);
+       _scroller.signal_focus_out_event().connect (sigc::mem_fun (*this, &EditorRegions::focus_out));
 
-}
+       _display.signal_enter_notify_event().connect (sigc::mem_fun (*this, &EditorRegions::enter_notify), false);
+       _display.signal_leave_notify_event().connect (sigc::mem_fun (*this, &EditorRegions::leave_notify), false);
 
-void
-EditorRegions::connect_to_session (ARDOUR::Session* s)
-{
-       EditorComponent::connect_to_session (s);
+       // _display.signal_popup_menu().connect (sigc::bind (sigc::mem_fun (*this, &Editor::show__display_context_menu), 1, 0));
 
-       _session_connections.push_back (_session->RegionsAdded.connect (mem_fun(*this, &EditorRegions::handle_new_regions)));
-       _session_connections.push_back (_session->RegionRemoved.connect (mem_fun(*this, &EditorRegions::handle_region_removed)));
-       _session_connections.push_back (_session->RegionHiddenChange.connect (mem_fun(*this, &EditorRegions::region_hidden)));
+       //ARDOUR_UI::instance()->secondary_clock.mode_changed.connect (sigc::mem_fun(*this, &Editor::redisplay_regions));
+       ARDOUR_UI::instance()->secondary_clock->mode_changed.connect (sigc::mem_fun(*this, &EditorRegions::update_all_rows));
+       ARDOUR::Region::RegionPropertyChanged.connect (region_property_connection, MISSING_INVALIDATOR, ui_bind (&EditorRegions::region_changed, this, _1, _2), gui_context());
+       ARDOUR::RegionFactory::CheckNewRegion.connect (check_new_region_connection, MISSING_INVALIDATOR, ui_bind (&EditorRegions::add_region, this, _1), gui_context());
 
-       redisplay ();
+       e->EditorFreeze.connect (editor_freeze_connection, MISSING_INVALIDATOR, ui_bind (&EditorRegions::freeze_tree_model, this), gui_context());
+       e->EditorThaw.connect (editor_thaw_connection, MISSING_INVALIDATOR, ui_bind (&EditorRegions::thaw_tree_model, this), gui_context());
 }
 
-void
-EditorRegions::handle_region_removed (boost::weak_ptr<Region> wregion)
+bool
+EditorRegions::focus_in (GdkEventFocus*)
 {
-       ENSURE_GUI_THREAD (bind (mem_fun (*this, &EditorRegions::handle_region_removed), wregion));
+       Window* win = dynamic_cast<Window*> (_scroller.get_toplevel ());
 
-       redisplay ();
+       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;
 }
 
-void
-EditorRegions::handle_new_regions (vector<boost::weak_ptr<Region> >& v)
+bool
+EditorRegions::focus_out (GdkEventFocus*)
 {
-       ENSURE_GUI_THREAD (bind (mem_fun (*this, &EditorRegions::handle_new_regions), v));
-       add_regions (v);
+       if (old_focus) {
+               old_focus->grab_focus ();
+               old_focus = 0;
+       }
+
+       name_editable = 0;
+
+       return false;
 }
 
-void
-EditorRegions::region_hidden_weak (boost::weak_ptr<Region> wr)
+bool
+EditorRegions::enter_notify (GdkEventCrossing*)
 {
-       boost::shared_ptr<Region> r (wr.lock());
-
-       if (r) {
-               region_hidden (r);
+       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;
 }
 
-void
-EditorRegions::region_hidden (boost::shared_ptr<Region> r)
+bool
+EditorRegions::leave_notify (GdkEventCrossing*)
 {
-       ENSURE_GUI_THREAD(bind (mem_fun(*this, &EditorRegions::region_hidden), r));
-       redisplay ();
-}
+       if (old_focus) {
+               old_focus->grab_focus ();
+               old_focus = 0;
+       }
 
+       Keyboard::magic_widget_drop_focus ();
+       return false;
+}
 
 void
-EditorRegions::add_regions (vector<boost::weak_ptr<Region> >& regions)
+EditorRegions::set_session (ARDOUR::Session* s)
 {
-       for (vector<boost::weak_ptr<Region> >::iterator x = regions.begin(); x != regions.end(); ++x) {
-               boost::shared_ptr<Region> region ((*x).lock());
-               if (region) {
-                       add_region (region);
-               }
-       }
+       SessionHandlePtr::set_session (s);
+       redisplay ();
 }
 
 void
@@ -202,6 +264,7 @@ EditorRegions::add_region (boost::shared_ptr<Region> region)
        }
 
        if (region->hidden()) {
+
                TreeModel::iterator iter = _model->get_iter ("0");
                TreeModel::Row parent;
                TreeModel::Row child;
@@ -212,7 +275,8 @@ EditorRegions::add_region (boost::shared_ptr<Region> region)
                        boost::shared_ptr<Region> proxy = parent[_columns.region];
                        proxy.reset ();
                } else {
-                       if ((*iter)[_columns.name] != _("Hidden")) {
+                       string s = (*iter)[_columns.name];
+                       if (s != _("Hidden")) {
                                parent = *(_model->insert(iter));
                                parent[_columns.name] = _("Hidden");
                                boost::shared_ptr<Region> proxy = parent[_columns.region];
@@ -283,199 +347,216 @@ EditorRegions::add_region (boost::shared_ptr<Region> region)
 
                row[_columns.name] = str;
                row[_columns.region] = region;
+               row[_columns.property_toggles_visible] = false;
 
                if (missing_source) {
                        row[_columns.path] = _("(MISSING) ") + region->source()->name();
 
                } else {
-                       row[_columns.path] = region->source()->name();
-
-               }
-
-               if (region->automatic()) {
-                       return;
+                       boost::shared_ptr<FileSource> fs = boost::dynamic_pointer_cast<FileSource>(region->source());
+                       if (fs) {
+                               row[_columns.path] = fs->path();
+                       } else {
+                               row[_columns.path] = region->source()->name();
+                       }
                }
 
-       } else {
+               region_row_map.insert(pair<boost::shared_ptr<ARDOUR::Region>, Gtk::TreeModel::RowReference>(region, TreeRowReference(_model, TreePath (row))) );
+               parent_regions_sources_map.insert(pair<string, Gtk::TreeModel::RowReference>(region->source_string(), TreeRowReference(_model, TreePath (row))) );
 
-               /* find parent node, add as new child */
+               return;
 
+       } else {
+               // find parent node, add as new child
                TreeModel::iterator i;
-               TreeModel::Children rows = _model->children();
-               bool found_parent = false;
 
-               for (i = rows.begin(); i != rows.end(); ++i) {
-                       boost::shared_ptr<Region> rr = (*i)[_columns.region];
-                       boost::shared_ptr<AudioRegion> r = boost::dynamic_pointer_cast<AudioRegion>(rr);
+               boost::unordered_map<string, Gtk::TreeModel::RowReference>::iterator it;
 
-                       if (r && r->whole_file()) {
+               it = parent_regions_sources_map.find (region->source_string());
 
-                               if (region->source_equivalent (r)) {
-                                       row = *(_model->append ((*i).children()));
-                                       found_parent = true;
-                                       break;
-                               }
-                       }
+               if (it != parent_regions_sources_map.end()){
+
+                       TreeModel::iterator j = _model->get_iter ((*it).second.get_path());
 
                        TreeModel::iterator ii;
-                       TreeModel::Children subrows = (*i).children();
+                       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> rrr = (*ii)[_columns.region];
+                               boost::shared_ptr<Region> rr = (*ii)[_columns.region];
 
-                               if (region->region_list_equivalent (rrr)) {
+                               if (region->region_list_equivalent (rr)) {
                                        return;
-
                                }
                        }
-               }
+                       */
 
-               if (!found_parent) {
+                       row = *(_model->insert (subrows.end()));
+                       
+               } else {
                        row = *(_model->append());
                }
+
+               row[_columns.property_toggles_visible] = true;
        }
 
        row[_columns.region] = region;
 
+       region_row_map.insert(pair<boost::shared_ptr<ARDOUR::Region>, Gtk::TreeModel::RowReference>(region, TreeRowReference(_model, TreePath (row))) );
+
        populate_row(region, (*row));
 }
 
-
 void
-EditorRegions::region_changed (Change what_changed, boost::weak_ptr<Region> region)
+EditorRegions::delete_unused_regions ()
 {
-       ENSURE_GUI_THREAD (bind (mem_fun (*this, &EditorRegions::region_changed), what_changed, region));
+       vector<string> choices;
+       string prompt;
 
-       boost::shared_ptr<Region> r = region.lock ();
-
-       if (!r) {
+       if (!_session) {
                return;
        }
 
-       if (what_changed & ARDOUR::NameChanged) {
-               /* find the region in our model and change its name */
-               TreeModel::Children rows = _model->children ();
-               TreeModel::iterator i = rows.begin ();
-               while (i != rows.end ()) {
-                       TreeModel::Children children = (*i)->children ();
-                       TreeModel::iterator j = children.begin ();
-                       while (j != children.end()) {
-                               boost::shared_ptr<Region> c = (*j)[_columns.region];
-                               if (c == r) {
-                                       break;
+       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."));
+
+       Gtkmm2ext::Choice prompter (_("Remove unused regions"), prompt, choices);
+
+       if (prompter.run () == 1) {
+               _no_redisplay = true;
+               _session->cleanup_regions ();
+               _no_redisplay = false;
+               redisplay ();
+       }
+}
+
+void
+EditorRegions::region_changed (boost::shared_ptr<Region> r, const PropertyChange& what_changed)
+{
+       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::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);
+
+       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));
+
+                               if (what_changed.contains (ARDOUR::Properties::hidden)) {
+                                       redisplay ();
                                }
-                               ++j;
-                       }
 
-                       if (j != children.end()) {
-                               (*j)[_columns.name] = r->name ();
-                               break;
+                               return;
                        }
+               }
+
+               RegionRowMap::iterator it;
+
+               it = region_row_map.find (r);
+
+               if (it != region_row_map.end()){
+
+                       TreeModel::iterator j = _model->get_iter ((*it).second.get_path());
+                       boost::shared_ptr<Region> c = (*j)[_columns.region];
 
-                       ++i;
+                       if (c == r) {
+                               populate_row (r, (*j));
+
+                               if (what_changed.contains (ARDOUR::Properties::hidden)) {
+                                       redisplay ();
+                               }
+
+                               return;
+                       }
                }
+       }
 
+       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) {
 
                TreeIter iter;
                TreeView::Selection::ListHandle_Path rows = _display.get_selection()->get_selected_rows ();
 
-               _editor->deselect_all ();
+               _editor->get_selection().clear_regions ();
 
                for (TreeView::Selection::ListHandle_Path::iterator i = rows.begin(); i != rows.end(); ++i) {
 
-                       if (iter = _model->get_iter (*i)) {                                                                     // they could have clicked on a row that is just a placeholder, like "Hidden"
+                       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) {
 
                                        if (region->automatic()) {
+
                                                _display.get_selection()->unselect(*i);
 
                                        } else {
                                                _change_connection.block (true);
-                                               //editor_regions_selection_changed_connection.block(true);
-
                                                _editor->set_selected_regionview_from_region_list (region, Selection::Add);
 
                                                _change_connection.block (false);
-                                               //editor_regions_selection_changed_connection.block(false);
                                        }
                                }
                        }
                }
        } else {
-               _editor->deselect_all ();
+               _editor->get_selection().clear_regions ();
        }
+
+       _editor->_region_selection_change_updates_region_list = true;
 }
 
 void
 EditorRegions::set_selected (RegionSelection& regions)
 {
-       for (RegionSelection::iterator iter = regions.begin(); iter != regions.end(); ++iter) {
-
-               TreeModel::iterator i;
-               TreeModel::Children rows = _model->children();
-               boost::shared_ptr<Region> r ((*iter)->region());
-
-               for (i = rows.begin(); i != rows.end(); ++i) {
-
-                       boost::shared_ptr<Region> compared_region = (*i)[_columns.region];
-
-                       if (r == compared_region) {
-                               _display.get_selection()->select(*i);
-                               break;
-                       }
-
-                       if (!(*i).children().empty()) {
-                               if (set_selected_in_subrow(r, (*i), 2)) {
-                                       break;
-                               }
-                       }
-               }
-       }
-}
-
-bool
-EditorRegions::set_selected_in_subrow (boost::shared_ptr<Region> region, TreeModel::Row const &parent_row, int level)
-{
-       TreeModel::iterator i;
-       TreeModel::Children subrows = (*parent_row).children();
+       for (RegionSelection::iterator i = regions.begin(); i != regions.end(); ++i) {
 
-       for (i = subrows.begin(); i != subrows.end(); ++i) {
+               boost::shared_ptr<Region> r ((*i)->region());
 
-               boost::shared_ptr<Region> compared_region = (*i)[_columns.region];
+               RegionRowMap::iterator it;
 
-               if (region == compared_region) {
-                       _display.get_selection()->select(*i);
-                       return true;
-               }
+               it = region_row_map.find (r);
 
-               if (!(*i).children().empty()) {
-                       if (set_selected_in_subrow (region, (*i), level + 1)) {
-                               return true;
-                       }
+               if (it != region_row_map.end()){
+                       TreeModel::iterator j = _model->get_iter ((*it).second.get_path());
+                       _display.get_selection()->select(*j);
                }
        }
-       return false;
-}
-
-void
-EditorRegions::insert_into_tmp_regionlist(boost::shared_ptr<Region> region)
-{
-       /* keep all whole files at the beginning */
-
-       if (region->whole_file()) {
-               tmp_region_list.push_front (region);
-       } else {
-               tmp_region_list.push_back (region);
-       }
 }
 
 void
@@ -487,27 +568,43 @@ EditorRegions::redisplay ()
 
        bool tree_expanded = false;
 
-       if (_toggle_full_action && _toggle_full_action->get_active()) {   //If the list was expanded prior to rebuilding,
-               tree_expanded = true;                                                                                                                           //expand it again afterwards
+       /* 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
 
-       /* now add everything we have, via a temporary list used to help with
-               sorting.
-       */
 
-       tmp_region_list.clear();
-       _session->foreach_region (this, &EditorRegions::insert_into_tmp_regionlist);
+       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 */
+                       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);
        }
-       tmp_region_list.clear();
 
+       _model->set_sort_column (0, SORT_ASCENDING); // renabale sorting
        _display.set_model (_model);
 
+       tmp_region_list.clear();
+
        if (tree_expanded) {
                _display.expand_all();
        }
@@ -520,55 +617,15 @@ EditorRegions::update_row (boost::shared_ptr<Region> region)
                return;
        }
 
-       TreeModel::iterator i;
-       TreeModel::Children rows = _model->children();
+       RegionRowMap::iterator it;
 
-       for (i = rows.begin(); i != rows.end(); ++i) {
+       it = region_row_map.find (region);
 
-//             cerr << "Level 1: Compare " << region->name() << " with parent " << (*i)[_columns.name] << "\n";
+       if (it != region_row_map.end()){
 
-               boost::shared_ptr<Region> compared_region = (*i)[_columns.region];
-
-               if (region == compared_region) {
-//                     cerr << "Matched\n";
-                       populate_row(region, (*i));
-                       return;
-               }
-
-               if (!(*i).children().empty()) {
-                       if (update_subrows(region, (*i), 2)) {
-                               return;
-                       }
-               }
+               TreeModel::iterator j = _model->get_iter ((*it).second.get_path());
+               populate_row(region, (*j));
        }
-//     cerr << "Returning - No match\n";
-}
-
-bool
-EditorRegions::update_subrows (boost::shared_ptr<Region> region, TreeModel::Row const &parent_row, int level)
-{
-       TreeModel::iterator i;
-       TreeModel::Children subrows = (*parent_row).children();
-
-       for (i = subrows.begin(); i != subrows.end(); ++i) {
-
-//             cerr << "Level " << level << ": Compare " << region->name() << " with child " << (*i)[_columns.name] << "\n";
-
-               boost::shared_ptr<Region> compared_region = (*i)[_columns.region];
-
-               if (region == compared_region) {
-                       populate_row(region, (*i));
-//                     cerr << "Matched\n";
-                       return true;
-               }
-
-               if (!(*i).children().empty()) {
-                       if (update_subrows (region, (*i), level + 1)) {
-                               return true;
-                       }
-               }
-       }
-       return false;
 }
 
 void
@@ -578,199 +635,92 @@ EditorRegions::update_all_rows ()
                return;
        }
 
-       TreeModel::iterator i;
-       TreeModel::Children rows = _model->children();
-
-       for (i = rows.begin(); i != rows.end(); ++i) {
-
-               boost::shared_ptr<Region> region = (*i)[_columns.region];
+       RegionRowMap::iterator i;
 
-               if (!region->automatic()) {
-                       cerr << "level 1 : Updating " << region->name() << "\n";
-                       populate_row(region, (*i));
-               }
-
-               if (!(*i).children().empty()) {
-                       update_all_subrows ((*i), 2);
-               }
-       }
-}
+       for (i = region_row_map.begin(); i != region_row_map.end(); ++i) {
 
-void
-EditorRegions::update_all_subrows (TreeModel::Row const &parent_row, int level)
-{
-       TreeModel::iterator i;
-       TreeModel::Children subrows = (*parent_row).children();
+               TreeModel::iterator j = _model->get_iter ((*i).second.get_path());
 
-       for (i = subrows.begin(); i != subrows.end(); ++i) {
-
-               boost::shared_ptr<Region> region = (*i)[_columns.region];
+               boost::shared_ptr<Region> region = (*j)[_columns.region];
 
                if (!region->automatic()) {
-                       cerr << "level " << level << " : Updating " << region->name() << "\n";
-                       populate_row(region, (*i));
-               }
-
-               if (!(*i).children().empty()) {
-                       update_all_subrows ((*i), level + 1);
+                       populate_row(region, (*j));
                }
        }
 }
 
 void
-EditorRegions::populate_row (boost::shared_ptr<Region> region, TreeModel::Row const &row)
+EditorRegions::format_position (framepos_t pos, char* buf, size_t bufsize)
 {
-       char start_str[16];
-       char end_str[16];
-       char length_str[16];
-       char sync_str[16];
-       char fadein_str[16];
-       char fadeout_str[16];
-       char used_str[8];
-       int used;
-       BBT_Time bbt;
+       Timecode::BBT_Time bbt;
        Timecode::Time timecode;
 
-       bool missing_source = boost::dynamic_pointer_cast<SilentFileSource>(region->source());
-
-       boost::shared_ptr<AudioRegion> audioRegion = boost::dynamic_pointer_cast<AudioRegion>(region);
-
-       bool fades_in_seconds = false;
-
-       start_str[0] = '\0';
-       end_str[0] = '\0';
-       length_str[0] = '\0';
-       sync_str[0] = '\0';
-       fadein_str[0] = '\0';
-       fadeout_str[0] = '\0';
-       used_str[0] = '\0';
-
-       used = _editor->get_regionview_count_from_region_list (region);
-       sprintf (used_str, "%4d" , used);
-
-       switch (ARDOUR_UI::instance()->secondary_clock.mode ()) {
-       case AudioClock::Timecode:
-       case AudioClock::Off:                                                                                           /* If the secondary clock is off, default to Timecode */
-               _session->timecode_time (region->position(), timecode);
-               sprintf (start_str, "%02d:%02d:%02d:%02d", timecode.hours, timecode.minutes, timecode.seconds, timecode.frames);
-               _session->timecode_time (region->position() + region->length() - 1, timecode);
-               sprintf (end_str, "%02d:%02d:%02d:%02d", timecode.hours, timecode.minutes, timecode.seconds, timecode.frames);
-               _session->timecode_time (region->length(), timecode);
-               sprintf (length_str, "%02d:%02d:%02d:%02d", timecode.hours, timecode.minutes, timecode.seconds, timecode.frames);
-               _session->timecode_time (region->sync_position() + region->position(), timecode);
-               sprintf (sync_str, "%02d:%02d:%02d:%02d", timecode.hours, timecode.minutes, timecode.seconds, timecode.frames);
-
-               if (audioRegion && !fades_in_seconds) {
-                       _session->timecode_time (audioRegion->fade_in()->back()->when, timecode);
-                       sprintf (fadein_str, "%02d:%02d:%02d:%02d", timecode.hours, timecode.minutes, timecode.seconds, timecode.frames);
-                       _session->timecode_time (audioRegion->fade_out()->back()->when, timecode);
-                       sprintf (fadeout_str, "%02d:%02d:%02d:%02d", timecode.hours, timecode.minutes, timecode.seconds, timecode.frames);
-               }
-
-               break;
-
+       switch (ARDOUR_UI::instance()->secondary_clock->mode ()) {
        case AudioClock::BBT:
-               _session->tempo_map().bbt_time (region->position(), bbt);
-               sprintf (start_str, "%03d|%02d|%04d" , bbt.bars, bbt.beats, bbt.ticks);
-               _session->tempo_map().bbt_time (region->position() + region->length() - 1, bbt);
-               sprintf (end_str, "%03d|%02d|%04d" , bbt.bars, bbt.beats, bbt.ticks);
-               _session->tempo_map().bbt_time (region->length(), bbt);
-               sprintf (length_str, "%03d|%02d|%04d" , bbt.bars, bbt.beats, bbt.ticks);
-               _session->tempo_map().bbt_time (region->sync_position() + region->position(), bbt);
-               sprintf (sync_str, "%03d|%02d|%04d" , bbt.bars, bbt.beats, bbt.ticks);
-
-               if (audioRegion && !fades_in_seconds) {
-                       _session->tempo_map().bbt_time (audioRegion->fade_in()->back()->when, bbt);
-                       sprintf (fadein_str, "%03d|%02d|%04d" , bbt.bars, bbt.beats, bbt.ticks);
-                       _session->tempo_map().bbt_time (audioRegion->fade_out()->back()->when, bbt);
-                       sprintf (fadeout_str, "%03d|%02d|%04d" , bbt.bars, bbt.beats, bbt.ticks);
-               }
+               _session->tempo_map().bbt_time (pos, bbt);
+               snprintf (buf, bufsize, "%03d|%02d|%04d" , bbt.bars, bbt.beats, bbt.ticks);
                break;
 
        case AudioClock::MinSec:
-               nframes_t left;
+               framepos_t left;
                int hrs;
                int mins;
                float secs;
 
-               left = region->position();
-               hrs = (int) floor (left / (_session->frame_rate() * 60.0f * 60.0f));
-               left -= (nframes_t) floor (hrs * _session->frame_rate() * 60.0f * 60.0f);
-               mins = (int) floor (left / (_session->frame_rate() * 60.0f));
-               left -= (nframes_t) floor (mins * _session->frame_rate() * 60.0f);
-               secs = left / (float) _session->frame_rate();
-               sprintf (start_str, "%02d:%02d:%06.3f", hrs, mins, secs);
-
-               left = region->position() + region->length() - 1;
+               left = pos;
                hrs = (int) floor (left / (_session->frame_rate() * 60.0f * 60.0f));
-               left -= (nframes_t) floor (hrs * _session->frame_rate() * 60.0f * 60.0f);
+               left -= (framecnt_t) floor (hrs * _session->frame_rate() * 60.0f * 60.0f);
                mins = (int) floor (left / (_session->frame_rate() * 60.0f));
-               left -= (nframes_t) floor (mins * _session->frame_rate() * 60.0f);
+               left -= (framecnt_t) floor (mins * _session->frame_rate() * 60.0f);
                secs = left / (float) _session->frame_rate();
-               sprintf (end_str, "%02d:%02d:%06.3f", hrs, mins, secs);
-
-               left = region->length();
-               hrs = (int) floor (left / (_session->frame_rate() * 60.0f * 60.0f));
-               left -= (nframes_t) floor (hrs * _session->frame_rate() * 60.0f * 60.0f);
-               mins = (int) floor (left / (_session->frame_rate() * 60.0f));
-               left -= (nframes_t) floor (mins * _session->frame_rate() * 60.0f);
-               secs = left / (float) _session->frame_rate();
-               sprintf (length_str, "%02d:%02d:%06.3f", hrs, mins, secs);
-
-               left = region->sync_position() + region->position();
-               hrs = (int) floor (left / (_session->frame_rate() * 60.0f * 60.0f));
-               left -= (nframes_t) floor (hrs * _session->frame_rate() * 60.0f * 60.0f);
-               mins = (int) floor (left / (_session->frame_rate() * 60.0f));
-               left -= (nframes_t) floor (mins * _session->frame_rate() * 60.0f);
-               secs = left / (float) _session->frame_rate();
-               sprintf (sync_str, "%02d:%02d:%06.3f", hrs, mins, secs);
-
-               if (audioRegion && !fades_in_seconds) {
-                       left = audioRegion->fade_in()->back()->when;
-                       hrs = (int) floor (left / (_session->frame_rate() * 60.0f * 60.0f));
-                       left -= (nframes_t) floor (hrs * _session->frame_rate() * 60.0f * 60.0f);
-                       mins = (int) floor (left / (_session->frame_rate() * 60.0f));
-                       left -= (nframes_t) floor (mins * _session->frame_rate() * 60.0f);
-                       secs = left / (float) _session->frame_rate();
-                       sprintf (fadein_str, "%02d:%02d:%06.3f", hrs, mins, secs);
-
-                       left = audioRegion->fade_out()->back()->when;
-                       hrs = (int) floor (left / (_session->frame_rate() * 60.0f * 60.0f));
-                       left -= (nframes_t) floor (hrs * _session->frame_rate() * 60.0f * 60.0f);
-                       mins = (int) floor (left / (_session->frame_rate() * 60.0f));
-                       left -= (nframes_t) floor (mins * _session->frame_rate() * 60.0f);
-                       secs = left / (float) _session->frame_rate();
-                       sprintf (fadeout_str, "%02d:%02d:%06.3f", hrs, mins, secs);
-               }
-
+               snprintf (buf, bufsize, "%02d:%02d:%06.3f", hrs, mins, secs);
                break;
 
        case AudioClock::Frames:
-               snprintf (start_str, sizeof (start_str), "%u", region->position());
-               snprintf (end_str, sizeof (end_str), "%u", (region->position() + region->length() - 1));
-               snprintf (length_str, sizeof (length_str), "%u", region->length());
-               snprintf (sync_str, sizeof (sync_str), "%u", region->sync_position() + region->position());
-
-               if (audioRegion && !fades_in_seconds) {
-                       snprintf (fadein_str, sizeof (fadein_str), "%u", uint (audioRegion->fade_in()->back()->when));
-                       snprintf (fadeout_str, sizeof (fadeout_str), "%u", uint (audioRegion->fade_out()->back()->when));
-               }
-
+               snprintf (buf, bufsize, "%" PRId64, pos);
                break;
 
+       case AudioClock::Timecode:
        default:
+               _session->timecode_time (pos, timecode);
+               snprintf (buf, bufsize, "%02d:%02d:%02d:%02d", timecode.hours, timecode.minutes, timecode.seconds, timecode.frames);
                break;
        }
+}
 
+void
+EditorRegions::populate_row (boost::shared_ptr<Region> region, TreeModel::Row const &row)
+{
+       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;
+
+       populate_row_position (region, row, used);
+       populate_row_end (region, row, used);
+       populate_row_sync (region, row, used);
+       populate_row_fade_in (region, row, used, audioregion);
+       populate_row_fade_out (region, row, used, audioregion);
+       populate_row_locked (region, row, used);
+       populate_row_glued (region, row, used);
+       populate_row_muted (region, row, used);
+       populate_row_opaque (region, row, used);
+       populate_row_length (region, row);
+       populate_row_source (region, row);
+       populate_row_name (region, row);
+       populate_row_used (region, row, used);
+}
+
+#if 0
        if (audioRegion && fades_in_seconds) {
 
-               nframes_t left;
+               framepos_t left;
                int mins;
                int millisecs;
 
                left = audioRegion->fade_in()->back()->when;
                mins = (int) floor (left / (_session->frame_rate() * 60.0f));
-               left -= (nframes_t) floor (mins * _session->frame_rate() * 60.0f);
+               left -= (framepos_t) floor (mins * _session->frame_rate() * 60.0f);
                millisecs = (int) floor ((left * 1000.0f) / _session->frame_rate());
 
                if (audioRegion->fade_in()->back()->when >= _session->frame_rate()) {
@@ -781,7 +731,7 @@ EditorRegions::populate_row (boost::shared_ptr<Region> region, TreeModel::Row co
 
                left = audioRegion->fade_out()->back()->when;
                mins = (int) floor (left / (_session->frame_rate() * 60.0f));
-               left -= (nframes_t) floor (mins * _session->frame_rate() * 60.0f);
+               left -= (framepos_t) floor (mins * _session->frame_rate() * 60.0f);
                millisecs = (int) floor ((left * 1000.0f) / _session->frame_rate());
 
                if (audioRegion->fade_out()->back()->when >= _session->frame_rate()) {
@@ -790,70 +740,165 @@ EditorRegions::populate_row (boost::shared_ptr<Region> region, TreeModel::Row co
                        sprintf (fadeout_str, "%01dmS", millisecs);
                }
        }
+#endif
 
-       if (used > 1) {
-               row[_columns.start] = _("Multiple");
-               row[_columns.end] = _("Multiple");
-               row[_columns.sync] = _("Multiple");
-               row[_columns.fadein] = _("Multiple");
-               row[_columns.fadeout] = _("Multiple");
-               row[_columns.locked] = false;
-               row[_columns.glued] = false;
-               row[_columns.muted] = false;
-               row[_columns.opaque] = false;
+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];
+       format_position (region->length(), buf, sizeof (buf));
+       row[_columns.length] = buf;
+}
+
+void
+EditorRegions::populate_row_end (boost::shared_ptr<Region> region, TreeModel::Row const &row, uint32_t used)
+{
+       if (region->whole_file()) {
+               row[_columns.end] = "";
+       } else if (used > 1) {
+               row[_columns.end] = _("Mult.");
        } else {
-               row[_columns.start] = start_str;
-               row[_columns.end] = end_str;
+               char buf[16];
+               format_position (region->last_frame(), buf, sizeof (buf));
+               row[_columns.end] = buf;
+       }
+}
 
-               if (region->sync_position() == 0) {
+void
+EditorRegions::populate_row_position (boost::shared_ptr<Region> region, TreeModel::Row const &row, uint32_t used)
+{
+       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;
+       }
+}
+
+void
+EditorRegions::populate_row_sync (boost::shared_ptr<Region> region, TreeModel::Row const &row, uint32_t used)
+{
+       if (region->whole_file()) {
+               row[_columns.sync] = "";
+       } else if (used > 1) {
+               row[_columns.sync] = _("Mult."); /* translators: a short phrase for "multiple" as in "many" */
+       } else {
+               if (region->sync_position() == region->position()) {
                        row[_columns.sync] = _("Start");
-               } else if (region->sync_position() == region->length() - 1) {
+               } else if (region->sync_position() == (region->last_frame())) {
                        row[_columns.sync] = _("End");
                } else {
-                       row[_columns.sync] = sync_str;
+                       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)
+{
+       if (!audioregion || region->whole_file()) {
+               row[_columns.fadein] = "";
+       } else {
+               if (used > 1) {
+                       row[_columns.fadein] = _("Multiple");
+               } else {
 
-               if (audioRegion) {
-                       if (audioRegion->fade_in_active()) {
-                               row[_columns.fadein] = string_compose("%1%2%3", " ", fadein_str, " ");
+                       char buf[16];
+                       format_position (audioregion->fade_in()->back()->when, buf, sizeof (buf));
+                       row[_columns.fadein] = buf;
+
+                       if (audioregion->fade_in_active()) {
+                               row[_columns.fadein] = string_compose("%1%2%3", " ", buf, " ");
                        } else {
-                               row[_columns.fadein] = string_compose("%1%2%3", "(", fadein_str, ")");
+                               row[_columns.fadein] = string_compose("%1%2%3", "(", buf, ")");
                        }
-               } else {
-                       row[_columns.fadein] = "";
                }
+       }
+}
+
+void
+EditorRegions::populate_row_fade_out (boost::shared_ptr<Region> region, TreeModel::Row const &row, uint32_t used, boost::shared_ptr<AudioRegion> audioregion)
+{
+       if (!audioregion || region->whole_file()) {
+               row[_columns.fadeout] = "";
+       } else {
+               if (used > 1) {
+                       row[_columns.fadeout] = _("Multiple");
+               } else {
+                       char buf[16];
+                       format_position (audioregion->fade_out()->back()->when, buf, sizeof (buf));
 
-               if (audioRegion) {
-                       if (audioRegion->fade_out_active()) {
-                               row[_columns.fadeout] = string_compose("%1%2%3", " ", fadeout_str, " ");
+                       if (audioregion->fade_out_active()) {
+                               row[_columns.fadeout] = string_compose("%1%2%3", " ", buf, " ");
                        } else {
-                               row[_columns.fadeout] = string_compose("%1%2%3", "(", fadeout_str, ")");
+                               row[_columns.fadeout] = string_compose("%1%2%3", "(", buf, ")");
                        }
-               } else {
-                       row[_columns.fadeout] = "";
                }
+       }
+}
 
+void
+EditorRegions::populate_row_locked (boost::shared_ptr<Region> region, TreeModel::Row const &row, uint32_t used)
+{
+       if (region->whole_file()) {
+               row[_columns.locked] = false;
+       } else if (used > 1) {
+               row[_columns.locked] = false;
+       } else {
                row[_columns.locked] = region->locked();
+       }
+}
 
-               if (region->positional_lock_style() == Region::MusicTime) {
+void
+EditorRegions::populate_row_glued (boost::shared_ptr<Region> region, TreeModel::Row const &row, uint32_t used)
+{
+       if (region->whole_file() || used > 1) {
+               row[_columns.glued] = false;
+       } else {
+               if (region->position_lock_style() == MusicTime) {
                        row[_columns.glued] = true;
                } else {
                        row[_columns.glued] = false;
                }
+       }
+}
 
+void
+EditorRegions::populate_row_muted (boost::shared_ptr<Region> region, TreeModel::Row const &row, uint32_t used)
+{
+       if (region->whole_file() || used > 1) {
+               row[_columns.muted] = false;
+       } else {
                row[_columns.muted] = region->muted();
-               row[_columns.opaque] = region->opaque();
        }
+}
 
-       row[_columns.length] = length_str;
-       row[_columns.used] = used_str;
-
-       if (missing_source) {
-               row[_columns.path] = _("MISSING ") + region->source()->name();
+void
+EditorRegions::populate_row_opaque (boost::shared_ptr<Region> region, TreeModel::Row const &row, uint32_t used)
+{
+       if (region->whole_file() || used > 1) {
+               row[_columns.opaque] = false;
        } else {
-               row[_columns.path] = region->source()->name();
+               row[_columns.opaque] = region->opaque();
        }
+}
 
+void
+EditorRegions::populate_row_name (boost::shared_ptr<Region> region, TreeModel::Row const &row)
+{
        if (region->n_channels() > 1) {
                row[_columns.name] = string_compose("%1  [%2]", region->name(), region->n_channels());
        } else {
@@ -862,39 +907,37 @@ EditorRegions::populate_row (boost::shared_ptr<Region> region, TreeModel::Row co
 }
 
 void
-EditorRegions::build_menu ()
+EditorRegions::populate_row_source (boost::shared_ptr<Region> region, TreeModel::Row const &row)
 {
-       _menu = dynamic_cast<Menu*>(ActionManager::get_widget ("/RegionListMenu"));
-
-       /* now grab specific menu items that we need */
-
-       Glib::RefPtr<Action> act;
-
-       act = ActionManager::get_action (X_("RegionList"), X_("rlShowAll"));
-       if (act) {
-               _toggle_full_action = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
-       }
-
-       act = ActionManager::get_action (X_("RegionList"), X_("rlShowAuto"));
-       if (act) {
-               _toggle_show_auto_regions_action = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
+        if (boost::dynamic_pointer_cast<SilentFileSource>(region->source())) {
+               row[_columns.path] = _("MISSING ") + region->source()->name();
+       } else {
+               row[_columns.path] = region->source()->name();
        }
 }
 
 void
 EditorRegions::toggle_show_auto_regions ()
 {
-       _show_automatic_regions = _toggle_show_auto_regions_action->get_active();
+       _show_automatic_regions = toggle_show_auto_regions_action()->get_active();
        redisplay ();
 }
 
 void
 EditorRegions::toggle_full ()
 {
-       if (_toggle_full_action->get_active()) {
+       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;
        }
 }
 
@@ -902,7 +945,7 @@ void
 EditorRegions::show_context_menu (int button, int time)
 {
        if (_menu == 0) {
-               build_menu ();
+               _menu = dynamic_cast<Menu*> (ActionManager::get_widget ("/RegionListMenu"));
        }
 
        if (_display.get_selection()->count_selected_rows() > 0) {
@@ -911,23 +954,55 @@ 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);
 }
 
 bool
-EditorRegions::key_press (GdkEventKey* /*ev*/)
+EditorRegions::key_press (GdkEventKey* ev)
 {
-       return false;
-}
+       TreeViewColumn *col;
 
-bool
-EditorRegions::key_release (GdkEventKey* ev)
-{
        switch (ev->keyval) {
-       case GDK_Delete:
-               remove_region ();
+       case GDK_Tab:
+       case GDK_ISO_Left_Tab:
+
+               if (name_editable) {
+                       name_editable->editing_done ();
+                       name_editable = 0;
+               }
+
+               col = _display.get_column (0); // select&focus on name column
+
+               if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) {
+                       treeview_select_previous (_display, _model, col);
+               } else {
+                       treeview_select_next (_display, _model, col);
+               }
+
                return true;
                break;
+
        default:
                break;
        }
@@ -953,7 +1028,7 @@ EditorRegions::button_press (GdkEventButton *ev)
 
        if (Keyboard::is_context_menu_event (ev)) {
                show_context_menu (ev->button, ev->time);
-               return true;
+               return false;
        }
 
        if (region != 0 && Keyboard::is_button2_event (ev)) {
@@ -967,30 +1042,6 @@ EditorRegions::button_press (GdkEventButton *ev)
        return false;
 }
 
-bool
-EditorRegions::button_release (GdkEventButton *ev)
-{
-       TreeIter iter;
-       TreeModel::Path path;
-       TreeViewColumn* column;
-       int cellx;
-       int celly;
-       boost::shared_ptr<Region> region;
-
-       if (_display.get_path_at_pos ((int)ev->x, (int)ev->y, path, column, cellx, celly)) {
-               if ((iter = _model->get_iter (path))) {
-                       region = (*iter)[_columns.region];
-               }
-       }
-
-       if (region && Keyboard::is_delete_event (ev)) {
-               _session->remove_region_from_region_list (region);
-               return true;
-       }
-
-       return false;
-}
-
 int
 EditorRegions::sorter (TreeModel::iterator a, TreeModel::iterator b)
 {
@@ -1013,8 +1064,8 @@ EditorRegions::sorter (TreeModel::iterator a, TreeModel::iterator b)
        boost::shared_ptr<AudioRegion> region2 = boost::dynamic_pointer_cast<AudioRegion> (r2);
 
        if (region1 == 0 || region2 == 0) {
-               Glib::ustring s1;
-               Glib::ustring s2;
+               std::string s1;
+               std::string s2;
                switch (_sort_type) {
                case ByName:
                        s1 = (*a)[_columns.name];
@@ -1047,6 +1098,7 @@ EditorRegions::sorter (TreeModel::iterator a, TreeModel::iterator b)
                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;
 
@@ -1071,6 +1123,8 @@ EditorRegions::sorter (TreeModel::iterator a, TreeModel::iterator b)
                break;
        }
 
+       // cerr << "Comparison on " << enum_2_string (_sort_type) << " gives " << cmp << endl;
+
        if (cmp < 0) {
                return -1;
        } else if (cmp > 0) {
@@ -1085,7 +1139,7 @@ EditorRegions::reset_sort_type (RegionListSortType type, bool force)
 {
        if (type != _sort_type || force) {
                _sort_type = type;
-               _model->set_sort_func (0, (mem_fun (*this, &EditorRegions::sorter)));
+               _model->set_sort_func (0, (sigc::mem_fun (*this, &EditorRegions::sorter)));
        }
 }
 
@@ -1096,7 +1150,7 @@ EditorRegions::reset_sort_direction (bool up)
 }
 
 void
-EditorRegions::selection_mapover (slot<void,boost::shared_ptr<Region> > sl)
+EditorRegions::selection_mapover (sigc::slot<void,boost::shared_ptr<Region> > sl)
 {
        Glib::RefPtr<TreeSelection> selection = _display.get_selection();
        TreeView::Selection::ListHandle_Path rows = selection->get_selected_rows ();
@@ -1125,27 +1179,23 @@ EditorRegions::selection_mapover (slot<void,boost::shared_ptr<Region> > sl)
 }
 
 
-void
-EditorRegions::remove_region ()
-{
-       selection_mapover (mem_fun (*_editor, &Editor::remove_a_region));
-}
-
 void
 EditorRegions::drag_data_received (const RefPtr<Gdk::DragContext>& context,
                                   int x, int y,
                                   const SelectionData& data,
                                   guint info, guint time)
 {
-       vector<ustring> paths;
+       vector<string> paths;
 
        if (data.get_target() == "GTK_TREE_MODEL_ROW") {
+               /* something is being dragged over the region list */
+               _editor->_drags->abort ();
                _display.on_drag_data_received (context, x, y, data, info, time);
                return;
        }
 
        if (_editor->convert_drop_to_paths (paths, context, x, y, data, info, time) == 0) {
-               nframes64_t pos = 0;
+               framepos_t pos = 0;
                if (Profile->get_sae() || Config->get_only_copy_imported_files()) {
                        _editor->do_import (paths, Editing::ImportDistinctFiles, Editing::ImportAsRegion, SrcBest, pos);
                } else {
@@ -1156,10 +1206,15 @@ EditorRegions::drag_data_received (const RefPtr<Gdk::DragContext>& context,
 }
 
 bool
-EditorRegions::selection_filter (const RefPtr<TreeModel>& model, const TreeModel::Path& path, bool /*yn*/)
+EditorRegions::selection_filter (const RefPtr<TreeModel>& model, const TreeModel::Path& path, bool already_selected)
 {
        /* not possible to select rows that do not represent regions, like "Hidden" */
 
+       if (already_selected) {
+               /* deselecting anything is OK with us */
+               return true;
+       }
+
        TreeModel::iterator iter = model->get_iter (path);
 
        if (iter) {
@@ -1173,8 +1228,24 @@ EditorRegions::selection_filter (const RefPtr<TreeModel>& model, const TreeModel
 }
 
 void
-EditorRegions::name_edit (const Glib::ustring& path, const Glib::ustring& new_text)
+EditorRegions::name_editing_started (CellEditable* ce, const Glib::ustring&)
 {
+       name_editable = ce;
+
+       /* give it a special name */
+
+       Gtk::Entry *e = dynamic_cast<Gtk::Entry*> (ce);
+
+       if (e) {
+               e->set_name (X_("RegionNameEditorEntry"));
+       }
+}
+
+void
+EditorRegions::name_edit (const std::string& path, const std::string& new_text)
+{
+       name_editable = 0;
+
        boost::shared_ptr<Region> region;
        TreeIter iter;
 
@@ -1198,12 +1269,18 @@ EditorRegions::name_edit (const Glib::ustring& path, const Glib::ustring& new_te
 
 }
 
+/** @return Region that has been dragged out of the list, or 0 */
 boost::shared_ptr<Region>
 EditorRegions::get_dragged_region ()
 {
        list<boost::shared_ptr<Region> > regions;
        TreeView* source;
        _display.get_object_drag_data (regions, &source);
+
+       if (regions.empty()) {
+               return boost::shared_ptr<Region> ();
+       }
+
        assert (regions.size() == 1);
        return regions.front ();
 }
@@ -1214,6 +1291,10 @@ EditorRegions::clear ()
        _display.set_model (Glib::RefPtr<Gtk::TreeStore> (0));
        _model->clear ();
        _display.set_model (_model);
+
+       /* Clean up the maps */
+       region_row_map.clear();
+       parent_regions_sources_map.clear();
 }
 
 boost::shared_ptr<Region>
@@ -1237,3 +1318,248 @@ EditorRegions::get_single_selection ()
 
        return (*iter)[_columns.region];
 }
+
+void
+EditorRegions::freeze_tree_model (){
+
+       _display.set_model (Glib::RefPtr<Gtk::TreeStore>(0));
+       _model->set_sort_column (-2, SORT_ASCENDING); //Disable sorting to gain performance
+
+}
+
+void
+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
+EditorRegions::locked_changed (std::string const & path)
+{
+       TreeIter i = _model->get_iter (path);
+       if (i) {
+               boost::shared_ptr<ARDOUR::Region> region = (*i)[_columns.region];
+               if (region) {
+                       region->set_locked (!(*i)[_columns.locked]);
+               }
+       }
+}
+
+void
+EditorRegions::glued_changed (std::string const & path)
+{
+       TreeIter i = _model->get_iter (path);
+       if (i) {
+               boost::shared_ptr<ARDOUR::Region> region = (*i)[_columns.region];
+               if (region) {
+                       /* `glued' means MusicTime, and we're toggling here */
+                       region->set_position_lock_style ((*i)[_columns.glued] ? AudioTime : MusicTime);
+               }
+       }
+
+}
+
+void
+EditorRegions::muted_changed (std::string const & path)
+{
+       TreeIter i = _model->get_iter (path);
+       if (i) {
+               boost::shared_ptr<ARDOUR::Region> region = (*i)[_columns.region];
+               if (region) {
+                       region->set_muted (!(*i)[_columns.muted]);
+               }
+       }
+
+}
+
+void
+EditorRegions::opaque_changed (std::string const & path)
+{
+       TreeIter i = _model->get_iter (path);
+       if (i) {
+               boost::shared_ptr<ARDOUR::Region> region = (*i)[_columns.region];
+               if (region) {
+                       region->set_opaque (!(*i)[_columns.opaque]);
+               }
+       }
+
+}
+
+XMLNode &
+EditorRegions::get_state () const
+{
+       XMLNode* node = new XMLNode (X_("RegionList"));
+
+       node->add_property (X_("sort-type"), enum_2_string (_sort_type));
+
+       RefPtr<Action> act = ActionManager::get_action (X_("RegionList"), X_("SortAscending"));
+       bool const ascending = RefPtr<RadioAction>::cast_dynamic(act)->get_active ();
+       node->add_property (X_("sort-ascending"), ascending ? "yes" : "no");
+       node->add_property (X_("show-all"), toggle_full_action()->get_active() ? "yes" : "no");
+       node->add_property (X_("show-automatic-regions"), _show_automatic_regions ? "yes" : "no");
+
+       return *node;
+}
+
+void
+EditorRegions::set_state (const XMLNode & node)
+{
+       bool changed = false;
+
+       if (node.name() != X_("RegionList")) {
+               return;
+       }
+
+       XMLProperty const * p = node.property (X_("sort-type"));
+
+       if (p) {
+               Editing::RegionListSortType const t = static_cast<Editing::RegionListSortType> (string_2_enum (p->value(), _sort_type));
+
+               if (_sort_type != t) {
+                       changed = true;
+               }
+
+               reset_sort_type (t, true);
+               RefPtr<RadioAction> ract = sort_type_action (t);
+               ract->set_active ();
+       }
+
+       p = node.property (X_("sort-ascending"));
+
+       if (p) {
+               bool const yn = string_is_affirmative (p->value ());
+               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 ();
+       }
+
+       p = node.property (X_("show-all"));
+       if (p) {
+               bool const yn = string_is_affirmative (p->value ());
+
+               if (expanded != yn) {
+                       changed = true;
+               }
+
+               set_full (yn);
+               toggle_full_action()->set_active (yn);
+       }
+
+       p = node.property (X_("show-automatic-regions"));
+       if (p) {
+               bool const yn = string_is_affirmative (p->value ());
+
+               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;
+               /*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::delete_unused_regions_action () const
+{
+       return ActionManager::get_action (X_("RegionList"), X_("removeUnusedRegions"));
+}
+
+RefPtr<ToggleAction>
+EditorRegions::toggle_full_action () const
+{
+       Glib::RefPtr<Action> act = ActionManager::get_action (X_("RegionList"), X_("rlShowAll"));
+       assert (act);
+       return Glib::RefPtr<ToggleAction>::cast_dynamic (act);
+}
+
+RefPtr<ToggleAction>
+EditorRegions::toggle_show_auto_regions_action () const
+{
+       Glib::RefPtr<Action> act = ActionManager::get_action (X_("RegionList"), X_("rlShowAuto"));
+       assert (act);
+       return Glib::RefPtr<ToggleAction>::cast_dynamic (act);
+}