From f1dafe76321d076899c5d4749633c8dc3f1ba560 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Thu, 7 May 2020 18:00:48 +0200 Subject: Prepare changing LTC Generator to --- gtk2_ardour/port_group.cc | 5 ----- gtk2_ardour/rc_option_editor.cc | 13 +++---------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/gtk2_ardour/port_group.cc b/gtk2_ardour/port_group.cc index f30fff2751..c87fa0fcd0 100644 --- a/gtk2_ardour/port_group.cc +++ b/gtk2_ardour/port_group.cc @@ -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 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); diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc index b323c1c0e6..d7d8854ae7 100644 --- a/gtk2_ardour/rc_option_editor.cc +++ b/gtk2_ardour/rc_option_editor.cc @@ -1393,11 +1393,7 @@ private: if (!_shp->session()) { return; } - boost::shared_ptr ltc_io = _shp->session()->ltc_output_io(); - if (!ltc_io) { - return; - } - boost::shared_ptr ltc_port = ltc_io->nth (0); + boost::shared_ptr 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 ltc_port; if (_shp->session()) { - boost::shared_ptr 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 uw (_ignore_change, true); -- cgit v1.2.3