X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_regions.cc;h=6526d4dec5c8015c3b0da39218c8f7366d47e9f2;hb=6b1b72a247bf04c81292fc41af4f69c9b7f90379;hp=d23648a2d73f25d648786b40090dbd321a9ad63c;hpb=0b30814bdd693eb05d41760ee5024a7c71736af0;p=ardour.git diff --git a/gtk2_ardour/editor_regions.cc b/gtk2_ardour/editor_regions.cc index d23648a2d7..6526d4dec5 100644 --- a/gtk2_ardour/editor_regions.cc +++ b/gtk2_ardour/editor_regions.cc @@ -33,13 +33,16 @@ #include "ardour/session.h" #include "ardour/profile.h" -#include "gtkmm2ext/choice.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" @@ -49,13 +52,13 @@ #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 ArdourWidgets; using namespace ARDOUR_UI_UTILS; using namespace PBD; using namespace Gtk; @@ -64,9 +67,9 @@ using namespace Editing; using Gtkmm2ext::Keyboard; struct ColumnInfo { - int index; - const char* label; - const char* tooltip; + int index; + const char* label; + const char* tooltip; }; EditorRegions::EditorRegions (Editor* e) @@ -77,13 +80,14 @@ EditorRegions::EditorRegions (Editor* e) , _show_automatic_regions (true) , ignore_region_list_selection_change (false) , ignore_selected_region_change (false) - , _no_redisplay (false) + , _no_redisplay (false) , _sort_type ((Editing::RegionListSortType) 0) , expanded (false) { _display.set_size_request (100, -1); _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() @@ -94,19 +98,59 @@ EditorRegions::EditorRegions (Editor* e) _model->set_sort_func (0, sigc::mem_fun (*this, &EditorRegions::sorter)); _model->set_sort_column (0, SORT_ASCENDING); - _display.set_model (_model); - - _display.append_column ("", _columns.name); - _display.append_column ("", _columns.position); - _display.append_column ("", _columns.end); - _display.append_column ("", _columns.length); - _display.append_column ("", _columns.sync); - _display.append_column ("", _columns.fadein); - _display.append_column ("", _columns.fadeout); - _display.append_column ("", _columns.locked); - _display.append_column ("", _columns.glued); - _display.append_column ("", _columns.muted); - _display.append_column ("", _columns.opaque); + /* 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; @@ -138,12 +182,15 @@ EditorRegions::EditorRegions (Editor* e) col->set_alignment (ALIGN_CENTER); } } + _display.set_model (_model); _display.set_headers_visible (true); _display.set_rules_hint (); - /* show path as the row tooltip */ - _display.set_tooltip_column (14); /* path */ + if (UIConfiguration::instance().get_use_tooltips()) { + /* show path as the row tooltip */ + _display.set_tooltip_column (14); /* path */ + } CellRendererText* region_name_cell = dynamic_cast(_display.get_column_cell_renderer (0)); region_name_cell->property_editable() = true; @@ -217,7 +264,7 @@ EditorRegions::EditorRegions (Editor* e) // _display.signal_popup_menu().connect (sigc::bind (sigc::mem_fun (*this, &Editor::show__display_context_menu), 1, 0)); //ARDOUR_UI::instance()->secondary_clock.mode_changed.connect (sigc::mem_fun(*this, &Editor::redisplay_regions)); - ARDOUR_UI::instance()->secondary_clock->mode_changed.connect (sigc::mem_fun(*this, &EditorRegions::update_all_rows)); + ARDOUR_UI::instance()->primary_clock->mode_changed.connect (sigc::mem_fun(*this, &EditorRegions::update_all_rows)); ARDOUR::Region::RegionPropertyChanged.connect (region_property_connection, MISSING_INVALIDATOR, boost::bind (&EditorRegions::region_changed, this, _1, _2), gui_context()); ARDOUR::RegionFactory::CheckNewRegion.connect (check_new_region_connection, MISSING_INVALIDATOR, boost::bind (&EditorRegions::add_region, this, _1), gui_context()); @@ -300,6 +347,7 @@ EditorRegions::add_region (boost::shared_ptr region) TreeModel::Row row; Gdk::Color c; bool missing_source = boost::dynamic_pointer_cast(region->source()) != NULL; + TreeModel::iterator iter; if (!_show_automatic_regions && region->automatic()) { return; @@ -307,7 +355,7 @@ EditorRegions::add_region (boost::shared_ptr region) if (region->hidden()) { - TreeModel::iterator iter = _model->get_iter ("0"); + iter = _model->get_iter ("0"); TreeModel::Row parent; if (!iter) { @@ -327,7 +375,8 @@ EditorRegions::add_region (boost::shared_ptr region) } } - row = *(_model->append (parent.children())); + iter = _model->append (parent.children()); + row = *iter; } else if (region->whole_file()) { @@ -342,7 +391,8 @@ 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 @@ -379,15 +429,7 @@ 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; @@ -403,7 +445,7 @@ EditorRegions::add_region (boost::shared_ptr region) } } - region_row_map.insert(pair, Gtk::TreeModel::RowReference>(region, TreeRowReference(_model, TreePath (row))) ); + region_row_map.insert(pair, Gtk::TreeModel::iterator>(region, iter)); parent_regions_sources_map.insert(pair(region->source_string(), TreeRowReference(_model, TreePath (row))) ); return; @@ -412,7 +454,7 @@ EditorRegions::add_region (boost::shared_ptr region) // find parent node, add as new child TreeModel::iterator i; - boost::unordered_map::iterator it; + RegionSourceMap::iterator it; it = parent_regions_sources_map.find (region->source_string()); @@ -434,20 +476,21 @@ EditorRegions::add_region (boost::shared_ptr region) } */ - row = *(_model->insert (subrows.end())); + iter = _model->insert (subrows.end()); + row = *iter; } else { - row = *(_model->append()); + iter = _model->append(); + row = *iter; } row[_columns.property_toggles_visible] = true; } row[_columns.region] = region; - - region_row_map.insert(pair, Gtk::TreeModel::RowReference>(region, TreeRowReference(_model, TreePath (row))) ); - - populate_row(region, (*row)); + region_row_map.insert (pair,Gtk::TreeModel::iterator> (region,iter)); + PropertyChange pc; + populate_row(region, (*row), pc); } void @@ -460,13 +503,13 @@ EditorRegions::remove_unused_regions () return; } - prompt = _("Do you really want to remove unused regions?" - "\n(This is destructive and cannot be undone)"); + prompt = _("Do you really want to remove unused regions?" + "\n(This is destructive and cannot be undone)"); choices.push_back (_("No, do nothing.")); choices.push_back (_("Yes, remove.")); - Gtkmm2ext::Choice prompter (_("Remove unused regions"), prompt, choices); + ArdourWidgets::Choice prompter (_("Remove unused regions"), prompt, choices); if (prompter.run () == 1) { _no_redisplay = true; @@ -479,12 +522,22 @@ EditorRegions::remove_unused_regions () 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); @@ -495,14 +548,13 @@ EditorRegions::region_changed (boost::shared_ptr r, const PropertyChange 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 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 (); @@ -518,11 +570,11 @@ EditorRegions::region_changed (boost::shared_ptr r, const PropertyChange if (it != region_row_map.end()){ - TreeModel::iterator j = _model->get_iter ((*it).second.get_path()); + TreeModel::iterator j = it->second; boost::shared_ptr 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 (); @@ -592,7 +644,7 @@ EditorRegions::set_selected (RegionSelection& regions) it = region_row_map.find (r); if (it != region_row_map.end()){ - TreeModel::iterator j = _model->get_iter ((*it).second.get_path()); + TreeModel::iterator j = it->second; _display.get_selection()->select(*j); } } @@ -616,7 +668,6 @@ EditorRegions::redisplay () _model->clear (); _model->set_sort_column (-2, SORT_ASCENDING); //Disable sorting to gain performance - region_row_map.clear(); parent_regions_sources_map.clear(); @@ -661,9 +712,9 @@ EditorRegions::update_row (boost::shared_ptr region) it = region_row_map.find (region); if (it != region_row_map.end()){ - - TreeModel::iterator j = _model->get_iter ((*it).second.get_path()); - populate_row(region, (*j)); + PropertyChange c; + TreeModel::iterator j = it->second; + populate_row(region, (*j), c); } } @@ -678,18 +729,19 @@ EditorRegions::update_all_rows () for (i = region_row_map.begin(); i != region_row_map.end(); ++i) { - TreeModel::iterator j = _model->get_iter ((*i).second.get_path()); + TreeModel::iterator j = i->second; boost::shared_ptr region = (*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, bool onoff) +EditorRegions::format_position (samplepos_t pos, char* buf, size_t bufsize, bool onoff) { Timecode::BBT_Time bbt; Timecode::Time timecode; @@ -700,9 +752,9 @@ EditorRegions::format_position (framepos_t pos, char* buf, size_t bufsize, bool return; } - switch (ARDOUR_UI::instance()->secondary_clock->mode ()) { + switch (ARDOUR_UI::instance()->primary_clock->mode ()) { case AudioClock::BBT: - _session->tempo_map().bbt_time (pos, bbt); + bbt = _session->tempo_map().bbt_at_sample (pos); if (onoff) { snprintf (buf, bufsize, "%03d|%02d|%04d" , bbt.bars, bbt.beats, bbt.ticks); } else { @@ -711,17 +763,17 @@ EditorRegions::format_position (framepos_t pos, char* buf, size_t bufsize, bool 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(); + 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 { @@ -729,7 +781,15 @@ EditorRegions::format_position (framepos_t pos, char* buf, size_t bufsize, bool } break; - case AudioClock::Frames: + 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 { @@ -750,52 +810,79 @@ EditorRegions::format_position (framepos_t pos, char* buf, size_t bufsize, bool } 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); /* 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) || 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); @@ -815,7 +902,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; } @@ -826,9 +921,9 @@ EditorRegions::populate_row_end (boost::shared_ptr region, TreeModel::Ro row[_columns.end] = ""; } else if (used > 1) { row[_columns.end] = _("Mult."); - } else if (region->last_frame() >= region->first_frame()) { + } 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"; @@ -859,7 +954,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]; @@ -960,7 +1055,7 @@ EditorRegions::populate_row_name (boost::shared_ptr region, TreeModel::R void EditorRegions::populate_row_source (boost::shared_ptr region, TreeModel::Row const &row) { - if (boost::dynamic_pointer_cast(region->source())) { + if (boost::dynamic_pointer_cast(region->source())) { row[_columns.path] = _("MISSING ") + Gtkmm2ext::markup_escape_text (region->source()->name()); } else { row[_columns.path] = Gtkmm2ext::markup_escape_text (region->source()->name()); @@ -985,10 +1080,10 @@ EditorRegions::set_full (bool f) { if (f) { _display.expand_all (); - expanded = true; + expanded = true; } else { _display.collapse_all (); - expanded = false; + expanded = false; } } @@ -1232,9 +1327,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; @@ -1246,11 +1341,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; + samplepos_t pos = 0; bool copy = ((context->get_actions() & (Gdk::ACTION_COPY | Gdk::ACTION_LINK | Gdk::ACTION_MOVE)) == Gdk::ACTION_COPY); - if (Profile->get_sae() || UIConfiguration::instance().get_only_copy_imported_files() || copy) { - _editor->do_import (paths, Editing::ImportDistinctFiles, Editing::ImportAsRegion, SrcBest, pos); + 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); } @@ -1281,7 +1377,7 @@ 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; @@ -1291,6 +1387,15 @@ EditorRegions::name_editing_started (CellEditable* ce, const Glib::ustring&) 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()); + } + } } } @@ -1300,11 +1405,11 @@ 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 */ @@ -1318,8 +1423,9 @@ EditorRegions::name_edit (const std::string& path, const std::string& new_text) (*i)->region()->set_name (new_text); } } - } + populate_row_name (region, (*row_iter)); + } } /** @return Region that has been dragged out of the list, or 0 */ @@ -1448,13 +1554,13 @@ 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; } @@ -1468,10 +1574,8 @@ 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; @@ -1482,10 +1586,8 @@ EditorRegions::set_state (const XMLNode & node) 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; @@ -1507,10 +1609,7 @@ 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; } @@ -1519,10 +1618,7 @@ EditorRegions::set_state (const XMLNode & node) 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);