Don't report an error when the user cancels a time stretch operation.

[ardour.git] / gtk2_ardour / processor_box.cc

diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc
index add816e40f13bab0812d899c24792ed86c57fe4d..e5d479b9ab5434829b00106f762898116af1710c 100644 (file)
--- a/gtk2_ardour/processor_box.cc
+++ b/gtk2_ardour/processor_box.cc
@@ -42,7 +42,6 @@
 
 #include "ardour/amp.h"
 #include "ardour/ardour.h"
-#include "ardour/audio_diskstream.h"
 #include "ardour/audio_track.h"
 #include "ardour/audioengine.h"
 #include "ardour/internal_send.h"
@@ -743,7 +742,8 @@ ProcessorBox::choose_plugin ()
        _get_plugin_selector()->set_interested_object (*this);
 }
 
-void
+/** @return true if an error occurred, otherwise false */
+bool
 ProcessorBox::use_plugins (const SelectedPlugins& plugins)
 {
        for (SelectedPlugins::const_iterator p = plugins.begin(); p != plugins.end(); ++p) {
@@ -758,6 +758,7 @@ ProcessorBox::use_plugins (const SelectedPlugins& plugins)
 
                if (_route->add_processor (processor, _placement, &err_streams)) {
                        weird_plugin_dialog (**p, err_streams);
+                       return true;
                        // XXX SHAREDPTR delete plugin here .. do we even need to care?
                } else {
 
@@ -766,12 +767,14 @@ ProcessorBox::use_plugins (const SelectedPlugins& plugins)
                        }
                }
        }
+
+       return false;
 }
 
 void
 ProcessorBox::weird_plugin_dialog (Plugin& p, Route::ProcessorStreams streams)
 {
-       ArdourDialog dialog (_("ardour: weird plugin dialog"));
+       ArdourDialog dialog (_("Plugin Incompatibility"));
        Label label;
 
        string text = string_compose(_("You attempted to add the plugin \"%1\" at index %2.\n"),
@@ -1242,11 +1245,27 @@ ProcessorBox::rename_processor (boost::shared_ptr<Processor> processor)
        case Gtk::RESPONSE_ACCEPT:
                name_prompter.get_result (result);
                if (result.length()) {
-                       if (_session->route_by_name (result)) {
-                               ARDOUR_UI::instance()->popup_error (_("A track already exists with that name."));
-                               return;
-                       }
-                       processor->set_name (result);
+
+                       int tries = 0;
+                       string test = result;
+
+                       while (tries < 100) {
+                               if (_session->io_name_is_legal (test)) {
+                                       result = test;
+                                       break;
+                               }
+                               tries++;
+
+                               test = string_compose ("%1-%2", result, tries);
+                       }
+
+                       if (tries < 100) {
+                               processor->set_name (result);
+                       } else {
+                               /* unlikely! */
+                               ARDOUR_UI::instance()->popup_error
+                                       (string_compose (_("At least 100 IO objects exist with a name like %1 - name not changed"), result));
+                       }
                }
                break;
        }