persistent waveform shape setting.

[ardour.git] / gtk2_ardour / route_params_ui.cc

diff --git a/gtk2_ardour/route_params_ui.cc b/gtk2_ardour/route_params_ui.cc
index ca673954d45ad5dd77584f93ea9e97f8367bf0e7..76f3d4e264770fffcdfbaf80faafc78a911cfe04 100644 (file)
--- a/gtk2_ardour/route_params_ui.cc
+++ b/gtk2_ardour/route_params_ui.cc
@@ -20,7 +20,7 @@
 #include <algorithm>
 #include <inttypes.h>
 
-#include <glibmm/thread.h>
+#include <glibmm/threads.h>
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/window_title.h>
 
@@ -32,6 +32,7 @@
 #include "ardour/return.h"
 #include "ardour/route.h"
 #include "ardour/send.h"
+#include "ardour/internal_send.h"
 
 #include "ardour_ui.h"
 #include "gui_thread.h"
@@ -146,11 +147,7 @@ RouteParams_UI::RouteParams_UI ()
        add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK|Gdk::BUTTON_RELEASE_MASK);
 
        _plugin_selector = new PluginSelector (PluginManager::instance());
-       _plugin_selector->signal_delete_event().connect (sigc::bind (ptr_fun (just_hide_it),
-                                                    static_cast<Window *> (_plugin_selector)));
-
-
-       signal_delete_event().connect(sigc::bind(ptr_fun(just_hide_it), static_cast<Gtk::Window *>(this)));
+       show_all();
 }
 
 RouteParams_UI::~RouteParams_UI ()
@@ -165,7 +162,7 @@ RouteParams_UI::add_routes (RouteList& routes)
        for (RouteList::iterator x = routes.begin(); x != routes.end(); ++x) {
                boost::shared_ptr<Route> route = (*x);
 
-               if (route->is_hidden()) {
+               if (route->is_auditioner()) {
                        return;
                }
 
@@ -280,7 +277,7 @@ RouteParams_UI::cleanup_latency_frame ()
 void
 RouteParams_UI::setup_latency_frame ()
 {
-       latency_widget = new LatencyGUI (*(_route->output()), _session->frame_rate(), _session->engine().frames_per_cycle());
+       latency_widget = new LatencyGUI (*(_route->output()), _session->frame_rate(), AudioEngine::instance()->samples_per_cycle());
 
        char buf[128];
        snprintf (buf, sizeof (buf), _("Playback delay: %" PRId64 " samples"), _route->initial_delay());
@@ -514,7 +511,12 @@ RouteParams_UI::redirect_selected (boost::shared_ptr<ARDOUR::Processor> proc)
        boost::shared_ptr<PluginInsert> plugin_insert;
        boost::shared_ptr<PortInsert> port_insert;
 
-       if ((send = boost::dynamic_pointer_cast<Send> (proc)) != 0) {
+       if ((boost::dynamic_pointer_cast<InternalSend> (proc)) != 0) {
+               cleanup_view();
+               _processor.reset ((Processor*) 0);
+               update_title();
+               return;
+       } else if ((send = boost::dynamic_pointer_cast<Send> (proc)) != 0) {
 
                SendUI *send_ui = new SendUI (this, send, _session);