#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/choice.h"
#include "gtkmm2ext/treeutils.h"
+#include "gtkmm2ext/utils.h"
+#include "audio_clock.h"
#include "editor.h"
#include "editing.h"
#include "keyboard.h"
#include "utils.h"
#include "editor_regions.h"
#include "editor_drag.h"
+#include "main_clock.h"
+#include "tooltips.h"
+#include "ui_config.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
using namespace std;
using namespace ARDOUR;
+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)
+ , 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);
+ _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()
*/
_model->set_sort_func (0, sigc::mem_fun (*this, &EditorRegions::sorter));
_model->set_sort_column (0, SORT_ASCENDING);
+ /* column widths */
+ int bbt_width, sync_width, check_width, height;
+
+ Glib::RefPtr<Pango::Layout> layout = _display.create_pango_layout (X_("000|000|000"));
+ Gtkmm2ext::get_pixel_size (layout, bbt_width, height);
+
+ layout = _display.create_pango_layout (X_("Start "));
+ Gtkmm2ext::get_pixel_size (layout, sync_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 (sync_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 */
+ /* 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;
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));
CellRendererText* renderer = dynamic_cast<CellRendererText*>(_display.get_column_cell_renderer (0));
tv_col->add_attribute(renderer->property_text(), _columns.name);
tv_col->add_attribute(renderer->property_foreground_gdk(), _columns.color_);
+ tv_col->set_expand (true);
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");
+ _display.set_drag_column (_columns.name.index());
/* setup DnD handling */
_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::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()->secondary_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
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
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)
{
string str;
TreeModel::Row row;
Gdk::Color c;
- bool missing_source = boost::dynamic_pointer_cast<SilentFileSource>(region->source());
+ bool missing_source = boost::dynamic_pointer_cast<SilentFileSource>(region->source()) != NULL;
if (!_show_automatic_regions && region->automatic()) {
return;
}
if (region->hidden()) {
+
TreeModel::iterator iter = _model->get_iter ("0");
TreeModel::Row parent;
- TreeModel::Row child;
if (!iter) {
parent = *(_model->append());
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");
parent = *iter;
}
}
+
row = *(_model->append (parent.children()));
} else if (region->whole_file()) {
row = *(_model->append());
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;
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<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] = Gtkmm2ext::markup_escape_text (fs->path());
+ } else {
+ row[_columns.path] = Gtkmm2ext::markup_escape_text (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];
return;
}
}
+ */
- if (found_parent) {
- row = *(_model->append ((*i).children()));
- break;
- }
- }
+ row = *(_model->insert (subrows.end()));
- if (!found_parent) {
+ } else {
row = *(_model->append());
}
row[_columns.region] = region;
- populate_row(region, (*row));
+ region_row_map.insert(pair<boost::shared_ptr<ARDOUR::Region>, Gtk::TreeModel::RowReference>(region, TreeRowReference(_model, TreePath (row))) );
+ PropertyChange pc;
+ populate_row(region, (*row), pc);
}
void
-EditorRegions::region_changed (boost::shared_ptr<Region> r, const PropertyChange& what_changed)
+EditorRegions::remove_unused_regions ()
{
- 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 ();
- }
-
- return;
- }
+ vector<string> choices;
+ string prompt;
+
+ if (!_session) {
+ return;
}
- if (what_changed.contains (our_interests)) {
+ prompt = _("Do you really want to remove unused regions?"
+ "\n(This is destructive and cannot be undone)");
- /* find the region in our model and update its row */
- TreeModel::Children rows = _model->children ();
- TreeModel::iterator i = rows.begin ();
-
- while (i != rows.end ()) {
+ choices.push_back (_("No, do nothing."));
+ choices.push_back (_("Yes, remove."));
- TreeModel::Children children = (*i)->children ();
- TreeModel::iterator found = children.end ();
-
- boost::shared_ptr<Region> c = (*i)[_columns.region];
+ Gtkmm2ext::Choice prompter (_("Remove unused regions"), prompt, choices);
- if (c == r) {
+ if (prompter.run () == 1) {
+ _no_redisplay = true;
+ _session->cleanup_regions ();
+ _no_redisplay = false;
+ redisplay ();
+ }
+}
- /* check this row */
- last_row = TreeRowReference (_model, TreePath (i));
- found = i;
+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);
+ 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) {
+
+ TreeModel::iterator j = _model->get_iter (last_row.get_path());
+ boost::shared_ptr<Region> c = (*j)[_columns.region];
- } else {
+ if (c == r) {
+ populate_row (r, (*j), what_changed);
- /* check its children */
-
- found = children.begin ();
- while (found != children.end()) {
-
- boost::shared_ptr<Region> c = (*found)[_columns.region];
-
- if (c == r) {
- last_row = TreeRowReference(_model, TreePath (found));
- break;
- }
- ++found;
+ if (what_changed.contains (ARDOUR::Properties::hidden)) {
+ redisplay ();
}
- }
- if (found != 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, *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);
- }
-
- break;
+ return;
}
+ }
+
+ RegionRowMap::iterator it;
+
+ it = region_row_map.find (r);
+
+ if (it != region_row_map.end()){
- ++i;
+ 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), what_changed);
+
+ if (what_changed.contains (ARDOUR::Properties::hidden)) {
+ redisplay ();
+ }
+
+ return;
+ }
}
}
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);
- } 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 ();
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<Region> r ((*iter)->region());
-
- for (i = rows.begin(); i != rows.end(); ++i) {
-
- boost::shared_ptr<Region> compared_region = (*i)[_columns.region];
-
- if (r == compared_region) {
- _display.get_selection()->select(*i);
- break;
- }
-
- if (!(*i).children().empty()) {
- if (set_selected_in_subrow(r, (*i), 2)) {
- break;
- }
- }
- }
- }
-}
-
-bool
-EditorRegions::set_selected_in_subrow (boost::shared_ptr<Region> region, TreeModel::Row const &parent_row, int level)
-{
- TreeModel::iterator i;
- TreeModel::Children subrows = (*parent_row).children();
+ for (RegionSelection::iterator i = regions.begin(); i != regions.end(); ++i) {
- for (i = subrows.begin(); i != subrows.end(); ++i) {
+ boost::shared_ptr<Region> r ((*i)->region());
- boost::shared_ptr<Region> compared_region = (*i)[_columns.region];
+ RegionRowMap::iterator it;
- if (region == compared_region) {
- _display.get_selection()->select(*i);
- return true;
- }
+ it = region_row_map.find (r);
- if (!(*i).children().empty()) {
- if (set_selected_in_subrow (region, (*i), level + 1)) {
- return true;
- }
+ if (it != region_row_map.end()){
+ TreeModel::iterator j = _model->get_iter ((*it).second.get_path());
+ _display.get_selection()->select(*j);
}
}
-
- return false;
-}
-
-void
-EditorRegions::insert_into_tmp_regionlist(boost::shared_ptr<Region> region)
-{
- /* keep all whole files at the beginning */
-
- if (region->whole_file()) {
- tmp_region_list.push_front (region);
- } else {
- tmp_region_list.push_back (region);
- }
}
void
_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) {
+
+ 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;
+ }
- const RegionFactory::RegionMap& regions (RegionFactory::regions());
- for (RegionFactory::RegionMap::const_iterator i = regions.begin(); i != regions.end(); ++i) {
- insert_into_tmp_regionlist (i->second);
- }
+ 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();
}
return;
}
- TreeModel::iterator i;
- TreeModel::Children rows = _model->children();
-
- return;
-
- for (i = rows.begin(); i != rows.end(); ++i) {
+ RegionRowMap::iterator it;
-// cerr << "Level 1: Compare " << region->name() << " with parent " << (*i)[_columns.name] << "\n";
+ it = region_row_map.find (region);
- 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;
- }
- }
+ if (it != region_row_map.end()){
+ PropertyChange c;
+ TreeModel::iterator j = _model->get_iter ((*it).second.get_path());
+ populate_row(region, (*j), c);
}
-
-// cerr << "Returning - No match\n";
-}
-
-bool
-EditorRegions::update_subrows (boost::shared_ptr<Region> region, TreeModel::Row const &parent_row, int level)
-{
- TreeModel::iterator i;
- TreeModel::Children subrows = (*parent_row).children();
-
- for (i = subrows.begin(); i != subrows.end(); ++i) {
-
-// cerr << "Level " << level << ": Compare " << region->name() << " with child " << (*i)[_columns.name] << "\n";
-
- boost::shared_ptr<Region> compared_region = (*i)[_columns.region];
-
- if (region == compared_region) {
- populate_row(region, (*i));
-// cerr << "Matched\n";
- return true;
- }
-
- if (!(*i).children().empty()) {
- if (update_subrows (region, (*i), level + 1)) {
- return true;
- }
- }
- }
-
- return false;
}
void
if (!_session) {
return;
}
-
- TreeModel::iterator i;
- TreeModel::Children rows = _model->children();
-
- for (i = rows.begin(); i != rows.end(); ++i) {
-
- boost::shared_ptr<Region> region = (*i)[_columns.region];
- if (!region->automatic()) {
- populate_row(region, (*i));
- }
-
- if (!(*i).children().empty()) {
- update_all_subrows ((*i), 2);
- }
- }
-}
+ RegionRowMap::iterator i;
-void
-EditorRegions::update_all_subrows (TreeModel::Row const &parent_row, int level)
-{
- TreeModel::iterator i;
- TreeModel::Children subrows = (*parent_row).children();
+ for (i = region_row_map.begin(); i != region_row_map.end(); ++i) {
- for (i = subrows.begin(); i != subrows.end(); ++i) {
+ TreeModel::iterator j = _model->get_iter ((*i).second.get_path());
- 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);
+ PropertyChange c;
+ populate_row(region, (*j), c);
}
}
}
void
-EditorRegions::format_position (framepos_t pos, char* buf, size_t bufsize)
+EditorRegions::format_position (framepos_t pos, char* buf, size_t bufsize, bool onoff)
{
- BBT_Time bbt;
+ 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()->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);
+ bbt = _session->tempo_map().bbt_at_frame (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:
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);
+ 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);
+ 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> region, TreeModel::Row const &row)
+EditorRegions::populate_row (boost::shared_ptr<Region> region, TreeModel::Row const &row, PBD::PropertyChange const &what_changed)
{
boost::shared_ptr<AudioRegion> audioregion = boost::dynamic_pointer_cast<AudioRegion>(region);
- uint32_t used = _session->playlists->region_use_count (region);
-
- 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)) {
+ 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) {
- 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()) {
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()) {
#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;
}
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];
+
+ if (ARDOUR_UI::instance()->secondary_clock->mode () == AudioClock::BBT) {
+ TempoMap& map (_session->tempo_map());
+ Timecode::BBT_Time bbt = map.bbt_at_beat (map.beat_at_frame (region->last_frame()) - map.beat_at_frame (region->first_frame()));
+ 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;
}
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 if (region->last_frame() >= region->first_frame()) {
+ char buf[16];
+ format_position (region->last_frame(), buf, sizeof (buf));
+ row[_columns.end] = buf;
+ } else {
+ row[_columns.end] = "empty";
+ }
}
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->fade_in_active()) {
- row[_columns.fadein] = string_compose("%1%2%3", " ", buf, " ");
- } else {
- row[_columns.fadein] = string_compose("%1%2%3", "(", buf, ")");
- }
- }
- }
+ if (!audioregion || region->whole_file()) {
+ row[_columns.fadein] = "";
+ } else {
+ if (used > 1) {
+ row[_columns.fadein] = _("Multiple");
+ } else {
+ char buf[32];
+ format_position (audioregion->fade_in()->back()->when, buf, sizeof (buf), audioregion->fade_in_active());
+ row[_columns.fadein] = 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[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> 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
EditorRegions::populate_row_name (boost::shared_ptr<Region> region, TreeModel::Row const &row)
{
if (region->n_channels() > 1) {
- row[_columns.name] = string_compose("%1 [%2]", region->name(), region->n_channels());
+ 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> region, TreeModel::Row const &row)
{
if (boost::dynamic_pointer_cast<SilentFileSource>(region->source())) {
- row[_columns.path] = _("MISSING ") + region->source()->name();
+ 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());
}
}
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);
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;
+ }
- if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) {
- treeview_select_previous (_display, _model, col);
- } else {
- treeview_select_next (_display, _model, col);
- }
+ col = _display.get_column (0); // select&focus on name column
- return true;
- break;
+ if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) {
+ treeview_select_previous (_display, _model, col);
+ } else {
+ treeview_select_next (_display, _model, col);
+ }
+
+ return true;
+ break;
- default:
- break;
- }
+ default:
+ break;
+ }
return false;
}
switch (_sort_type) {
case ByName:
- cmp = strcasecmp (region1->name().c_str(), region2->name().c_str());
+ cmp = region1->name().compare(region2->name());
break;
case ByLength:
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:
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;
}
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()) {
+ 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, pos);
} else {
_editor->do_embed (paths, Editing::ImportDistinctFiles, ImportAsRegion, pos);
{
/* 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);
}
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 */
+ name_editable = ce;
+
+ /* give it a special name */
+
+ Gtk::Entry *e = dynamic_cast<Gtk::Entry*> (ce);
+
+ if (e) {
+ e->set_name (X_("RegionNameEditorEntry"));
- Gtk::Entry *e = dynamic_cast<Gtk::Entry*> (ce);
+ TreeIter iter;
+ if ((iter = _model->get_iter (path))) {
+ boost::shared_ptr<Region> region = (*iter)[_columns.region];
- if (e) {
- e->set_name (X_("RegionNameEditorEntry"));
- }
+ if(region) {
+ e->set_text(region->name());
+ }
+ }
+ }
}
-
+
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;
+ 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<RegionView*> equivalents;
- _editor->get_regions_corresponding_to (region, equivalents);
+ _editor->get_regions_corresponding_to (region, equivalents, false);
for (vector<RegionView*>::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 */
if (regions.empty()) {
return boost::shared_ptr<Region> ();
}
-
+
assert (regions.size() == 1);
return regions.front ();
}
_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>
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)
{
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 {
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);
}
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);
+
+ if (yn != _show_automatic_regions) {
+ _show_automatic_regions = yn;
+ toggle_show_auto_regions_action()->set_active (yn);
changed = true;
- }
- }
-
- if (changed) {
- redisplay ();
- }
+ }
+ }
+
+ if (changed) {
+ redisplay ();
+ }
}
RefPtr<RadioAction>
break;
default:
fatal << string_compose (_("programming error: %1: %2"), "EditorRegions: impossible sort type", (int) t) << endmsg;
- /*NOTREACHED*/
+ abort(); /*NOTREACHED*/
}
RefPtr<Action> act = ActionManager::get_action (X_("RegionList"), action);
EditorRegions::hide_action () const
{
return ActionManager::get_action (X_("RegionList"), X_("rlHide"));
-
+
}
RefPtr<Action>
return ActionManager::get_action (X_("RegionList"), X_("rlShow"));
}
+RefPtr<Action>
+EditorRegions::remove_unused_regions_action () const
+{
+ return ActionManager::get_action (X_("RegionList"), X_("removeUnusedRegions"));
+}
+
RefPtr<ToggleAction>
EditorRegions::toggle_full_action () const
{
projects / ardour.git / blobdiff