fixes for 98% of all the warnings/errors reported by OS X gcc on tiger
[ardour.git] / gtk2_ardour / editor_regions.cc
index fdd5aaae8e541baeca815c3068b74183a23ae4a7..c6c8f1e9149874165e16117c8a16b300337bb4de 100644 (file)
 #include "ardour/silentfilesource.h"
 #include "ardour/profile.h"
 
+#include "gtkmm2ext/choice.h"
 #include "gtkmm2ext/treeutils.h"
 
+#include "audio_clock.h"
 #include "editor.h"
 #include "editing.h"
 #include "keyboard.h"
@@ -59,19 +61,20 @@ using Gtkmm2ext::Keyboard;
 
 EditorRegions::EditorRegions (Editor* e)
        : EditorComponent (e)
-        , old_focus (0)
-        , name_editable (0)
+       , old_focus (0)
+       , name_editable (0)
        , _menu (0)
        , _show_automatic_regions (true)
-       , _sort_type ((Editing::RegionListSortType) 0)
-       , _no_redisplay (false) 
        , ignore_region_list_selection_change (false)
        , ignore_selected_region_change (false)
-        , expanded (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()
        */
@@ -99,13 +102,13 @@ EditorRegions::EditorRegions (Editor* e)
        _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 */
+       /* 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 (sigc::mem_fun (*this, &EditorRegions::name_edit));
-        region_name_cell->signal_editing_started().connect (sigc::mem_fun (*this, &EditorRegions::name_editing_started));
+       region_name_cell->signal_editing_started().connect (sigc::mem_fun (*this, &EditorRegions::name_editing_started));
 
        _display.get_selection()->set_select_function (sigc::mem_fun (*this, &EditorRegions::selection_filter));
 
@@ -117,27 +120,31 @@ EditorRegions::EditorRegions (Editor* e)
        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");
 
@@ -159,72 +166,78 @@ EditorRegions::EditorRegions (Editor* e)
        _change_connection = _display.get_selection()->signal_changed().connect (sigc::mem_fun(*this, &EditorRegions::selection_changed));
 
        _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));
+       _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);
+       _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);
 
        // _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()->secondary_clock.mode_changed.connect (sigc::mem_fun(*this, &EditorRegions::update_all_rows));
+       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());
+
+       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());
 }
 
 bool
 EditorRegions::focus_in (GdkEventFocus*)
 {
-        Window* win = dynamic_cast<Window*> (_scroller.get_toplevel ());
+       Window* win = dynamic_cast<Window*> (_scroller.get_toplevel ());
 
-        if (win) {
-                old_focus = win->get_focus ();
-        } else {
-                old_focus = 0;
-        }
+       if (win) {
+               old_focus = win->get_focus ();
+       } else {
+               old_focus = 0;
+       }
 
-        name_editable = 0;
+       name_editable = 0;
 
-        /* try to do nothing on focus in (doesn't work, hence selection_count nonsense) */
-        return true;
+       /* try to do nothing on focus in (doesn't work, hence selection_count nonsense) */
+       return true;
 }
 
 bool
 EditorRegions::focus_out (GdkEventFocus*)
 {
-        if (old_focus) {
-                old_focus->grab_focus ();
-                old_focus = 0;
-        }
+       if (old_focus) {
+               old_focus->grab_focus ();
+               old_focus = 0;
+       }
 
-        name_editable = 0;
+       name_editable = 0;
 
-        return false;
+       return false;
 }
 
 bool
