summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2012-10-25 20:21:17 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2012-10-25 20:21:17 +0000
commit974085807e8a270e9dd1bd51ad71b200524c26e0 (patch)
tree25fbc598d0a864da20db703fd5ba0dd4856893cf /libs
parent7b818e9a7f3d999eb6bcc90c961d2b42531c3917 (diff)
fix some issues with previous commit that were not properly tested because HAVE_LTC was undefined in my test build
git-svn-id: svn://localhost/ardour2/branches/3.0@13342 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
-rw-r--r--libs/ardour/audioengine.cc9
-rw-r--r--libs/ardour/ltc_slave.cc2
-rw-r--r--libs/ardour/session_ltc.cc2
3 files changed, 2 insertions, 11 deletions
diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc
index 2c57949074..69d232079c 100644
--- a/libs/ardour/audioengine.cc
+++ b/libs/ardour/audioengine.cc
@@ -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);
diff --git a/libs/ardour/ltc_slave.cc b/libs/ardour/ltc_slave.cc
index 49f0378ee6..559fdceb96 100644
--- a/libs/ardour/ltc_slave.cc
+++ b/libs/ardour/ltc_slave.cc
@@ -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);
diff --git a/libs/ardour/session_ltc.cc b/libs/ardour/session_ltc.cc
index c10e62659c..01386880f0 100644
--- a/libs/ardour/session_ltc.cc
+++ b/libs/ardour/session_ltc.cc
@@ -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;