diff options
Diffstat (limited to 'libs/ardour/session_state.cc')
| -rw-r--r-- | libs/ardour/session_state.cc | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc index 4b0a0d9e92..1335c554cb 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -127,6 +127,7 @@ #include "ardour/template_utils.h" #include "ardour/tempo.h" #include "ardour/ticker.h" +#include "ardour/transport_master_manager.h" #include "ardour/types_convert.h" #include "ardour/user_bundle.h" #include "ardour/vca.h" @@ -1479,12 +1480,7 @@ Session::state (bool save_template, snapshot_t snapshot_type, bool only_used_ass gain_child->add_child_nocopy (_click_gain->get_state ()); } - if (_ltc_input) { - XMLNode* ltc_input_child = node->add_child ("LTC-In"); - ltc_input_child->add_child_nocopy (_ltc_input->get_state ()); - } - - if (_ltc_input) { + if (_ltc_output) { XMLNode* ltc_output_child = node->add_child ("LTC-Out"); ltc_output_child->add_child_nocopy (_ltc_output->get_state ()); } @@ -1523,8 +1519,7 @@ Session::state (bool save_template, snapshot_t snapshot_type, bool only_used_ass XMLNode& Session::get_control_protocol_state () { - ControlProtocolManager& cpm (ControlProtocolManager::instance()); - return cpm.get_state(); + return ControlProtocolManager::instance().get_state (); } int @@ -4103,11 +4098,7 @@ Session::config_changed (std::string p, bool ours) first_file_data_format_reset = false; } else if (p == "external-sync") { - if (!config.get_external_sync()) { - drop_sync_source (); - } else { - switch_to_sync_source (Config->get_sync_source()); - } + request_sync_source (TransportMasterManager::instance().master_by_type (Config->get_sync_source())); } else if (p == "denormal-model") { setup_fpu (); } else if (p == "history-depth") { @@ -4138,8 +4129,6 @@ Session::config_changed (std::string p, bool ours) last_timecode_valid = false; } else if (p == "playback-buffer-seconds") { AudioSource::allocate_working_buffers (sample_rate()); - } else if (p == "ltc-source-port") { - reconnect_ltc_input (); } else if (p == "ltc-sink-port") { reconnect_ltc_output (); } else if (p == "timecode-generator-offset") { |