-EditorRegions::enter_notify (GdkEventCrossing* ev)
+EditorRegions::enter_notify (GdkEventCrossing*)
 {
-        /* 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;
+       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
 EditorRegions::leave_notify (GdkEventCrossing*)
 {
-        if (old_focus) {
-                old_focus->grab_focus ();
-                old_focus = 0;
-        }
-
-        name_editable = 0;
-        Keyboard::magic_widget_drop_focus ();
-        return false;
+       if (old_focus) {
+               old_focus->grab_focus ();
+               old_focus = 0;
+       }
+
+       Keyboard::magic_widget_drop_focus ();
+       return false;
 }
 
 void
@@ -234,14 +247,6 @@ EditorRegions::set_session (ARDOUR::Session* s)
        redisplay ();
 }
 
-void
-EditorRegions::add_regions (vector<boost::shared_ptr<Region> >& regions)
-{
-       for (vector<boost::shared_ptr<Region> >::iterator x = regions.begin(); x != regions.end(); ++x) {
-                add_region (*x);
-       }
-}
-
 void
 EditorRegions::add_region (boost::shared_ptr<Region> region)
 {
@@ -259,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;
@@ -269,7 +275,7 @@ EditorRegions::add_region (boost::shared_ptr<Region> region)
                        boost::shared_ptr<Region> proxy = parent[_columns.region];
                        proxy.reset ();
                } else {
-                        string s = (*iter)[_columns.name];
+                       string s = (*iter)[_columns.name];
                        if (s != _("Hidden")) {
                                parent = *(_model->insert(iter));
                                parent[_columns.name] = _("Hidden");
@@ -279,6 +285,7 @@ EditorRegions::add_region (boost::shared_ptr<Region> region)
                                parent = *iter;
                        }
                }
+
                row = *(_model->append (parent.children()));
 
        } else if (region->whole_file()) {
@@ -343,42 +350,39 @@ EditorRegions::add_region (boost::shared_ptr<Region> region)
                row[_columns.property_toggles_visible] = false;
 
                if (missing_source) {
-                        row[_columns.path] = _("(MISSING) ") + region->source()->name();
+                       row[_columns.path] = _("(MISSING) ") + region->source()->name();
 
                } else {
-                        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();
-                        }
+                       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();
+                       }
                }
 
-               if (region->automatic()) {
-                       return;
-               }
+               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))) );
+
+               return;
 
        } else {
+               // find parent node, add as new child
+               TreeModel::iterator i;
 
-               /* find parent node, add as new child */
+               boost::unordered_map<string, Gtk::TreeModel::RowReference>::iterator it;
 
-               TreeModel::iterator i;
-               TreeModel::Children rows = _model->children();
-               bool found_parent = false;
+               it = parent_regions_sources_map.find (region->source_string());
 
-               for (i = rows.begin(); i != rows.end(); ++i) {
-                       boost::shared_ptr<Region> r = (*i)[_columns.region];
+               if (it != parent_regions_sources_map.end()){
 
-                       if (r && r->whole_file()) {
+                       TreeModel::iterator j = _model->get_iter ((*it).second.get_path());
 
-                               if (region->source_equivalent (r)) {
-                                       found_parent = true;
-                               }
-                       }
-                        
                        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> rr = (*ii)[_columns.region];
 
@@ -386,14 +390,11 @@ EditorRegions::add_region (boost::shared_ptr<Region> region)
                                        return;
                                }
                        }
+                       */
 
-                        if (found_parent) {
-                                row = *(_model->append ((*i).children()));
-                                break;
-                        }
-               }
-
-               if (!found_parent) {
+                       row = *(_model->insert (subrows.end()));
+                       
+               } else {
                        row = *(_model->append());
                }
 
@@ -402,106 +403,89 @@ EditorRegions::add_region (boost::shared_ptr<Region> region)
 
        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::delete_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."));
+
+       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 (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 ();
+       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 ();
+                               }
+
+                               return;
                        }
-                       
-                       return;
                }
-       }
 
+               RegionRowMap::iterator it;
 
