ardour/livetrax
13
0
Fork 0
Code

Change LTC Generator from IO to Port

Browse Source 
This is done in order to set the TransportGenerator flag
This commit is contained in:
Robin Gareus 2020-05-07 19:49:11 +02:00
parent f1dafe7632
commit 7b28aabb43
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
3 changed files with 13 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/ardour/ardour/session.h
View File

@ -1233,9 +1233,7 @@ public:
boost::shared_ptr<MidiPort> midi_clock_output_port () const;
boost::shared_ptr<MidiPort> mtc_output_port () const;
boost::shared_ptr<Port> ltc_output_port() const;
boost::shared_ptr<IO> ltc_output_io() { return _ltc_output; }
boost::shared_ptr<Port> ltc_output_port() const { return _ltc_output_port; }
MIDI::MachineControl& mmc() { return *_mmc; }
@ -2133,7 +2131,7 @@ private:
MidiClockTicker* midi_clock;
boost::shared_ptr<IO> _ltc_output;
boost::shared_ptr<Port> _ltc_output_port;
boost::shared_ptr<RTTaskList> _rt_tasklist;

38
libs/ardour/session.cc
View File

@ -569,6 +569,9 @@ Session::destroy ()
{
Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
ltc_tx_cleanup();
if (_ltc_output_port) {
AudioEngine::instance()->unregister_port (_ltc_output_port);
}
}
/* disconnect from any and all signals that we are connected to */
@ -594,7 +597,6 @@ Session::destroy ()
/* remove I/O objects that we (the session) own */
_click_io.reset ();
_ltc_output.reset ();
{
Glib::Threads::Mutex::Lock lm (controllables_lock);
@ -801,24 +803,13 @@ Session::setup_ltc ()
{
XMLNode* child = 0;
_ltc_output.reset (new IO (*this, X_("LTC Out"), IO::Output));
_ltc_output_port = AudioEngine::instance()->register_output_port (DataType::AUDIO, X_("LTC-Out"), false, TransportGenerator);
if (state_tree && (child = find_named_node (*state_tree->root(), X_("LTC Out"))) != 0) {
_ltc_output->set_state (*(child->children().front()), Stateful::loading_state_version);
} else {
{
Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
_ltc_output->ensure_io (ChanCount (DataType::AUDIO, 1), true, this);
// TODO use auto-connect thread
reconnect_ltc_output ();
}
{
Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
/* TODO use auto-connect thread */
reconnect_ltc_output ();
}
/* fix up names of LTC ports because we don't want the normal
* IO style of NAME/TYPE-{in,out}N
*/
_ltc_output->nth (0)->set_name (X_("LTC-out"));
}
void
@ -6814,23 +6805,16 @@ Session::operation_in_progress (GQuark op) const
return (find (_current_trans_quarks.begin(), _current_trans_quarks.end(), op) != _current_trans_quarks.end());
}
boost::shared_ptr<Port>
Session::ltc_output_port () const
{
return _ltc_output ? _ltc_output->nth (0) : boost::shared_ptr<Port> ();
}
void
Session::reconnect_ltc_output ()
{
if (_ltc_output) {
if (_ltc_output_port) {
string src = Config->get_ltc_output_port();
_ltc_output->disconnect (this);
_ltc_output_port->disconnect_all ();
if (src != _("None") && !src.empty()) {
_ltc_output->nth (0)->connect (src);
_ltc_output_port->connect (src);
}
}
}

5
libs/ardour/session_state.cc
View File

@ -1500,11 +1500,6 @@ Session::state (bool save_template, snapshot_t snapshot_type, bool only_used_ass
gain_child->add_child_nocopy (_click_gain->get_state ());
}
if (_ltc_output) {
XMLNode* ltc_output_child = node->add_child ("LTC-Out");
ltc_output_child->add_child_nocopy (_ltc_output->get_state ());
}
node->add_child_nocopy (_speakers->get_state());
node->add_child_nocopy (_tempo_map->get_state());
node->add_child_nocopy (get_control_protocol_state());