diff options
| -rw-r--r-- | gtk2_ardour/route_params_ui.cc | 7 | ||||
| -rw-r--r-- | libs/ardour/ardour/route.h | 6 | ||||
| -rw-r--r-- | libs/ardour/luabindings.cc | 1 | ||||
| -rw-r--r-- | libs/ardour/route.cc | 2 |
4 files changed, 7 insertions, 9 deletions
diff --git a/gtk2_ardour/route_params_ui.cc b/gtk2_ardour/route_params_ui.cc index 706ac2a536..1e19f1c7df 100644 --- a/gtk2_ardour/route_params_ui.cc +++ b/gtk2_ardour/route_params_ui.cc @@ -269,7 +269,7 @@ RouteParams_UI::refresh_latency () latency_widget->refresh(); char buf[128]; - snprintf (buf, sizeof (buf), _("Playback delay: %" PRId64 " samples"), _route->initial_delay()); + snprintf (buf, sizeof (buf), _("Latency: %" PRId64 " samples"), _route->signal_latency ()); delay_label.set_text (buf); } } @@ -297,7 +297,7 @@ RouteParams_UI::setup_latency_frame () latency_widget = new LatencyGUI (*(_route->output()), _session->sample_rate(), AudioEngine::instance()->samples_per_cycle()); char buf[128]; - snprintf (buf, sizeof (buf), _("Playback delay: %" PRId64 " samples"), _route->initial_delay()); + snprintf (buf, sizeof (buf), _("Latency: %" PRId64 " samples"), _route->signal_latency()); delay_label.set_text (buf); latency_packer.pack_start (*latency_widget, false, false); @@ -305,8 +305,7 @@ RouteParams_UI::setup_latency_frame () latency_packer.pack_start (delay_label); latency_click_connection = latency_apply_button.signal_clicked().connect (sigc::mem_fun (*latency_widget, &LatencyGUI::finish)); - _route->signal_latency_changed.connect (latency_connections, invalidator (*this), boost::bind (&RouteParams_UI::refresh_latency, this), gui_context()); - _route->initial_delay_changed.connect (latency_connections, invalidator (*this), boost::bind (&RouteParams_UI::refresh_latency, this), gui_context()); + _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 (); diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h index 6c48964f3f..e726e2c77b 100644 --- a/libs/ardour/ardour/route.h +++ b/libs/ardour/ardour/route.h @@ -348,7 +348,6 @@ public: virtual void set_latency_compensation (samplecnt_t); void set_user_latency (samplecnt_t); - samplecnt_t initial_delay() const { return _initial_delay; } samplecnt_t signal_latency() const { return _signal_latency; } PBD::Signal0<void> active_changed; @@ -387,7 +386,8 @@ public: PBD::Signal0<void> meter_change; /** a processor's latency has changed */ PBD::Signal0<void> signal_latency_changed; - PBD::Signal0<void> initial_delay_changed; + /** route has updated its latency compensation */ + PBD::Signal0<void> signal_latency_updated; /** Emitted with the process lock held */ PBD::Signal0<void> io_changed; @@ -623,7 +623,7 @@ public: bool _active; samplecnt_t _signal_latency; - samplecnt_t _initial_delay; + samplecnt_t _initial_delay; // remove me ProcessorList _processors; mutable Glib::Threads::RWLock _processor_lock; diff --git a/libs/ardour/luabindings.cc b/libs/ardour/luabindings.cc index 7f13fc5abf..58cd71c8a8 100644 --- a/libs/ardour/luabindings.cc +++ b/libs/ardour/luabindings.cc @@ -1062,7 +1062,6 @@ LuaBindings::common (lua_State* L) .addFunction ("trim", &Route::trim) .addFunction ("peak_meter", (boost::shared_ptr<PeakMeter> (Route::*)())&Route::peak_meter) .addFunction ("set_meter_point", &Route::set_meter_point) - .addFunction ("initial_delay", &Route::initial_delay) .addFunction ("signal_latency", &Route::signal_latency) .endClass () diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc index 20435cdbf4..75380b2414 100644 --- a/libs/ardour/route.cc +++ b/libs/ardour/route.cc @@ -3941,7 +3941,7 @@ Route::set_latency_compensation (samplecnt_t longest_session_latency) name(), longest_session_latency, _signal_latency, _initial_delay)); if (_initial_delay != old) { - initial_delay_changed (); /* EMIT SIGNAL */ + //initial_delay_changed (); /* EMIT SIGNAL */ } } |