-        if (what_changed.contains (our_interests)) {
+               it = region_row_map.find (r);
 
-               /* find the region in our model and update its row */
-               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) {
-                                       last_row = TreeRowReference(_model, TreePath(j));
-                                       break;
+               if (it != region_row_map.end()){
+
+                       TreeModel::iterator j = _model->get_iter ((*it).second.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()) {
-
-                                boost::shared_ptr<AudioRegion> audioregion = boost::dynamic_pointer_cast<AudioRegion>(r);
-                                uint32_t used = _editor->get_regionview_count_from_region_list (r);
-
-                                if (what_changed.contains (ARDOUR::Properties::name)) {
-                                        populate_row_name (r, *j);
-                                }
-                                if (what_changed.contains (ARDOUR::Properties::position)) {
-                                        populate_row_position (r, *j, used);
-                                        populate_row_end (r, *j, used);
-                                }
-                                if (what_changed.contains (ARDOUR::Properties::length)) {
-                                        populate_row_end (r, *j, used);
-                                        populate_row_length (r, *j);
-                                }
-                                if (what_changed.contains (ARDOUR::Properties::start)) {
-                                        populate_row_length (r, *j);
-                                }
-                                if (what_changed.contains (ARDOUR::Properties::locked)) {
-                                        populate_row_locked (r, *j, used);
-                                }
-                                if (what_changed.contains (ARDOUR::Properties::position_lock_style)) {
-                                        populate_row_glued (r, *j, used);
-                                }
-                                if (what_changed.contains (ARDOUR::Properties::muted)) {
-                                        populate_row_muted (r, *j, used);
-                                }
-                                if (what_changed.contains (ARDOUR::Properties::opaque)) {
-                                        populate_row_opaque (r, *j, used);
-                                }
-                                if (what_changed.contains (ARDOUR::Properties::fade_in)) {
-                                        populate_row_fade_in (r, *j, used, audioregion);
-                                }
-                                if (what_changed.contains (ARDOUR::Properties::fade_out)) {
-                                        populate_row_fade_out (r, *j, used, audioregion);
-                                }
-
-                                break;
+                               return;
                        }
-
-                       ++i;
                }
        }
 
