smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-09 07:05:43 +01:00
Code Issues Projects Releases Wiki Activity

fix some issues with previous commit that were not properly tested because HAVE_LTC was undefined in my test build

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@13342 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-10-25 20:21:17 +00:00
parent 7b818e9a7f
commit 974085807e
3 changed files with 2 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

9
libs/ardour/audioengine.cc
View file

@ -521,15 +521,6 @@ AudioEngine::process_callback (pframes_t nframes)
}
if (_session == 0) {
#ifdef HAVE_LTC
// silence LTC
jack_default_audio_sample_t *out;
boost::shared_ptr<Port> ltcport = ltc_output_port();
if (ltcport && ltcport->jack_port()) {
out = (jack_default_audio_sample_t*) jack_port_get_buffer (ltcport->jack_port(), nframes);
if (out) memset(out, 0, nframes * sizeof(jack_default_audio_sample_t));
}
#endif
if (!_freewheeling) {
MIDI::Manager::instance()->cycle_start(nframes);

2
libs/ardour/ltc_slave.cc
View file

@ -350,7 +350,7 @@ LTC_Slave::speed_and_position (double& speed, framepos_t& pos)
jack_default_audio_sample_t *in;
jack_latency_range_t ltc_latency;
boost::shared_ptr<Port> ltcport = session.engine().ltc_input_port();
boost::shared_ptr<Port> ltcport = session.ltc_input_port();
ltcport->get_connected_latency_range(ltc_latency, false);
in = (jack_default_audio_sample_t*) jack_port_get_buffer (ltcport->jack_port(), nframes);

2
libs/ardour/session_ltc.cc
View file

@ -107,7 +107,7 @@ Session::ltc_tx_send_time_code_for_cycle (framepos_t start_frame, framepos_t end
jack_default_audio_sample_t *out;
pframes_t txf = 0;
boost::shared_ptr<Port> ltcport = engine().ltc_output_port();
boost::shared_ptr<Port> ltcport = ltc_output_port();
if (!ltc_encoder || !ltc_enc_buf || !ltcport || ! ltcport->jack_port()) return 0;