extend strict-i/o to include route outputs.

[ardour.git] / gtk2_ardour / editor_regions.cc

diff --git a/gtk2_ardour/editor_regions.cc b/gtk2_ardour/editor_regions.cc
index 5b143acc75a93c5c923d7ec294c2670d909d7fd4..9a6449b9ed05676329c27a136818b5fdc8ac835f 100644 (file)
--- a/gtk2_ardour/editor_regions.cc
+++ b/gtk2_ardour/editor_regions.cc
@@ -35,6 +35,7 @@
 
 #include "gtkmm2ext/choice.h"
 #include "gtkmm2ext/treeutils.h"
+#include "gtkmm2ext/utils.h"
 
 #include "audio_clock.h"
 #include "editor.h"
@@ -124,7 +125,7 @@ EditorRegions::EditorRegions (Editor* e)
                { 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));
@@ -187,6 +188,7 @@ EditorRegions::EditorRegions (Editor* e)
 
        _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 */
 
@@ -377,27 +379,19 @@ EditorRegions::add_region (boost::shared_ptr<Region> region)
                        str = region->name();
                }
 
-               if (region->n_channels() > 1) {
-                       std::stringstream foo;
-                       foo << region->n_channels ();
-                       str += " [";
-                       str += foo.str();
-                       str += "]";
-               }
-
-               row[_columns.name] = str;
+               populate_row_name (region, row);
                row[_columns.region] = region;
                row[_columns.property_toggles_visible] = false;
 
                if (missing_source) {
-                       row[_columns.path] = _("(MISSING) ") + Glib::Markup::escape_text (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] = Glib::Markup::escape_text (fs->path());
+                               row[_columns.path] = Gtkmm2ext::markup_escape_text (fs->path());
                        } else {
-                               row[_columns.path] = Glib::Markup::escape_text (region->source()->name());
+                               row[_columns.path] = Gtkmm2ext::markup_escape_text (region->source()->name());
                        }
                }
 
@@ -433,7 +427,7 @@ EditorRegions::add_region (boost::shared_ptr<Region> region)
                        */
 
                        row = *(_model->insert (subrows.end()));
-                       
+
                } else {
                        row = *(_model->append());
                }
@@ -569,7 +563,7 @@ EditorRegions::selection_changed ()
                                        _change_connection.block (false);
                                }
                        }
-                       
+
                }
        } else {
                _editor->get_selection().clear_regions ();
@@ -949,9 +943,9 @@ 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]", Glib::Markup::escape_text (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] = Glib::Markup::escape_text (region->name());
+               row[_columns.name] = Gtkmm2ext::markup_escape_text (region->name());
        }
 }
 
@@ -959,9 +953,9 @@ 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 ") + Glib::Markup::escape_text (region->source()->name());
+               row[_columns.path] = _("MISSING ") + Gtkmm2ext::markup_escape_text (region->source()->name());
        } else {
-               row[_columns.path] = Glib::Markup::escape_text (region->source()->name());
+               row[_columns.path] = Gtkmm2ext::markup_escape_text (region->source()->name());
        }
 }
 
@@ -1247,7 +1241,7 @@ EditorRegions::drag_data_received (const RefPtr<Gdk::DragContext>& context,
                framepos_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) {
+               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);
@@ -1279,7 +1273,7 @@ EditorRegions::selection_filter (const RefPtr<TreeModel>& 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;
 
@@ -1289,6 +1283,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> region = (*iter)[_columns.region];
+
+                       if(region) {
+                               e->set_text(region->name());
+                       }
+               }
        }
 }
 
@@ -1298,11 +1301,11 @@ EditorRegions::name_edit (const std::string& path, const std::string& new_text)
        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 */
@@ -1316,8 +1319,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 */