@@ -528,15 +512,15 @@ EditorRegions::selection_changed ()
 
                for (TreeView::Selection::ListHandle_Path::iterator i = rows.begin(); i != rows.end(); ++i) {
 
-                       if (iter = _model->get_iter (*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.
+                               // 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);
@@ -560,69 +544,21 @@ EditorRegions::selection_changed ()
 void
 EditorRegions::set_selected (RegionSelection& regions)
 {
-       TreeModel::Children rows = _model->children();
+       for (RegionSelection::iterator i = regions.begin(); i != regions.end(); ++i) {
 
-       for (RegionSelection::iterator iter = regions.begin(); iter != regions.end(); ++iter) {
+               boost::shared_ptr<Region> r ((*i)->region());
 
-               TreeModel::iterator i;
-               
-               boost::shared_ptr<Region> r ((*iter)->region());
-
-               for (i = rows.begin(); i != rows.end(); ++i) {
+               RegionRowMap::iterator it;
 
-                       boost::shared_ptr<Region> compared_region = (*i)[_columns.region];
+               it = region_row_map.find (r);
 
-                       if (r == compared_region) {
-                               _display.get_selection()->select(*i);
-                               break;
-                       }
-
-                       if (!(*i).children().empty()) {
-                               if (set_selected_in_subrow(r, (*i), 2)) {
-                                       break;
-                               }
-                       }
+               if (it != region_row_map.end()){
+                       TreeModel::iterator j = _model->get_iter ((*it).second.get_path());
+                       _display.get_selection()->select(*j);
                }
        }
 }
 
-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 (i = subrows.begin(); i != subrows.end(); ++i) {
-
-               boost::shared_ptr<Region> compared_region = (*i)[_columns.region];
-
-               if (region == compared_region) {
-                       _display.get_selection()->select(*i);
-                       return true;
-               }
-
-               if (!(*i).children().empty()) {
-                       if (set_selected_in_subrow (region, (*i), level + 1)) {
-                               return true;
-                       }
-               }
-       }
-       
-       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
 EditorRegions::redisplay ()
 {
@@ -639,23 +575,36 @@ EditorRegions::redisplay ()
 
        _display.set_model (Glib::RefPtr<Gtk::TreeStore>(0));
        _model->clear ();
+       _model->set_sort_column (-2, SORT_ASCENDING); //Disable sorting to gain performance
+
+
+       region_row_map.clear();
+       parent_regions_sources_map.clear();
 
        /* now add everything we have, via a temporary list used to help with sorting */
 
-       tmp_region_list.clear();
+       const RegionFactory::RegionMap& regions (RegionFactory::regions());
+
+       for (RegionFactory::RegionMap::const_iterator i = regions.begin(); i != regions.end(); ++i) {
 
-        const RegionFactory::RegionMap& regions (RegionFactory::regions());
-        for (RegionFactory::RegionMap::const_iterator i = regions.begin(); i != regions.end(); ++i) {
-                insert_into_tmp_regionlist (i->second);
-        }
+               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();
        }
@@ -668,59 +617,15 @@ EditorRegions::update_row (boost::shared_ptr<Region> region)
                return;
        }
 
-       TreeModel::iterator i;
-       TreeModel::Children rows = _model->children();
-       
-       return;
-
-       for (i = rows.begin(); i != rows.end(); ++i) {
-
-//             cerr << "Level 1: Compare " << region->name() << " with parent " << (*i)[_columns.name] << "\n";
-
-               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;
-                       }
-               }
-       }
-
-//     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();
+       RegionRowMap::iterator it;
 
-       for (i = subrows.begin(); i != subrows.end(); ++i) {
+       it = region_row_map.find (region);
 
-//             cerr << "Level " << level << ": Compare " << region->name() << " with child " << (*i)[_columns.name] << "\n";
+       if (it != region_row_map.end()){
 
-               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;
-                       }
-               }
+               TreeModel::iterator j = _model->get_iter ((*it).second.get_path());
+               populate_row(region, (*j));
        }
-
-       return false;
 }
 
 void
@@ -729,40 +634,17 @@ EditorRegions::update_all_rows ()
        if (!_session) {
                return;
        }
-       
-       TreeModel::iterator i;
-       TreeModel::Children rows = _model->children();
 
-       for (i = rows.begin(); i != rows.end(); ++i) {
+       RegionRowMap::iterator i;
 
-               boost::shared_ptr<Region> region = (*i)[_columns.region];
+       for (i = region_row_map.begin(); i != region_row_map.end(); ++i) {
 
-               if (!region->automatic()) {
-                       populate_row(region, (*i));
-               }
+               TreeModel::iterator j = _model->get_iter ((*i).second.get_path());
 
-               if (!(*i).children().empty()) {
-                       update_all_subrows ((*i), 2);
-               }
-       }
-}
-
-void
-EditorRegions::update_all_subrows (TreeModel::Row const &parent_row, int level)
-{
-       TreeModel::iterator i;
-       TreeModel::Children subrows = (*parent_row).children();
-
-       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()) {
-                       populate_row(region, (*i));
-               }
-
-               if (!(*i).children().empty()) {
-                       update_all_subrows ((*i), level + 1);
+                       populate_row(region, (*j));
                }
        }
 }
