Prepare changing LTC Generator <IO> to <Port>

This commit is contained in:
Robin Gareus 2020-05-07 18:00:48 +02:00
parent d9caa7fd9a
commit f1dafe7632
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
2 changed files with 3 additions and 15 deletions

View file

@ -459,11 +459,6 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp
program->add_bundle (session->the_auditioner()->output()->bundle());
program->add_bundle (session->click_io()->bundle());
/* Note: the LTC ports do not have the usual ":audio_out 1" postfix, so
* program->add_bundle (session->ltc_output_io()->bundle());
* won't work
*/
boost::shared_ptr<Bundle> ltc (new Bundle (_("LTC Out"), inputs));
ltc->add_channel (_("LTC Out"), DataType::AUDIO, session->engine().make_port_name_non_relative (session->ltc_output_port()->name()));
program->add_bundle (ltc);

View file

@ -1393,11 +1393,7 @@ private:
if (!_shp->session()) {
return;
}
boost::shared_ptr<IO> ltc_io = _shp->session()->ltc_output_io();
if (!ltc_io) {
return;
}
boost::shared_ptr<Port> ltc_port = ltc_io->nth (0);
boost::shared_ptr<Port> ltc_port = _shp->session()->ltc_output_port ();
if (!ltc_port) {
return;
}
@ -1405,7 +1401,7 @@ private:
return;
}
ltc_io->disconnect (this);
ltc_port->disconnect_all ();
if (!new_port.empty()) {
ltc_port->connect (new_port);
}
@ -1447,10 +1443,7 @@ private:
std::string const& pn = _rc_config->get_ltc_output_port ();
boost::shared_ptr<Port> ltc_port;
if (_shp->session()) {
boost::shared_ptr<IO> ltc_io = _shp->session()->ltc_output_io();
if (ltc_io) {
ltc_port = ltc_io->nth (0);
}
ltc_port = _shp->session()->ltc_output_port ();
}
PBD::Unwinder<bool> uw (_ignore_change, true);