fix computation of Text bounding box to respect _clamped_width

[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 64e78c21253e91cbce91a30944bd14bb19b4ea6b..76f3d4e264770fffcdfbaf80faafc78a911cfe04 100644 (file)
--- a/gtk2_ardour/route_params_ui.cc
+++ b/gtk2_ardour/route_params_ui.cc
@@ -18,17 +18,13 @@
 */
 
 #include <algorithm>
-#define __STDC_FORMAT_MACROS
 #include <inttypes.h>
 
-#include <glibmm/thread.h>
+#include <glibmm/threads.h>
 #include <gtkmm2ext/utils.h>
-#include <gtkmm2ext/stop_signal.h>
 #include <gtkmm2ext/window_title.h>
 
-#include "ardour/ardour.h"
-#include "ardour/audio_diskstream.h"
-#include "ardour/audio_track.h"
+#include "ardour/audioengine.h"
 #include "ardour/plugin.h"
 #include "ardour/plugin_insert.h"
 #include "ardour/plugin_manager.h"
@@ -36,15 +32,14 @@
 #include "ardour/return.h"
 #include "ardour/route.h"
 #include "ardour/send.h"
-#include "ardour/session.h"
-#include "ardour/session.h"
-#include "ardour/session_route.h"
+#include "ardour/internal_send.h"
 
 #include "ardour_ui.h"
 #include "gui_thread.h"
 #include "io_selector.h"
 #include "keyboard.h"
 #include "mixer_strip.h"
+#include "port_insert_ui.h"
 #include "plugin_selector.h"
 #include "plugin_ui.h"
 #include "return_ui.h"
@@ -60,7 +55,7 @@ using namespace Gtk;
 using namespace Gtkmm2ext;
 
 RouteParams_UI::RouteParams_UI ()
-       : ArdourDialog (_("Tracks and Busses")),
+       : ArdourWindow (_("Tracks and Busses")),
          latency_apply_button (Stock::APPLY),
          track_menu(0)
 {
@@ -138,12 +133,12 @@ RouteParams_UI::RouteParams_UI ()
 
        //global_vpacker.pack_start (list_hpane, true, true);
        //get_vbox()->pack_start (global_vpacker);
-       get_vbox()->pack_start (list_hpane);
+       add (list_hpane);
 
 
        set_name ("RouteParamsWindow");
        set_default_size (620,370);
-       set_wmclass (X_("ardour_route_parameters"), "Ardour");
+       set_wmclass (X_("ardour_route_parameters"), PROGRAM_NAME);
 
        // events
        route_display.get_selection()->signal_changed().connect(sigc::mem_fun(*this, &RouteParams_UI::route_selected));
@@ -151,12 +146,8 @@ RouteParams_UI::RouteParams_UI ()
 
        add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK|Gdk::BUTTON_RELEASE_MASK);
 
-       _plugin_selector = new PluginSelector (PluginManager::the_manager());
-       _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)));
+       _plugin_selector = new PluginSelector (PluginManager::instance());
+       show_all();
 }
 
 RouteParams_UI::~RouteParams_UI ()
@@ -171,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;
                }
 
@@ -181,7 +172,7 @@ RouteParams_UI::add_routes (RouteList& routes)
 
                //route_select_list.rows().back().select ();
 
-               route->PropertyChanged.connect (*this, invalidator (*this), ui_bind (&RouteParams_UI::route_property_changed, this, _1, boost::weak_ptr<Route>(route)), gui_context());
+               route->PropertyChanged.connect (*this, invalidator (*this), boost::bind (&RouteParams_UI::route_property_changed, this, _1, boost::weak_ptr<Route>(route)), gui_context());
                route->DropReferences.connect (*this, invalidator (*this), boost::bind (&RouteParams_UI::route_removed, this, boost::weak_ptr<Route>(route)), gui_context());
        }
 }
@@ -196,7 +187,7 @@ RouteParams_UI::route_property_changed (const PropertyChange& what_changed, boos
 
        boost::shared_ptr<Route> route (wr.lock());
 
-       if (!route) { 
+       if (!route) {
                return;
        }
 
@@ -261,7 +252,7 @@ RouteParams_UI::refresh_latency ()
                latency_widget->refresh();
 
                char buf[128];
-               snprintf (buf, sizeof (buf), _("Playback delay: %u samples"), _route->initial_delay());
+               snprintf (buf, sizeof (buf), _("Playback delay: %" PRId64 " samples"), _route->initial_delay());
                delay_label.set_text (buf);
        }
 }
@@ -279,17 +270,17 @@ RouteParams_UI::cleanup_latency_frame ()
 
                delete latency_widget;
                latency_widget = 0;
-               
+
        }
 }
 
 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: %u samples"), _route->initial_delay());
+       snprintf (buf, sizeof (buf), _("Playback delay: %" PRId64 " samples"), _route->initial_delay());
        delay_label.set_text (buf);
 
        latency_packer.pack_start (*latency_widget, false, false);
@@ -363,7 +354,7 @@ RouteParams_UI::route_removed (boost::weak_ptr<Route> wr)
 {
        boost::shared_ptr<Route> route (wr.lock());
 
-       if (!route) { 
+       if (!route) {
                return;
        }
 
@@ -395,15 +386,15 @@ RouteParams_UI::route_removed (boost::weak_ptr<Route> wr)
 void
 RouteParams_UI::set_session (Session *sess)
 {
-       ArdourDialog::set_session (sess);
-       
+       ArdourWindow::set_session (sess);
+
        route_display_model->clear();
        _plugin_selector->set_session (_session);
 
        if (_session) {
                boost::shared_ptr<RouteList> r = _session->get_routes();
                add_routes (*r);
-               _session->RouteAdded.connect (_session_connections, invalidator (*this), ui_bind (&RouteParams_UI::add_routes, this, _1), gui_context());
+               _session->RouteAdded.connect (_session_connections, invalidator (*this), boost::bind (&RouteParams_UI::add_routes, this, _1), gui_context());
                start_updating ();
        } else {
                stop_updating ();
@@ -462,8 +453,8 @@ RouteParams_UI::route_selected()
                setup_processor_boxes();
                setup_latency_frame ();
 
-               route->processors_changed.connect (_route_processors_connection, invalidator (*this), ui_bind (&RouteParams_UI::processors_changed, this, _1), gui_context());
-               
+               route->processors_changed.connect (_route_processors_connection, invalidator (*this), boost::bind (&RouteParams_UI::processors_changed, this, _1), gui_context());
+
                track_input_label.set_text (_route->name());
 
                update_title();
@@ -488,9 +479,8 @@ RouteParams_UI::route_selected()
 }
 
 void
-RouteParams_UI::processors_changed (RouteProcessorChange c)
+RouteParams_UI::processors_changed (RouteProcessorChange)
 {
-       ENSURE_GUI_THREAD (*this, &RouteParams_UI::processors_changed, c)
        cleanup_view();
 
        _processor.reset ((Processor*) 0);
@@ -521,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);