@@ -770,10 +652,10 @@ EditorRegions::update_all_subrows (TreeModel::Row const &parent_row, int level)
 void
 EditorRegions::format_position (framepos_t pos, char* buf, size_t bufsize)
 {
-       BBT_Time bbt;
+       Timecode::BBT_Time bbt;
        Timecode::Time timecode;
 
-       switch (ARDOUR_UI::instance()->secondary_clock.mode ()) {
+       switch (ARDOUR_UI::instance()->secondary_clock->mode ()) {
        case AudioClock::BBT:
                _session->tempo_map().bbt_time (pos, bbt);
                snprintf (buf, bufsize, "%03d|%02d|%04d" , bbt.bars, bbt.beats, bbt.ticks);
@@ -787,9 +669,9 @@ EditorRegions::format_position (framepos_t pos, char* buf, size_t bufsize)
 
                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();
                snprintf (buf, bufsize, "%02d:%02d:%06.3f", hrs, mins, secs);
                break;
@@ -799,7 +681,6 @@ EditorRegions::format_position (framepos_t pos, char* buf, size_t bufsize)
                break;
 
        case AudioClock::Timecode:
-       case AudioClock::Off: /* If the secondary clock is off, default to Timecode */
        default:
                _session->timecode_time (pos, timecode);
                snprintf (buf, bufsize, "%02d:%02d:%02d:%02d", timecode.hours, timecode.minutes, timecode.seconds, timecode.frames);
@@ -811,33 +692,35 @@ 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);
-
-        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);
+       //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()) {
@@ -848,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()) {
@@ -860,9 +743,9 @@ EditorRegions::populate_row (boost::shared_ptr<Region> region, TreeModel::Row co
 #endif
 
 void
-EditorRegions::populate_row_used (boost::shared_ptr<Region> region, TreeModel::Row const& row, uint32_t used)
+EditorRegions::populate_row_used (boost::shared_ptr<Region>, TreeModel::Row const& row, uint32_t used)
 {
-        char buf[8];
+       char buf[8];
        snprintf (buf, sizeof (buf), "%4d" , used);
        row[_columns.used] = buf;
 }
@@ -870,147 +753,147 @@ EditorRegions::populate_row_used (boost::shared_ptr<Region> region, TreeModel::R
 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;
+       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 {
-                char buf[16];
-                format_position (region->last_frame(), buf, sizeof (buf));
-                row[_columns.end] = buf;
-        }
+       if (region->whole_file()) {
+               row[_columns.end] = "";
+       } else if (used > 1) {
+               row[_columns.end] = _("Mult.");
+       } else {
+               char buf[16];
+               format_position (region->last_frame(), buf, sizeof (buf));
+               row[_columns.end] = buf;
+       }
 }
 
 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;
-        }
+       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->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->last_frame())) {
                        row[_columns.sync] = _("End");
                } else {
-                        char buf[16];
-                        format_position (region->sync_position(), buf, sizeof (buf));
+                       char buf[16];
+                       format_position (region->sync_position(), buf, sizeof (buf));
                        row[_columns.sync] = buf;
                }
-        }
+       }
 }
 
 void
 EditorRegions::populate_row_fade_in (boost::shared_ptr<Region> region, TreeModel::Row const &row, uint32_t used, boost::shared_ptr<AudioRegion> audioregion)
 {
-        if (!audioregion || region->whole_file()) {
-                       row[_columns.fadein] = "";
-        } else {
-                if (used > 1) {
-                        row[_columns.fadein] = _("Multiple");
-                } else {
-
-                        char buf[16];
-                        format_position (audioregion->fade_in()->back()->when, buf, sizeof (buf));
-                        row[_columns.fadein] = buf;
-                        
+       if (!audioregion || region->whole_file()) {
+               row[_columns.fadein] = "";
+       } else {
+               if (used > 1) {
+                       row[_columns.fadein] = _("Multiple");
+               } else {
+
+                       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", "(", buf, ")");
                        }
-                }
-        }
+               }
+       }
 }
 
 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->fade_out_active()) {
-                                row[_columns.fadeout] = string_compose("%1%2%3", " ", buf, " ");
-                        } else {
-                                row[_columns.fadeout] = string_compose("%1%2%3", "(", buf, ")");
-                        }
-                } 
-        }
+       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->fade_out_active()) {
+                               row[_columns.fadeout] = string_compose("%1%2%3", " ", buf, " ");
+                       } else {
+                               row[_columns.fadeout] = string_compose("%1%2%3", "(", buf, ")");
+                       }
+               }
+       }
 }
-        
+
 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 {
+       if (region->whole_file()) {
+               row[_columns.locked] = false;
+       } else if (used > 1) {
+               row[_columns.locked] = false;
+       } else {
                row[_columns.locked] = region->locked();
-        }
+       }
 }
 
 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->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 {
+       if (region->whole_file() || used > 1) {
+               row[_columns.muted] = false;
+       } else {
                row[_columns.muted] = region->muted();
-        }
+       }
 }
 
 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 {
+       if (region->whole_file() || used > 1) {
+               row[_columns.opaque] = false;
+       } else {
                row[_columns.opaque] = region->opaque();
-        }
+       }
 }
 
 void
