ardour/livetrax
13
0
Fork 0
Code

remove ill-conceived use-session-timecode-format option

Browse Source
This commit is contained in:
Paul Davis 2019-03-03 09:59:05 -07:00
parent e791966f75
commit 84aedbb532
3 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gtk2_ardour/rc_option_editor.cc
View File

@ -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"),

1
libs/ardour/ardour/rc_configuration_vars.h
View File

@ -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

12
libs/ardour/ltc_slave.cc
View File

@ -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);