diff options
| -rw-r--r-- | gtk2_ardour/rc_option_editor.cc | 1 | ||||
| -rw-r--r-- | libs/ardour/ardour/rc_configuration_vars.h | 1 | ||||
| -rw-r--r-- | libs/ardour/ltc_slave.cc | 12 |
3 files changed, 2 insertions, 12 deletions
diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc index 4306dc627e..d2d99267aa 100644 --- a/gtk2_ardour/rc_option_editor.cc +++ b/gtk2_ardour/rc_option_editor.cc @@ -3249,7 +3249,6 @@ RCOptionEditor::RCOptionEditor () add_option (_("Sync/LTC"), _ltc_volume_slider); - add_option (_("Sync/MIDI"), new OptionEditorHeading (_("MIDI Beat Clock (Mclk) Generator"))); add_option (_("Sync/MIDI"), diff --git a/libs/ardour/ardour/rc_configuration_vars.h b/libs/ardour/ardour/rc_configuration_vars.h index cb9642e2e1..48fd3a72a8 100644 --- a/libs/ardour/ardour/rc_configuration_vars.h +++ b/libs/ardour/ardour/rc_configuration_vars.h @@ -69,7 +69,6 @@ CONFIG_VARIABLE (bool, midi_input_follows_selection, "midi-input-follows-selecti /* Timecode and related */ CONFIG_VARIABLE (bool, run_all_transport_masters_always, "run-all-transport-masters-always", true) -CONFIG_VARIABLE (bool, use_session_timecode_format, "use-session-timecode-format", true) CONFIG_VARIABLE (int, mtc_qf_speed_tolerance, "mtc-qf-speed-tolerance", 5) CONFIG_VARIABLE (bool, timecode_sync_frame_rate, "timecode-sync-frame-rate", true) #ifdef USE_TRACKS_CODE_FEATURES diff --git a/libs/ardour/ltc_slave.cc b/libs/ardour/ltc_slave.cc index 4adeae2ca9..b7b3ace928 100644 --- a/libs/ardour/ltc_slave.cc +++ b/libs/ardour/ltc_slave.cc @@ -98,10 +98,6 @@ LTC_TransportMaster::set_session (Session *s) ltc_timecode = _session->config.get_timecode_format(); a3e_timecode = _session->config.get_timecode_format(); - if (Config->get_use_session_timecode_format() && _session) { - samples_per_timecode_frame = _session->samples_per_timecode_frame(); - } - if (decoder) { ltc_decoder_free (decoder); } @@ -351,11 +347,7 @@ LTC_TransportMaster::detect_ltc_fps(int frameno, bool df) ltc_timecode = tc_format; a3e_timecode = cur_timecode; - if (Config->get_use_session_timecode_format() && _session) { - samples_per_timecode_frame = _session->samples_per_timecode_frame(); - } else { - samples_per_timecode_frame = ENGINE->sample_rate() / Timecode::timecode_to_frames_per_second (ltc_timecode); - } + samples_per_timecode_frame = ENGINE->sample_rate() / Timecode::timecode_to_frames_per_second (ltc_timecode); return fps_changed; } @@ -454,7 +446,7 @@ LTC_TransportMaster::process_ltc(samplepos_t const now) samplepos_t ltc_sample; // audio-sample corresponding to position of LTC frame - if (_session && Config->get_use_session_timecode_format()) { + if (_session) { Timecode::timecode_to_sample (timecode, ltc_sample, true, false, (double)ENGINE->sample_rate(), _session->config.get_subframes_per_frame(), timecode_negative_offset, timecode_offset); } else { Timecode::timecode_to_sample (timecode, ltc_sample, true, false, (double)ENGINE->sample_rate(), 100, timecode_negative_offset, timecode_offset); |