@@ -1021,7 +904,7 @@ EditorRegions::populate_row_name (boost::shared_ptr<Region> region, TreeModel::R
        } else {
                row[_columns.name] = region->name();
        }
-}        
+}
 
 void
 EditorRegions::populate_row_source (boost::shared_ptr<Region> region, TreeModel::Row const &row)
@@ -1075,7 +958,7 @@ EditorRegions::show_context_menu (int button, int time)
 
        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);
@@ -1098,31 +981,31 @@ EditorRegions::show_context_menu (int button, int time)
 bool
 EditorRegions::key_press (GdkEventKey* ev)
 {
-        TreeViewColumn *col;
+       TreeViewColumn *col;
 
-        switch (ev->keyval) {
-        case GDK_Tab:
-        case GDK_ISO_Left_Tab:
-                
-                if (name_editable) {
-                        name_editable->editing_done ();
-                        name_editable = 0;
-                }
+       switch (ev->keyval) {
+       case GDK_Tab:
+       case GDK_ISO_Left_Tab:
 
-                col = _display.get_column (0); // select&focus on name column
+               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);
-                }
+               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;
+               return true;
+               break;
 
-        default:
-                break;
-        }
+       default:
+               break;
+       }
 
        return false;
 }
@@ -1327,10 +1210,10 @@ EditorRegions::selection_filter (const RefPtr<TreeModel>& model, const TreeModel
 {
        /* not possible to select rows that do not represent regions, like "Hidden" */
 
-        if (already_selected) {
-                /* deselecting anything is OK with us */
-                return true;
-        }
+       if (already_selected) {
+               /* deselecting anything is OK with us */
+               return true;
+       }
 
        TreeModel::iterator iter = model->get_iter (path);
 
@@ -1347,13 +1230,21 @@ EditorRegions::selection_filter (const RefPtr<TreeModel>& model, const TreeModel
 void
 EditorRegions::name_editing_started (CellEditable* ce, const Glib::ustring&)
 {
-        name_editable = ce;
+       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;
+       name_editable = 0;
 
        boost::shared_ptr<Region> region;
        TreeIter iter;
@@ -1389,7 +1280,7 @@ EditorRegions::get_dragged_region ()
        if (regions.empty()) {
                return boost::shared_ptr<Region> ();
        }
-       
+
        assert (regions.size() == 1);
        return regions.front ();
 }
@@ -1400,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>
@@ -1424,6 +1319,25 @@ 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)
 {
@@ -1491,39 +1405,46 @@ EditorRegions::get_state () const
 
        return *node;
 }
-               
+
 void
 EditorRegions::set_state (const XMLNode & node)
 {
-        bool changed = false;
+       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;
-                }
+
+               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;
+               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;
+               }
 
-                _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 {
@@ -1536,9 +1457,11 @@ EditorRegions::set_state (const XMLNode & node)
        p = node.property (X_("show-all"));
        if (p) {
                bool const yn = string_is_affirmative (p->value ());
-                if (expanded != yn) {
-                        changed = true;
-                }
+
+               if (expanded != yn) {
+                       changed = true;
+               }
+
                set_full (yn);
                toggle_full_action()->set_active (yn);
        }
@@ -1546,18 +1469,17 @@ EditorRegions::set_state (const XMLNode & node)
        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);
-                        /* no need to set changed because the above toggle 
-                           will have triggered a redisplay 
-                        */
-                }
-        }
-        
-        if (changed) {
-                redisplay ();
-        }
+
+               if (yn != _show_automatic_regions) {
+                       _show_automatic_regions = yn;
+                       toggle_show_auto_regions_action()->set_active (yn);
+                       changed = true;
+               }
+       }
+
+       if (changed) {
+               redisplay ();
+       }
 }
 
 RefPtr<RadioAction>
@@ -1611,7 +1533,7 @@ RefPtr<Action>
 EditorRegions::hide_action () const
 {
        return ActionManager::get_action (X_("RegionList"), X_("rlHide"));
-       
+
 }
 
 RefPtr<Action>
@@ -1620,6 +1542,12 @@ 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
 {