summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gtk2_ardour/mixer_strip.cc3
-rw-r--r--gtk2_ardour/route_params_ui.cc54
-rw-r--r--gtk2_ardour/route_params_ui.h12
-rw-r--r--gtk2_ardour/route_ui.cc7
-rw-r--r--gtk2_ardour/route_ui.h1
5 files changed, 0 insertions, 77 deletions
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index ce89d5b18b..27769d9169 100644
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -1764,9 +1764,6 @@ MixerStrip::build_route_ops_menu ()
}
items.push_back (SeparatorElem());
- items.push_back (MenuElem (_("Adjust Latency..."), sigc::mem_fun (*this, &RouteUI::adjust_latency)));
-
- items.push_back (SeparatorElem());
items.push_back (CheckMenuElem (_("Protect Against Denormals"), sigc::mem_fun (*this, &RouteUI::toggle_denormal_protection)));
denormal_menu_item = dynamic_cast<Gtk::CheckMenuItem *> (&items.back());
denormal_menu_item->set_active (_route->denormal_protection());
diff --git a/gtk2_ardour/route_params_ui.cc b/gtk2_ardour/route_params_ui.cc
index b714ae4fc4..4ad1f2409d 100644
--- a/gtk2_ardour/route_params_ui.cc
+++ b/gtk2_ardour/route_params_ui.cc
@@ -69,13 +69,11 @@ RouteParams_UI::RouteParams_UI ()
_input_iosel = 0;
_output_iosel = 0;
_active_view = 0;
- latency_widget = 0;
using namespace Notebook_Helpers;
input_frame.set_shadow_type(Gtk::SHADOW_NONE);
output_frame.set_shadow_type(Gtk::SHADOW_NONE);
- latency_frame.set_shadow_type (Gtk::SHADOW_NONE);
notebook.set_show_tabs (true);
notebook.set_show_border (true);
@@ -108,16 +106,12 @@ RouteParams_UI::RouteParams_UI ()
notebook.pages().push_back (TabElem (input_frame, _("Inputs")));
notebook.pages().push_back (TabElem (output_frame, _("Outputs")));
notebook.pages().push_back (TabElem (redir_hpane, _("Plugins, Inserts & Sends")));
- notebook.pages().push_back (TabElem (latency_frame, _("Latency")));
notebook.set_name ("InspectorNotebook");
title_label.set_name ("RouteParamsTitleLabel");
update_title();
- latency_packer.set_spacing (18);
- delay_label.set_alignment (0, 0.5);
-
// changeable area
route_param_frame.set_name("RouteParamsBaseFrame");
route_param_frame.set_shadow_type (Gtk::SHADOW_IN);
@@ -270,50 +264,6 @@ RouteParams_UI::cleanup_processor_boxes()
}
void
-RouteParams_UI::refresh_latency ()
-{
- if (latency_widget) {
- latency_widget->refresh();
-
- char buf[128];
- snprintf (buf, sizeof (buf), _("Latency: %" PRId64 " samples"), _route->signal_latency ());
- delay_label.set_text (buf);
- }
-}
-
-void
-RouteParams_UI::cleanup_latency_frame ()
-{
- if (latency_widget) {
- latency_frame.remove ();
- latency_packer.remove (*latency_widget);
- latency_packer.remove (delay_label);
- latency_connections.drop_connections ();
- latency_click_connection.disconnect ();
-
- delete latency_widget;
- latency_widget = 0;
-
- }
-}
-
-void
-RouteParams_UI::setup_latency_frame ()
-{
- latency_widget = new LatencyGUI (*(_route->output()), _session->sample_rate(), AudioEngine::instance()->samples_per_cycle());
-
- refresh_latency ();
-
- latency_packer.pack_start (*latency_widget, false, false);
- latency_packer.pack_start (delay_label, false, false);
-
- _route->signal_latency_updated.connect (latency_connections, invalidator (*this), boost::bind (&RouteParams_UI::refresh_latency, this), gui_context());
-
- latency_frame.add (latency_packer);
- latency_frame.show_all ();
-}
-
-void
RouteParams_UI::setup_io_selector()
{
cleanup_io_selector();
@@ -431,7 +381,6 @@ RouteParams_UI::session_going_away ()
cleanup_io_selector();
cleanup_view();
cleanup_processor_boxes();
- cleanup_latency_frame ();
_route.reset ((Route*) 0);
_processor.reset ((Processor*) 0);
@@ -459,7 +408,6 @@ RouteParams_UI::route_selected()
cleanup_processor_boxes();
cleanup_view();
cleanup_io_selector();
- cleanup_latency_frame ();
}
// update the other panes with the correct info
@@ -468,7 +416,6 @@ RouteParams_UI::route_selected()
setup_io_selector();
setup_processor_boxes();
- setup_latency_frame ();
route->processors_changed.connect (_route_processors_connection, invalidator (*this), boost::bind (&RouteParams_UI::processors_changed, this, _1), gui_context());
@@ -485,7 +432,6 @@ RouteParams_UI::route_selected()
cleanup_io_selector();
cleanup_view();
cleanup_processor_boxes();
- cleanup_latency_frame ();
_route.reset ((Route*) 0);
_processor.reset ((Processor*) 0);
diff --git a/gtk2_ardour/route_params_ui.h b/gtk2_ardour/route_params_ui.h
index 3c8a0ead10..7dd00bc34c 100644
--- a/gtk2_ardour/route_params_ui.h
+++ b/gtk2_ardour/route_params_ui.h
@@ -44,7 +44,6 @@
#include "ardour_window.h"
#include "processor_box.h"
#include "processor_selection.h"
-#include "latency_gui.h"
namespace ARDOUR {
class Route;
@@ -93,15 +92,6 @@ private:
Gtk::VBox choice_vpacker;
- Gtk::Frame latency_frame;
- Gtk::VBox latency_packer;
- LatencyGUI* latency_widget;
- Gtk::Label delay_label;
-
- PBD::ScopedConnectionList latency_connections;
- sigc::connection latency_click_connection;
-
- void refresh_latency ();
Gtk::ToggleButton input_button;
Gtk::ToggleButton output_button;
@@ -163,8 +153,6 @@ private:
void setup_io_selector();
void cleanup_io_selector();
void cleanup_view(bool stopupdate = true);
- void cleanup_latency_frame ();
- void setup_latency_frame ();
void processors_changed (ARDOUR::RouteProcessorChange);
diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index 78f7ea2e02..2fdecbc5ec 100644
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -1927,13 +1927,6 @@ RouteUI::map_frozen ()
}
void
-RouteUI::adjust_latency ()
-{
- LatencyDialog dialog (_route->name() + _(" latency"), *(_route->output()), _session->sample_rate(), AudioEngine::instance()->samples_per_cycle());
-}
-
-
-void
RouteUI::save_as_template_dialog_response (int response, SaveTemplateDialog* d)
{
if (response == RESPONSE_ACCEPT) {
diff --git a/gtk2_ardour/route_ui.h b/gtk2_ardour/route_ui.h
index eafa161144..82a0ee1ec4 100644
--- a/gtk2_ardour/route_ui.h
+++ b/gtk2_ardour/route_ui.h
@@ -251,7 +251,6 @@ public:
virtual void map_frozen ();
- void adjust_latency ();
void save_as_template_dialog_response (int response, SaveTemplateDialog* d);
void save_as_template ();