X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_regions.cc;h=b7c86ce8b0bcf5fb563d5a5384a20b22295a78ba;hb=cc83e1a9bfd7339c4ebfcde4a57d511eec51923e;hp=4647104753abb246ff061deda9f51e1e5ff3910a;hpb=4b861e603972148a29638cade51cee27ebc997a2;p=ardour.git diff --git a/gtk2_ardour/editor_regions.cc b/gtk2_ardour/editor_regions.cc index 4647104753..b7c86ce8b0 100644 --- a/gtk2_ardour/editor_regions.cc +++ b/gtk2_ardour/editor_regions.cc @@ -28,16 +28,21 @@ #include "ardour/audioregion.h" #include "ardour/audiofilesource.h" +#include "ardour/silentfilesource.h" #include "ardour/region_factory.h" #include "ardour/session.h" -#include "ardour/session_playlists.h" -#include "ardour/silentfilesource.h" #include "ardour/profile.h" #include "gtkmm2ext/treeutils.h" +#include "gtkmm2ext/utils.h" +#include "widgets/choice.h" +#include "widgets/tooltips.h" + +#include "audio_clock.h" #include "editor.h" #include "editing.h" +#include "editing_convert.h" #include "keyboard.h" #include "ardour_ui.h" #include "gui_thread.h" @@ -46,32 +51,44 @@ #include "utils.h" #include "editor_regions.h" #include "editor_drag.h" +#include "main_clock.h" +#include "ui_config.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace ARDOUR; +using namespace ArdourWidgets; +using namespace ARDOUR_UI_UTILS; using namespace PBD; using namespace Gtk; using namespace Glib; using namespace Editing; using Gtkmm2ext::Keyboard; +struct ColumnInfo { + int index; + const char* label; + const char* tooltip; +}; + EditorRegions::EditorRegions (Editor* e) : EditorComponent (e) , 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) + , _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); + _display.set_name ("EditGroupList"); + _display.set_fixed_height_mode (true); + /* Try to prevent single mouse presses from initiating edits. This relies on a hack in gtktreeview.c:gtk_treeview_button_press() */ @@ -81,26 +98,97 @@ EditorRegions::EditorRegions (Editor* e) _model->set_sort_func (0, sigc::mem_fun (*this, &EditorRegions::sorter)); _model->set_sort_column (0, SORT_ASCENDING); + /* column widths */ + int bbt_width, check_width, height; + + Glib::RefPtr layout = _display.create_pango_layout (X_("000|000|000")); + Gtkmm2ext::get_pixel_size (layout, bbt_width, height); + + check_width = 20; + + TreeViewColumn* col_name = manage (new TreeViewColumn ("", _columns.name)); + col_name->set_fixed_width (120); + col_name->set_sizing (TREE_VIEW_COLUMN_FIXED); + TreeViewColumn* col_position = manage (new TreeViewColumn ("", _columns.position)); + col_position->set_fixed_width (bbt_width); + col_position->set_sizing (TREE_VIEW_COLUMN_FIXED); + TreeViewColumn* col_end = manage (new TreeViewColumn ("", _columns.end)); + col_end->set_fixed_width (bbt_width); + col_end->set_sizing (TREE_VIEW_COLUMN_FIXED); + TreeViewColumn* col_length = manage (new TreeViewColumn ("", _columns.length)); + col_length->set_fixed_width (bbt_width); + col_length->set_sizing (TREE_VIEW_COLUMN_FIXED); + TreeViewColumn* col_sync = manage (new TreeViewColumn ("", _columns.sync)); + col_sync->set_fixed_width (bbt_width); + col_sync->set_sizing (TREE_VIEW_COLUMN_FIXED); + TreeViewColumn* col_fadein = manage (new TreeViewColumn ("", _columns.fadein)); + col_fadein->set_fixed_width (bbt_width); + col_fadein->set_sizing (TREE_VIEW_COLUMN_FIXED); + TreeViewColumn* col_fadeout = manage (new TreeViewColumn ("", _columns.fadeout)); + col_fadeout->set_fixed_width (bbt_width); + col_fadeout->set_sizing (TREE_VIEW_COLUMN_FIXED); + TreeViewColumn* col_locked = manage (new TreeViewColumn ("", _columns.locked)); + col_locked->set_fixed_width (check_width); + col_locked->set_sizing (TREE_VIEW_COLUMN_FIXED); + TreeViewColumn* col_glued = manage (new TreeViewColumn ("", _columns.glued)); + col_glued->set_fixed_width (check_width); + col_glued->set_sizing (TREE_VIEW_COLUMN_FIXED); + TreeViewColumn* col_muted = manage (new TreeViewColumn ("", _columns.muted)); + col_muted->set_fixed_width (check_width); + col_muted->set_sizing (TREE_VIEW_COLUMN_FIXED); + TreeViewColumn* col_opaque = manage (new TreeViewColumn ("", _columns.opaque)); + col_opaque->set_fixed_width (check_width); + col_opaque->set_sizing (TREE_VIEW_COLUMN_FIXED); + + _display.append_column (*col_name); + _display.append_column (*col_position); + _display.append_column (*col_end); + _display.append_column (*col_length); + _display.append_column (*col_sync); + _display.append_column (*col_fadein); + _display.append_column (*col_fadeout); + _display.append_column (*col_locked); + _display.append_column (*col_glued); + _display.append_column (*col_muted); + _display.append_column (*col_opaque); + + TreeViewColumn* col; + Gtk::Label* l; + + ColumnInfo ci[] = { + { 0, _("Region"), _("Region name, with number of channels in []'s") }, + { 1, _("Position"), _("Position of start of region") }, + { 2, _("End"), _("Position of end of region") }, + { 3, _("Length"), _("Length of the region") }, + { 4, _("Sync"), _("Position of region sync point, relative to start of the region") }, + { 5, _("Fade In"), _("Length of region fade-in (units: secondary clock), () if disabled") }, + { 6, _("Fade Out"), _("Length of region fade-out (units: secondary clock), () if disabled") }, + { 7, S_("Lock|L"), _("Region position locked?") }, + { 8, S_("Gain|G"), _("Region position glued to Bars|Beats time?") }, + { 9, S_("Mute|M"), _("Region muted?") }, + { 10, S_("Opaque|O"), _("Region opaque (blocks regions below it from being heard)?") }, + { -1, 0, 0 } + }; + + for (int i = 0; ci[i].index >= 0; ++i) { + col = _display.get_column (ci[i].index); + l = manage (new Label (ci[i].label)); + set_tooltip (*l, ci[i].tooltip); + col->set_widget (*l); + l->show (); + + if (ci[i].index > 6) { + col->set_expand (false); + col->set_alignment (ALIGN_CENTER); + } + } _display.set_model (_model); - _display.append_column (_("Regions"), _columns.name); - _display.append_column (_("Position"), _columns.position); - _display.append_column (_("End"), _columns.end); - _display.append_column (_("Length"), _columns.length); - _display.append_column (_("Sync"), _columns.sync); - _display.append_column (_("Fade In"), _columns.fadein); - _display.append_column (_("Fade Out"), _columns.fadeout); - _display.append_column (_("L"), _columns.locked); - _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.set_headers_visible (true); - //_display.set_grid_lines (TREE_VIEW_GRID_LINES_BOTH); + _display.set_rules_hint (); /* show path as the row tooltip */ - _display.set_tooltip_column (15); /* path */ + _display.set_tooltip_column (14); /* path */ CellRendererText* region_name_cell = dynamic_cast(_display.get_column_cell_renderer (0)); region_name_cell->property_editable() = true; @@ -113,33 +201,39 @@ EditorRegions::EditorRegions (Editor* e) CellRendererText* renderer = dynamic_cast(_display.get_column_cell_renderer (0)); tv_col->add_attribute(renderer->property_text(), _columns.name); tv_col->add_attribute(renderer->property_foreground_gdk(), _columns.color_); + tv_col->set_expand (true); CellRendererToggle* locked_cell = dynamic_cast (_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 (_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 (_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 (_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"); + _display.set_drag_column (_columns.name.index()); /* setup DnD handling */ @@ -168,9 +262,12 @@ 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::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()); + ARDOUR_UI::instance()->primary_clock->mode_changed.connect (sigc::mem_fun(*this, &EditorRegions::update_all_rows)); + ARDOUR::Region::RegionPropertyChanged.connect (region_property_connection, MISSING_INVALIDATOR, boost::bind (&EditorRegions::region_changed, this, _1, _2), gui_context()); + ARDOUR::RegionFactory::CheckNewRegion.connect (check_new_region_connection, MISSING_INVALIDATOR, boost::bind (&EditorRegions::add_region, this, _1), gui_context()); + + e->EditorFreeze.connect (editor_freeze_connection, MISSING_INVALIDATOR, boost::bind (&EditorRegions::freeze_tree_model, this), gui_context()); + e->EditorThaw.connect (editor_thaw_connection, MISSING_INVALIDATOR, boost::bind (&EditorRegions::thaw_tree_model, this), gui_context()); } bool @@ -204,9 +301,13 @@ EditorRegions::focus_out (GdkEventFocus*) } bool -EditorRegions::enter_notify (GdkEventCrossing* ev) +EditorRegions::enter_notify (GdkEventCrossing*) { - /* arm counter so that ::selection_filter() will deny selecting anything for the + 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 (); @@ -222,7 +323,6 @@ EditorRegions::leave_notify (GdkEventCrossing*) old_focus = 0; } - name_editable = 0; Keyboard::magic_widget_drop_focus (); return false; } @@ -234,14 +334,6 @@ EditorRegions::set_session (ARDOUR::Session* s) redisplay (); } -void -EditorRegions::add_regions (vector >& regions) -{ - for (vector >::iterator x = regions.begin(); x != regions.end(); ++x) { - add_region (*x); - } -} - void EditorRegions::add_region (boost::shared_ptr region) { @@ -252,16 +344,17 @@ EditorRegions::add_region (boost::shared_ptr region) string str; TreeModel::Row row; Gdk::Color c; - bool missing_source = boost::dynamic_pointer_cast(region->source()); + bool missing_source = boost::dynamic_pointer_cast(region->source()) != NULL; + TreeModel::iterator iter; if (!_show_automatic_regions && region->automatic()) { return; } if (region->hidden()) { - TreeModel::iterator iter = _model->get_iter ("0"); + + iter = _model->get_iter ("0"); TreeModel::Row parent; - TreeModel::Row child; if (!iter) { parent = *(_model->append()); @@ -279,7 +372,9 @@ EditorRegions::add_region (boost::shared_ptr region) parent = *iter; } } - row = *(_model->append (parent.children())); + + iter = _model->append (parent.children()); + row = *iter; } else if (region->whole_file()) { @@ -294,17 +389,19 @@ EditorRegions::add_region (boost::shared_ptr region) } } - row = *(_model->append()); + iter = _model->append(); + row = *iter; if (missing_source) { - c.set_rgb(65535,0,0); // FIXME: error color from style + // c.set_rgb(65535,0,0); // FIXME: error color from style + set_color_from_rgba (c, UIConfiguration::instance().color ("region list missing source")); } else if (region->automatic()){ - c.set_rgb(0,65535,0); // FIXME: error color from style + // c.set_rgb(0,65535,0); // FIXME: error color from style + set_color_from_rgba (c, UIConfiguration::instance().color ("region list automatic")); } else { - set_color(c, rgba_from_style ("RegionListWholeFile", 0xff, 0, 0, 0, "fg", Gtk::STATE_NORMAL, false )); - + set_color_from_rgba (c, UIConfiguration::instance().color ("region list whole file")); } row[_columns.color_] = c; @@ -330,55 +427,44 @@ EditorRegions::add_region (boost::shared_ptr region) str = region->name(); } - if (region->n_channels() > 1) { - std::stringstream foo; - foo << region->n_channels (); - str += " ["; - str += foo.str(); - str += "]"; - } - - row[_columns.name] = str; + populate_row_name (region, row); row[_columns.region] = region; row[_columns.property_toggles_visible] = false; if (missing_source) { - row[_columns.path] = _("(MISSING) ") + region->source()->name(); + row[_columns.path] = _("(MISSING) ") + Gtkmm2ext::markup_escape_text (region->source()->name()); } else { boost::shared_ptr fs = boost::dynamic_pointer_cast(region->source()); if (fs) { - row[_columns.path] = fs->path(); + row[_columns.path] = Gtkmm2ext::markup_escape_text (fs->path()); } else { - row[_columns.path] = region->source()->name(); + row[_columns.path] = Gtkmm2ext::markup_escape_text (region->source()->name()); } } - if (region->automatic()) { - return; - } + region_row_map.insert(pair, Gtk::TreeModel::iterator>(region, iter)); + parent_regions_sources_map.insert(pair(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 */ + RegionSourceMap::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 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 rr = (*ii)[_columns.region]; @@ -386,135 +472,114 @@ EditorRegions::add_region (boost::shared_ptr region) return; } } + */ - if (found_parent) { - row = *(_model->append ((*i).children())); - break; - } - } + iter = _model->insert (subrows.end()); + row = *iter; - if (!found_parent) { - row = *(_model->append()); + } else { + iter = _model->append(); + row = *iter; } row[_columns.property_toggles_visible] = true; } row[_columns.region] = region; + region_row_map.insert (pair,Gtk::TreeModel::iterator> (region,iter)); + PropertyChange pc; + populate_row(region, (*row), pc); +} + +void +EditorRegions::remove_unused_regions () +{ + vector choices; + string prompt; - populate_row(region, (*row)); + if (!_session) { + return; + } + + prompt = _("Do you really want to remove unused regions?" + "\n(This is destructive and cannot be undone)"); + + choices.push_back (_("No, do nothing.")); + choices.push_back (_("Yes, remove.")); + + ArdourWidgets::Choice prompter (_("Remove unused regions"), prompt, choices); + + if (prompter.run () == 1) { + _no_redisplay = true; + _session->cleanup_regions (); + _no_redisplay = false; + redisplay (); + } } void EditorRegions::region_changed (boost::shared_ptr r, const PropertyChange& what_changed) { + //maybe update the grid here + PropertyChange grid_interests; + grid_interests.add (ARDOUR::Properties::position); + grid_interests.add (ARDOUR::Properties::length); + grid_interests.add (ARDOUR::Properties::sync_position); + if (what_changed.contains (grid_interests)) { + _editor->mark_region_boundary_cache_dirty(); + } + PropertyChange our_interests; our_interests.add (ARDOUR::Properties::name); our_interests.add (ARDOUR::Properties::position); our_interests.add (ARDOUR::Properties::length); our_interests.add (ARDOUR::Properties::start); + our_interests.add (ARDOUR::Properties::sync_position); our_interests.add (ARDOUR::Properties::locked); our_interests.add (ARDOUR::Properties::position_lock_style); our_interests.add (ARDOUR::Properties::muted); our_interests.add (ARDOUR::Properties::opaque); our_interests.add (ARDOUR::Properties::fade_in); our_interests.add (ARDOUR::Properties::fade_out); - - if (last_row != 0) { - - TreeModel::iterator j = _model->get_iter (last_row.get_path()); - boost::shared_ptr c = (*j)[_columns.region]; - - if (c == r) { - populate_row (r, (*j)); - - if (what_changed.contains (ARDOUR::Properties::hidden)) { - redisplay (); - } - - return; - } - } + our_interests.add (ARDOUR::Properties::fade_in_active); + our_interests.add (ARDOUR::Properties::fade_out_active); if (what_changed.contains (our_interests)) { + if (last_row != 0) { - /* 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 found = children.end (); - - boost::shared_ptr c = (*i)[_columns.region]; + TreeModel::iterator j = _model->get_iter (last_row.get_path()); + boost::shared_ptr c = (*j)[_columns.region]; if (c == r) { + populate_row (r, (*j), what_changed); - /* check this row */ - last_row = TreeRowReference (_model, TreePath (i)); - found = i; - - } else { - - /* check its children */ - - found = children.begin (); - while (found != children.end()) { - - boost::shared_ptr c = (*found)[_columns.region]; - - if (c == r) { - last_row = TreeRowReference(_model, TreePath (found)); - break; - } - ++found; + if (what_changed.contains (ARDOUR::Properties::hidden)) { + redisplay (); } + + return; } + } - if (found != children.end()) { + RegionRowMap::iterator it; - boost::shared_ptr audioregion = boost::dynamic_pointer_cast(r); - uint32_t used = _editor->get_regionview_count_from_region_list (r); + it = region_row_map.find (r); - if (what_changed.contains (ARDOUR::Properties::name)) { - populate_row_name (r, *found); - } - if (what_changed.contains (ARDOUR::Properties::position)) { - populate_row_position (r, *found, used); - populate_row_end (r, *found, used); - } - if (what_changed.contains (ARDOUR::Properties::length)) { - populate_row_end (r, *found, used); - populate_row_length (r, *found); - } - if (what_changed.contains (ARDOUR::Properties::start)) { - populate_row_length (r, *found); - } - if (what_changed.contains (ARDOUR::Properties::locked)) { - populate_row_locked (r, *found, used); - } - if (what_changed.contains (ARDOUR::Properties::position_lock_style)) { - populate_row_glued (r, *found, used); - } - if (what_changed.contains (ARDOUR::Properties::muted)) { - populate_row_muted (r, *found, used); - } - if (what_changed.contains (ARDOUR::Properties::opaque)) { - populate_row_opaque (r, *found, used); - } - if (what_changed.contains (ARDOUR::Properties::fade_in)) { - populate_row_fade_in (r, *found, used, audioregion); - } - if (what_changed.contains (ARDOUR::Properties::fade_out)) { - populate_row_fade_out (r, *found, used, audioregion); + if (it != region_row_map.end()){ + + TreeModel::iterator j = it->second; + boost::shared_ptr c = (*j)[_columns.region]; + + if (c == r) { + populate_row (r, (*j), what_changed); + + if (what_changed.contains (ARDOUR::Properties::hidden)) { + redisplay (); } - break; + return; } - - ++i; } } @@ -541,7 +606,8 @@ 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 = (*iter)[_columns.region]; // they could have clicked on a row that is just a placeholder, like "Hidden" @@ -549,19 +615,13 @@ EditorRegions::selection_changed () // since we need a region ptr. if (region) { - - if (region->automatic()) { - - _display.get_selection()->unselect(*i); - - } else { - _change_connection.block (true); - _editor->set_selected_regionview_from_region_list (region, Selection::Add); - _change_connection.block (false); - } + _change_connection.block (true); + _editor->set_selected_regionview_from_region_list (region, Selection::Add); + _change_connection.block (false); } } + } } else { _editor->get_selection().clear_regions (); @@ -573,67 +633,19 @@ EditorRegions::selection_changed () void EditorRegions::set_selected (RegionSelection& regions) { - TreeModel::Children rows = _model->children(); - - for (RegionSelection::iterator iter = regions.begin(); iter != regions.end(); ++iter) { - - TreeModel::iterator i; - - boost::shared_ptr r ((*iter)->region()); - - for (i = rows.begin(); i != rows.end(); ++i) { - - boost::shared_ptr 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, 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 r ((*i)->region()); - boost::shared_ptr 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 = it->second; + _display.get_selection()->select(*j); } } - - return false; -} - -void -EditorRegions::insert_into_tmp_regionlist(boost::shared_ptr 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 @@ -652,23 +664,35 @@ EditorRegions::redisplay () _display.set_model (Glib::RefPtr(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 */ + region_row_map.clear(); + parent_regions_sources_map.clear(); - tmp_region_list.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) { - 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 >::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(); } @@ -681,59 +705,15 @@ EditorRegions::update_row (boost::shared_ptr 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 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, 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"; + RegionRowMap::iterator it; - boost::shared_ptr compared_region = (*i)[_columns.region]; - - if (region == compared_region) { - populate_row(region, (*i)); -// cerr << "Matched\n"; - return true; - } + it = region_row_map.find (region); - if (!(*i).children().empty()) { - if (update_subrows (region, (*i), level + 1)) { - return true; - } - } + if (it != region_row_map.end()){ + PropertyChange c; + TreeModel::iterator j = it->second; + populate_row(region, (*j), c); } - - return false; } void @@ -742,129 +722,165 @@ 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 = (*i)[_columns.region]; + for (i = region_row_map.begin(); i != region_row_map.end(); ++i) { - if (!region->automatic()) { - populate_row(region, (*i)); - } - - if (!(*i).children().empty()) { - update_all_subrows ((*i), 2); - } - } -} + TreeModel::iterator j = i->second; -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 = (*i)[_columns.region]; + boost::shared_ptr region = (*j)[_columns.region]; if (!region->automatic()) { - populate_row(region, (*i)); - } - - if (!(*i).children().empty()) { - update_all_subrows ((*i), level + 1); + PropertyChange c; + populate_row(region, (*j), c); } } } void -EditorRegions::format_position (framepos_t pos, char* buf, size_t bufsize) +EditorRegions::format_position (samplepos_t pos, char* buf, size_t bufsize, bool onoff) { Timecode::BBT_Time bbt; Timecode::Time timecode; - switch (ARDOUR_UI::instance()->secondary_clock.mode ()) { + if (pos < 0) { + error << string_compose (_("EditorRegions::format_position: negative timecode position: %1"), pos) << endmsg; + snprintf (buf, bufsize, "invalid"); + return; + } + + switch (ARDOUR_UI::instance()->primary_clock->mode ()) { case AudioClock::BBT: - _session->tempo_map().bbt_time (pos, bbt); - snprintf (buf, bufsize, "%03d|%02d|%04d" , bbt.bars, bbt.beats, bbt.ticks); + bbt = _session->tempo_map().bbt_at_sample (pos); + if (onoff) { + snprintf (buf, bufsize, "%03d|%02d|%04d" , bbt.bars, bbt.beats, bbt.ticks); + } else { + snprintf (buf, bufsize, "(%03d|%02d|%04d)" , bbt.bars, bbt.beats, bbt.ticks); + } break; case AudioClock::MinSec: - framepos_t left; + samplepos_t left; int hrs; int mins; float secs; left = pos; - hrs = (int) floor (left / (_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 -= (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); + hrs = (int) floor (left / (_session->sample_rate() * 60.0f * 60.0f)); + left -= (samplecnt_t) floor (hrs * _session->sample_rate() * 60.0f * 60.0f); + mins = (int) floor (left / (_session->sample_rate() * 60.0f)); + left -= (samplecnt_t) floor (mins * _session->sample_rate() * 60.0f); + secs = left / (float) _session->sample_rate(); + if (onoff) { + snprintf (buf, bufsize, "%02d:%02d:%06.3f", hrs, mins, secs); + } else { + snprintf (buf, bufsize, "(%02d:%02d:%06.3f)", hrs, mins, secs); + } break; - case AudioClock::Frames: - snprintf (buf, bufsize, "%" PRId64, pos); + case AudioClock::Seconds: + if (onoff) { + snprintf (buf, bufsize, "%.1f", pos / (float)_session->sample_rate()); + } else { + snprintf (buf, bufsize, "(%.1f)", pos / (float)_session->sample_rate()); + } + break; + + case AudioClock::Samples: + if (onoff) { + snprintf (buf, bufsize, "%" PRId64, pos); + } else { + snprintf (buf, bufsize, "(%" PRId64 ")", pos); + } break; case AudioClock::Timecode: - 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); + if (onoff) { + snprintf (buf, bufsize, "%02d:%02d:%02d:%02d", timecode.hours, timecode.minutes, timecode.seconds, timecode.frames); + } else { + snprintf (buf, bufsize, "(%02d:%02d:%02d:%02d)", timecode.hours, timecode.minutes, timecode.seconds, timecode.frames); + } break; } } void -EditorRegions::populate_row (boost::shared_ptr region, TreeModel::Row const &row) +EditorRegions::populate_row (boost::shared_ptr region, TreeModel::Row const &row, PBD::PropertyChange const &what_changed) { boost::shared_ptr audioregion = boost::dynamic_pointer_cast(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; + + PropertyChange c; + const bool all = what_changed == c; + + if (all || what_changed.contains (Properties::position)) { + populate_row_position (region, row, used); + } + if (all || what_changed.contains (Properties::start) || what_changed.contains (Properties::sync_position)) { + populate_row_sync (region, row, used); + } + if (all || what_changed.contains (Properties::fade_in)) { + populate_row_fade_in (region, row, used, audioregion); + } + if (all || what_changed.contains (Properties::fade_out)) { + populate_row_fade_out (region, row, used, audioregion); + } + if (all || what_changed.contains (Properties::locked)) { + populate_row_locked (region, row, used); + } + if (all || what_changed.contains (Properties::position_lock_style)) { + populate_row_glued (region, row, used); + } + if (all || what_changed.contains (Properties::muted)) { + populate_row_muted (region, row, used); + } + if (all || what_changed.contains (Properties::opaque)) { + populate_row_opaque (region, row, used); + } + if (all || what_changed.contains (Properties::length)) { + populate_row_end (region, row, used); + populate_row_length (region, row); + } + if (all) { + populate_row_source (region, row); + } + if (all || what_changed.contains (Properties::name)) { + populate_row_name (region, row); + } + if (all) { + populate_row_used (region, row, used); + } } #if 0 if (audioRegion && fades_in_seconds) { - framepos_t left; + samplepos_t left; int mins; int millisecs; left = audioRegion->fade_in()->back()->when; - mins = (int) floor (left / (_session->frame_rate() * 60.0f)); - left -= (framepos_t) floor (mins * _session->frame_rate() * 60.0f); - millisecs = (int) floor ((left * 1000.0f) / _session->frame_rate()); + mins = (int) floor (left / (_session->sample_rate() * 60.0f)); + left -= (samplepos_t) floor (mins * _session->sample_rate() * 60.0f); + millisecs = (int) floor ((left * 1000.0f) / _session->sample_rate()); - if (audioRegion->fade_in()->back()->when >= _session->frame_rate()) { + if (audioRegion->fade_in()->back()->when >= _session->sample_rate()) { sprintf (fadein_str, "%01dM %01dmS", mins, millisecs); } else { sprintf (fadein_str, "%01dmS", millisecs); } left = audioRegion->fade_out()->back()->when; - mins = (int) floor (left / (_session->frame_rate() * 60.0f)); - left -= (framepos_t) floor (mins * _session->frame_rate() * 60.0f); - millisecs = (int) floor ((left * 1000.0f) / _session->frame_rate()); + mins = (int) floor (left / (_session->sample_rate() * 60.0f)); + left -= (samplepos_t) floor (mins * _session->sample_rate() * 60.0f); + millisecs = (int) floor ((left * 1000.0f) / _session->sample_rate()); - if (audioRegion->fade_out()->back()->when >= _session->frame_rate()) { + if (audioRegion->fade_out()->back()->when >= _session->sample_rate()) { sprintf (fadeout_str, "%01dM %01dmS", mins, millisecs); } else { sprintf (fadeout_str, "%01dmS", millisecs); @@ -873,7 +889,7 @@ EditorRegions::populate_row (boost::shared_ptr region, TreeModel::Row co #endif void -EditorRegions::populate_row_used (boost::shared_ptr region, TreeModel::Row const& row, uint32_t used) +EditorRegions::populate_row_used (boost::shared_ptr, TreeModel::Row const& row, uint32_t used) { char buf[8]; snprintf (buf, sizeof (buf), "%4d" , used); @@ -884,7 +900,15 @@ void EditorRegions::populate_row_length (boost::shared_ptr region, TreeModel::Row const &row) { char buf[16]; - format_position (region->length(), buf, sizeof (buf)); + + 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); + } else { + format_position (region->length(), buf, sizeof (buf)); + } + row[_columns.length] = buf; } @@ -895,10 +919,12 @@ EditorRegions::populate_row_end (boost::shared_ptr region, TreeModel::Ro row[_columns.end] = ""; } else if (used > 1) { row[_columns.end] = _("Mult."); - } else { + } else if (region->last_sample() >= region->first_sample()) { char buf[16]; - format_position (region->last_frame(), buf, sizeof (buf)); + format_position (region->last_sample(), buf, sizeof (buf)); row[_columns.end] = buf; + } else { + row[_columns.end] = "empty"; } } @@ -926,7 +952,7 @@ EditorRegions::populate_row_sync (boost::shared_ptr region, TreeModel::R } else { if (region->sync_position() == region->position()) { row[_columns.sync] = _("Start"); - } else if (region->sync_position() == (region->last_frame())) { + } else if (region->sync_position() == (region->last_sample())) { row[_columns.sync] = _("End"); } else { char buf[16]; @@ -945,16 +971,9 @@ EditorRegions::populate_row_fade_in (boost::shared_ptr region, TreeModel if (used > 1) { row[_columns.fadein] = _("Multiple"); } else { - - char buf[16]; - format_position (audioregion->fade_in()->back()->when, buf, sizeof (buf)); + char buf[32]; + format_position (audioregion->fade_in()->back()->when, buf, sizeof (buf), audioregion->fade_in_active()); 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, ")"); - } } } } @@ -968,18 +987,13 @@ EditorRegions::populate_row_fade_out (boost::shared_ptr region, TreeMode 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, ")"); - } - } + char buf[32]; + format_position (audioregion->fade_out()->back()->when, buf, sizeof (buf), audioregion->fade_out_active()); + row[_columns.fadeout] = buf; + } } } - + void EditorRegions::populate_row_locked (boost::shared_ptr region, TreeModel::Row const &row, uint32_t used) { @@ -1030,19 +1044,19 @@ void EditorRegions::populate_row_name (boost::shared_ptr region, TreeModel::Row const &row) { if (region->n_channels() > 1) { - row[_columns.name] = string_compose("%1 [%2]", region->name(), region->n_channels()); + row[_columns.name] = string_compose("%1 [%2]", Gtkmm2ext::markup_escape_text (region->name()), region->n_channels()); } else { - row[_columns.name] = region->name(); + row[_columns.name] = Gtkmm2ext::markup_escape_text (region->name()); } -} +} void EditorRegions::populate_row_source (boost::shared_ptr region, TreeModel::Row const &row) { - if (boost::dynamic_pointer_cast(region->source())) { - row[_columns.path] = _("MISSING ") + region->source()->name(); + if (boost::dynamic_pointer_cast(region->source())) { + row[_columns.path] = _("MISSING ") + Gtkmm2ext::markup_escape_text (region->source()->name()); } else { - row[_columns.path] = region->source()->name(); + row[_columns.path] = Gtkmm2ext::markup_escape_text (region->source()->name()); } } @@ -1064,10 +1078,10 @@ EditorRegions::set_full (bool f) { if (f) { _display.expand_all (); - expanded = true; + expanded = true; } else { _display.collapse_all (); - expanded = false; + expanded = false; } } @@ -1088,7 +1102,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); @@ -1116,7 +1130,7 @@ EditorRegions::key_press (GdkEventKey* ev) switch (ev->keyval) { case GDK_Tab: case GDK_ISO_Left_Tab: - + if (name_editable) { name_editable->editing_done (); name_editable = 0; @@ -1208,7 +1222,7 @@ EditorRegions::sorter (TreeModel::iterator a, TreeModel::iterator b) switch (_sort_type) { case ByName: - cmp = strcasecmp (region1->name().c_str(), region2->name().c_str()); + cmp = region1->name().compare(region2->name()); break; case ByLength: @@ -1233,7 +1247,7 @@ EditorRegions::sorter (TreeModel::iterator a, TreeModel::iterator b) break; case BySourceFileName: - cmp = strcasecmp (region1->source()->name().c_str(), region2->source()->name().c_str()); + cmp = region1->source()->name().compare(region2->source()->name()); break; case BySourceFileLength: @@ -1246,9 +1260,9 @@ EditorRegions::sorter (TreeModel::iterator a, TreeModel::iterator b) case BySourceFileFS: if (region1->source()->name() == region2->source()->name()) { - cmp = strcasecmp (region1->name().c_str(), region2->name().c_str()); + cmp = region1->name().compare(region2->name()); } else { - cmp = strcasecmp (region1->source()->name().c_str(), region2->source()->name().c_str()); + cmp = region1->source()->name().compare(region2->source()->name()); } break; } @@ -1311,9 +1325,9 @@ EditorRegions::selection_mapover (sigc::slot > sl void EditorRegions::drag_data_received (const RefPtr& context, - int x, int y, - const SelectionData& data, - guint info, guint time) + int x, int y, + const SelectionData& data, + guint info, guint time) { vector paths; @@ -1325,9 +1339,12 @@ EditorRegions::drag_data_received (const RefPtr& context, } if (_editor->convert_drop_to_paths (paths, context, x, y, data, info, time) == 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); + samplepos_t pos = 0; + bool copy = ((context->get_actions() & (Gdk::ACTION_COPY | Gdk::ACTION_LINK | Gdk::ACTION_MOVE)) == Gdk::ACTION_COPY); + + if (UIConfiguration::instance().get_only_copy_imported_files() || copy) { + _editor->do_import (paths, Editing::ImportDistinctFiles, Editing::ImportAsRegion, + SrcBest, SMFTrackName, SMFTempoIgnore, pos); } else { _editor->do_embed (paths, Editing::ImportDistinctFiles, ImportAsRegion, pos); } @@ -1358,45 +1375,55 @@ EditorRegions::selection_filter (const RefPtr& model, const TreeModel } void -EditorRegions::name_editing_started (CellEditable* ce, const Glib::ustring&) +EditorRegions::name_editing_started (CellEditable* ce, const Glib::ustring& path) { name_editable = ce; - + /* give it a special name */ Gtk::Entry *e = dynamic_cast (ce); if (e) { e->set_name (X_("RegionNameEditorEntry")); + + TreeIter iter; + if ((iter = _model->get_iter (path))) { + boost::shared_ptr region = (*iter)[_columns.region]; + + if(region) { + e->set_text(region->name()); + } + } } } - + void EditorRegions::name_edit (const std::string& path, const std::string& new_text) { name_editable = 0; boost::shared_ptr region; - TreeIter iter; + TreeIter row_iter; - if ((iter = _model->get_iter (path))) { - region = (*iter)[_columns.region]; - (*iter)[_columns.name] = new_text; + if ((row_iter = _model->get_iter (path))) { + region = (*row_iter)[_columns.region]; + (*row_iter)[_columns.name] = new_text; } /* now mapover everything */ if (region) { vector equivalents; - _editor->get_regions_corresponding_to (region, equivalents); + _editor->get_regions_corresponding_to (region, equivalents, false); for (vector::iterator i = equivalents.begin(); i != equivalents.end(); ++i) { if (new_text != (*i)->region()->name()) { (*i)->region()->set_name (new_text); } } - } + populate_row_name (region, (*row_iter)); + } } /** @return Region that has been dragged out of the list, or 0 */ @@ -1410,7 +1437,7 @@ EditorRegions::get_dragged_region () if (regions.empty()) { return boost::shared_ptr (); } - + assert (regions.size() == 1); return regions.front (); } @@ -1421,6 +1448,10 @@ EditorRegions::clear () _display.set_model (Glib::RefPtr (0)); _model->clear (); _display.set_model (_model); + + /* Clean up the maps */ + region_row_map.clear(); + parent_regions_sources_map.clear(); } boost::shared_ptr @@ -1445,6 +1476,25 @@ EditorRegions::get_single_selection () return (*iter)[_columns.region]; } +void +EditorRegions::freeze_tree_model (){ + + _display.set_model (Glib::RefPtr(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) { @@ -1502,17 +1552,17 @@ EditorRegions::get_state () const { XMLNode* node = new XMLNode (X_("RegionList")); - node->add_property (X_("sort-type"), enum_2_string (_sort_type)); + node->set_property (X_("sort-type"), _sort_type); RefPtr act = ActionManager::get_action (X_("RegionList"), X_("SortAscending")); bool const ascending = RefPtr::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"); + node->set_property (X_("sort-ascending"), ascending); + node->set_property (X_("show-all"), toggle_full_action()->get_active()); + node->set_property (X_("show-automatic-regions"), _show_automatic_regions); return *node; } - + void EditorRegions::set_state (const XMLNode & node) { @@ -1522,29 +1572,32 @@ EditorRegions::set_state (const XMLNode & node) return; } - XMLProperty const * p = node.property (X_("sort-type")); - if (p) { - Editing::RegionListSortType const t = static_cast (string_2_enum (p->value(), _sort_type)); + Editing::RegionListSortType t; + if (node.get_property (X_("sort-type"), t)) { + if (_sort_type != t) { changed = true; } + reset_sort_type (t, true); RefPtr ract = sort_type_action (t); ract->set_active (); } - p = node.property (X_("sort-ascending")); - if (p) { - bool const yn = string_is_affirmative (p->value ()); + bool yn; + if (node.get_property (X_("sort-ascending"), yn)) { SortType old_sort_type; int old_sort_column; _model->get_sort_column_id (old_sort_column, old_sort_type); + if (old_sort_type != (yn ? SORT_ASCENDING : SORT_DESCENDING)) { changed = true; } + reset_sort_direction (yn); RefPtr act; + if (yn) { act = ActionManager::get_action (X_("RegionList"), X_("SortAscending")); } else { @@ -1554,26 +1607,23 @@ EditorRegions::set_state (const XMLNode & node) RefPtr::cast_dynamic(act)->set_active (); } - p = node.property (X_("show-all")); - if (p) { - bool const yn = string_is_affirmative (p->value ()); + if (node.get_property (X_("show-all"), yn)) { 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 (node.get_property (X_("show-automatic-regions"), yn)) { if (yn != _show_automatic_regions) { _show_automatic_regions = yn; toggle_show_auto_regions_action()->set_active (yn); changed = true; } } - + if (changed) { redisplay (); } @@ -1617,7 +1667,7 @@ EditorRegions::sort_type_action (Editing::RegionListSortType t) const break; default: fatal << string_compose (_("programming error: %1: %2"), "EditorRegions: impossible sort type", (int) t) << endmsg; - /*NOTREACHED*/ + abort(); /*NOTREACHED*/ } RefPtr act = ActionManager::get_action (X_("RegionList"), action); @@ -1630,7 +1680,7 @@ RefPtr EditorRegions::hide_action () const { return ActionManager::get_action (X_("RegionList"), X_("rlHide")); - + } RefPtr @@ -1639,6 +1689,12 @@ EditorRegions::show_action () const return ActionManager::get_action (X_("RegionList"), X_("rlShow")); } +RefPtr +EditorRegions::remove_unused_regions_action () const +{ + return ActionManager::get_action (X_("RegionList"), X_("removeUnusedRegions")); +} + RefPtr EditorRegions::toggle_full_action () const {