ardour/livetrax
13
0
Fork 0
Code

LTC slave/gen latency compensation: jack2 got fixed, remove #ifdef

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@13368 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Robin Gareus 2012-10-30 09:50:35 +00:00
parent 5a7e5fc8d5
commit e7cc4d19ba
2 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libs/ardour/ltc_slave.cc
View File

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

13
libs/ardour/session_ltc.cc
View File

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