#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 "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)
, 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 */
+ _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;
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;
_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 */
//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::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, ui_bind (&EditorRegions::freeze_tree_model, this), gui_context());
- e->EditorThaw.connect (editor_thaw_connection, MISSING_INVALIDATOR, ui_bind (&EditorRegions::thaw_tree_model, this), gui_context());
+ 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
}
bool
-EditorRegions::enter_notify (GdkEventCrossing* ev)
+EditorRegions::enter_notify (GdkEventCrossing*)
{
if (name_editable) {
return true;
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;
TreeModel::iterator iter = _model->get_iter ("0");
TreeModel::Row parent;
- TreeModel::Row child;
if (!iter) {
parent = *(_model->append());
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();
+ 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());
}
}
} else {
// find parent node, add as new child
TreeModel::iterator i;
- TreeModel::Children rows = _model->children();
boost::unordered_map<string, Gtk::TreeModel::RowReference>::iterator it;
*/
row = *(_model->insert (subrows.end()));
- }
- else {
- row = *(_model->append());
+
+ } else {
+ row = *(_model->append());
}
row[_columns.property_toggles_visible] = true;
row[_columns.region] = region;
region_row_map.insert(pair<boost::shared_ptr<ARDOUR::Region>, Gtk::TreeModel::RowReference>(region, TreeRowReference(_model, TreePath (row))) );
-
- populate_row(region, (*row));
+ PropertyChange pc;
+ populate_row(region, (*row), pc);
}
void
-EditorRegions::delete_unused_regions ()
+EditorRegions::remove_unused_regions ()
{
vector<string> choices;
string prompt;
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];
if (c == r) {
- populate_row (r, (*j));
+ populate_row (r, (*j), what_changed);
if (what_changed.contains (ARDOUR::Properties::hidden)) {
redisplay ();
boost::shared_ptr<Region> c = (*j)[_columns.region];
if (c == r) {
- populate_row (r, (*j));
+ populate_row (r, (*j), what_changed);
if (what_changed.contains (ARDOUR::Properties::hidden)) {
redisplay ();
return;
}
}
-
- /* find the region in our model and update its row */
- TreeModel::Children rows = _model->children ();
- TreeModel::iterator i = rows.begin ();
-
}
if (what_changed.contains (ARDOUR::Properties::hidden)) {
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"
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 ();
it = region_row_map.find (region);
if (it != region_row_map.end()){
-
+ PropertyChange c;
TreeModel::iterator j = _model->get_iter ((*it).second.get_path());
- populate_row(region, (*j));
+ populate_row(region, (*j), c);
}
}
boost::shared_ptr<Region> region = (*j)[_columns.region];
if (!region->automatic()) {
- populate_row(region, (*j));
+ 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)
{
Timecode::BBT_Time bbt;
Timecode::Time timecode;
+ 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:
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);
+ 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:
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);
/* Presently a region is only used once so let's save on the sequential scan to determine use count */
uint32_t used = 1;
- populate_row_position (region, row, used);
- populate_row_end (region, row, used);
- populate_row_sync (region, row, used);
- populate_row_fade_in (region, row, used, audioregion);
- populate_row_fade_out (region, row, used, audioregion);
- populate_row_locked (region, row, used);
- populate_row_glued (region, row, used);
- populate_row_muted (region, row, used);
- populate_row_opaque (region, row, used);
- populate_row_length (region, row);
- populate_row_source (region, row);
- populate_row_name (region, row);
- populate_row_used (region, row, used);
+ 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
#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];
snprintf (buf, sizeof (buf), "%4d" , used);
EditorRegions::populate_row_length (boost::shared_ptr<Region> region, TreeModel::Row const &row)
{
char buf[16];
- format_position (region->length(), buf, sizeof (buf));
+
+ 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;
}
row[_columns.end] = "";
} else if (used > 1) {
row[_columns.end] = _("Mult.");
- } else {
+ } 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";
}
}
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, ")");
- }
}
}
}
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;
}
}
}
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());
}
}
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());
}
}
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);
}
void
-EditorRegions::name_editing_started (CellEditable* ce, const Glib::ustring&)
+EditorRegions::name_editing_started (CellEditable* ce, const Glib::ustring& path)
{
name_editable = ce;
if (e) {
e->set_name (X_("RegionNameEditorEntry"));
+
+ TreeIter iter;
+ if ((iter = _model->get_iter (path))) {
+ boost::shared_ptr<Region> region = (*iter)[_columns.region];
+
+ if(region) {
+ e->set_text(region->name());
+ }
+ }
}
}
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 */
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);
}
RefPtr<Action>
-EditorRegions::delete_unused_regions_action () const
+EditorRegions::remove_unused_regions_action () const
{
return ActionManager::get_action (X_("RegionList"), X_("removeUnusedRegions"));
}
projects / ardour.git / blobdiff