Prevent endless read of silent files

[ardour.git] / gtk2_ardour / editor_regions.cc

diff --git a/gtk2_ardour/editor_regions.cc b/gtk2_ardour/editor_regions.cc
index c74dc6b6e364bf61c1005c1fbd0af2de0d0e3b08..6526d4dec5c8015c3b0da39218c8f7366d47e9f2 100644 (file)
--- a/gtk2_ardour/editor_regions.cc
+++ b/gtk2_ardour/editor_regions.cc
@@ -187,8 +187,10 @@ EditorRegions::EditorRegions (Editor* e)
        _display.set_headers_visible (true);
        _display.set_rules_hint ();
 
-       /* show path as the row tooltip */
-       _display.set_tooltip_column (14); /* path */
+       if (UIConfiguration::instance().get_use_tooltips()) {
+               /* show path as the row tooltip */
+               _display.set_tooltip_column (14); /* path */
+       }
 
        CellRendererText* region_name_cell = dynamic_cast<CellRendererText*>(_display.get_column_cell_renderer (0));
        region_name_cell->property_editable() = true;
@@ -262,7 +264,7 @@ EditorRegions::EditorRegions (Editor* e)
        // _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()->primary_clock->mode_changed.connect (sigc::mem_fun(*this, &EditorRegions::update_all_rows));
        ARDOUR::Region::RegionPropertyChanged.connect (region_property_connection, MISSING_INVALIDATOR, boost::bind (&EditorRegions::region_changed, this, _1, _2), gui_context());
        ARDOUR::RegionFactory::CheckNewRegion.connect (check_new_region_connection, MISSING_INVALIDATOR, boost::bind (&EditorRegions::add_region, this, _1), gui_context());
 
@@ -345,6 +347,7 @@ EditorRegions::add_region (boost::shared_ptr<Region> region)
        TreeModel::Row row;
        Gdk::Color c;
        bool missing_source = boost::dynamic_pointer_cast<SilentFileSource>(region->source()) != NULL;
+       TreeModel::iterator iter;
 
        if (!_show_automatic_regions && region->automatic()) {
                return;
@@ -352,7 +355,7 @@ EditorRegions::add_region (boost::shared_ptr<Region> region)
 
        if (region->hidden()) {
 
-               TreeModel::iterator iter = _model->get_iter ("0");
+               iter = _model->get_iter ("0");
                TreeModel::Row parent;
 
                if (!iter) {
@@ -372,7 +375,8 @@ EditorRegions::add_region (boost::shared_ptr<Region> region)
                        }
                }
 
-               row = *(_model->append (parent.children()));
+               iter = _model->append (parent.children());
+               row = *iter;
 
        } else if (region->whole_file()) {
 
@@ -387,7 +391,8 @@ EditorRegions::add_region (boost::shared_ptr<Region> region)
                        }
                }
 
-               row = *(_model->append());
+               iter = _model->append();
+               row = *iter;
 
                if (missing_source) {
                        // c.set_rgb(65535,0,0);     // FIXME: error color from style
@@ -440,7 +445,7 @@ EditorRegions::add_region (boost::shared_ptr<Region> region)
                        }
                }
 
-               region_row_map.insert(pair<boost::shared_ptr<ARDOUR::Region>, Gtk::TreeModel::RowReference>(region, TreeRowReference(_model, TreePath (row))) );
+               region_row_map.insert(pair<boost::shared_ptr<ARDOUR::Region>, Gtk::TreeModel::iterator>(region, iter));
                parent_regions_sources_map.insert(pair<string, Gtk::TreeModel::RowReference>(region->source_string(), TreeRowReference(_model, TreePath (row))) );
 
                return;
@@ -449,7 +454,7 @@ EditorRegions::add_region (boost::shared_ptr<Region> region)
                // find parent node, add as new child
                TreeModel::iterator i;
 
-               boost::unordered_map<string, Gtk::TreeModel::RowReference>::iterator it;
+               RegionSourceMap::iterator it;
 
                it = parent_regions_sources_map.find (region->source_string());
 
@@ -471,18 +476,19 @@ EditorRegions::add_region (boost::shared_ptr<Region> region)
                        }
                        */
 
-                       row = *(_model->insert (subrows.end()));
+                       iter = _model->insert (subrows.end());
+                       row = *iter;
 
                } else {
-                       row = *(_model->append());
+                       iter = _model->append();
+                       row = *iter;
                }
 
                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))) );
