Prepare removal of initial_delay
This commit is contained in:
parent
3d1e1d7213
commit
69b9ad6bcc
|
@ -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 ();
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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 ()
|
||||
|
||||
|
|
|
@ -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 */
|
||||
}
|
||||
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user