diff options
| author | Robin Gareus <robin@gareus.org> | 2012-10-30 09:50:35 +0000 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2012-10-30 09:50:35 +0000 |
| commit | e7cc4d19bae4bb0ba4eceff4cc71aa47efe345ea (patch) | |
| tree | 9d81dc753deea0a4df840eb005ce13a865a4f169 /libs/ardour | |
| parent | 5a7e5fc8d5aba7f857ff8df89fbb7c8bf25f380c (diff) | |
LTC slave/gen latency compensation: jack2 got fixed, remove #ifdef
git-svn-id: svn://localhost/ardour2/branches/3.0@13368 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour')
| -rw-r--r-- | libs/ardour/ltc_slave.cc | 13 | ||||
| -rw-r--r-- | libs/ardour/session_ltc.cc | 13 |
2 files changed, 0 insertions, 26 deletions
diff --git a/libs/ardour/ltc_slave.cc b/libs/ardour/ltc_slave.cc index f176c206a3..856f99771a 100644 --- a/libs/ardour/ltc_slave.cc +++ b/libs/ardour/ltc_slave.cc @@ -378,19 +378,6 @@ LTC_Slave::speed_and_position (double& speed, framepos_t& pos) boost::shared_ptr<Port> ltcport = session.ltc_input_port(); -#if 1 - /* TODO read layency only on demand -> ::reset() - * this is already prepared. - * - * ..but first fix jack2 issue with re-computing latency - * in the correct order. Until then, querying it in the - * process-callback is the only way to get the current value - * - * update: fix for this issue is known -- common/JackEngine.cpp - * but not yet applied to jack2 git. - */ - ltcport->get_connected_latency_range(ltc_slave_latency, false); -#endif in = (jack_default_audio_sample_t*) jack_port_get_buffer (ltcport->jack_port(), nframes); frameoffset_t skip = now - (monotonic_cnt + nframes); diff --git a/libs/ardour/session_ltc.cc b/libs/ardour/session_ltc.cc index d14756c0ba..599813760f 100644 --- a/libs/ardour/session_ltc.cc +++ b/libs/ardour/session_ltc.cc @@ -153,19 +153,6 @@ Session::ltc_tx_send_time_code_for_cycle (framepos_t start_frame, framepos_t end /* range from libltc (38..218) || - 128.0 -> (-90..90) */ const float ltcvol = Config->get_ltc_output_volume()/(90.0); // pow(10, db/20.0)/(90.0); -#if 1 - /* TODO read layency only on demand -> ::ltc_tx_reset() - * this is already prepared. - * - * ..but first fix jack2 issue with re-computing latency - * in the correct order. Until then, querying it in the - * process-callback is the only way to get the current value - * - * update: fix for this issue is known -- common/JackEngine.cpp - * but not yet applied to jack2 git. - */ - ltcport->get_connected_latency_range(ltc_out_latency, true); -#endif DEBUG_TRACE (DEBUG::LTC, string_compose("LTC TX %1 to %2 / %3 | lat: %4\n", start_frame, end_frame, nframes, ltc_out_latency.max)); /* all systems go. Now here's the plan: |