+       region_row_map.insert (pair<boost::shared_ptr<ARDOUR::Region>,Gtk::TreeModel::iterator> (region,iter));
        PropertyChange pc;
        populate_row(region, (*row), pc);
 }
@@ -516,6 +522,15 @@ EditorRegions::remove_unused_regions ()
 void
 EditorRegions::region_changed (boost::shared_ptr<Region> r, const PropertyChange& what_changed)
 {
+       //maybe update the grid here
+       PropertyChange grid_interests;
+       grid_interests.add (ARDOUR::Properties::position);
+       grid_interests.add (ARDOUR::Properties::length);
+       grid_interests.add (ARDOUR::Properties::sync_position);
+       if (what_changed.contains (grid_interests)) {
+               _editor->mark_region_boundary_cache_dirty();
+       }
+
        PropertyChange our_interests;
 
        our_interests.add (ARDOUR::Properties::name);
@@ -555,7 +570,7 @@ EditorRegions::region_changed (boost::shared_ptr<Region> r, const PropertyChange
 
                if (it != region_row_map.end()){
 
-                       TreeModel::iterator j = _model->get_iter ((*it).second.get_path());
+                       TreeModel::iterator j = it->second;
                        boost::shared_ptr<Region> c = (*j)[_columns.region];
 
                        if (c == r) {
@@ -629,7 +644,7 @@ EditorRegions::set_selected (RegionSelection& regions)
                it = region_row_map.find (r);
 
                if (it != region_row_map.end()){
-                       TreeModel::iterator j = _model->get_iter ((*it).second.get_path());
+                       TreeModel::iterator j = it->second;
                        _display.get_selection()->select(*j);
                }
        }
@@ -653,7 +668,6 @@ EditorRegions::redisplay ()
        _model->clear ();
        _model->set_sort_column (-2, SORT_ASCENDING); //Disable sorting to gain performance
 
-
        region_row_map.clear();
        parent_regions_sources_map.clear();
 
@@ -699,7 +713,7 @@ EditorRegions::update_row (boost::shared_ptr<Region> region)
 
        if (it != region_row_map.end()){
                PropertyChange c;
-               TreeModel::iterator j = _model->get_iter ((*it).second.get_path());
+               TreeModel::iterator j = it->second;
                populate_row(region, (*j), c);
        }
 }
@@ -715,7 +729,7 @@ EditorRegions::update_all_rows ()
 
        for (i = region_row_map.begin(); i != region_row_map.end(); ++i) {
 
-               TreeModel::iterator j = _model->get_iter ((*i).second.get_path());
+               TreeModel::iterator j = i->second;
 
                boost::shared_ptr<Region> region = (*j)[_columns.region];
 
@@ -738,7 +752,7 @@ EditorRegions::format_position (samplepos_t pos, char* buf, size_t bufsize, bool
                return;
        }
 
-       switch (ARDOUR_UI::instance()->secondary_clock->mode ()) {
+       switch (ARDOUR_UI::instance()->primary_clock->mode ()) {
        case AudioClock::BBT:
                bbt = _session->tempo_map().bbt_at_sample (pos);
                if (onoff) {
@@ -767,6 +781,14 @@ EditorRegions::format_position (samplepos_t pos, char* buf, size_t bufsize, bool
                }
                break;
 
+       case AudioClock::Seconds:
+               if (onoff) {
+                       snprintf (buf, bufsize, "%.1f", pos / (float)_session->sample_rate());
+               } else {
+                       snprintf (buf, bufsize, "(%.1f)", pos / (float)_session->sample_rate());
+               }
+               break;
+
        case AudioClock::Samples:
                if (onoff) {
                        snprintf (buf, bufsize, "%" PRId64, pos);
@@ -881,7 +903,7 @@ EditorRegions::populate_row_length (boost::shared_ptr<Region> region, TreeModel:
 {
        char buf[16];
 
-       if (ARDOUR_UI::instance()->secondary_clock->mode () == AudioClock::BBT) {
+       if (ARDOUR_UI::instance()->primary_clock->mode () == AudioClock::BBT) {
                TempoMap& map (_session->tempo_map());
                Timecode::BBT_Time bbt = map.bbt_at_beat (map.beat_at_sample (region->last_sample()) - map.beat_at_sample (region->first_sample()));
                snprintf (buf, sizeof (buf), "%03d|%02d|%04d" , bbt.bars, bbt.beats, bbt.ticks);