From 4c13d205d4adc5dde130e199ea1f228ce670b588 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sun, 21 Oct 2012 14:07:07 +0000 Subject: [PATCH] LTC Slave cleanup initialize audioengine's ltc_port - if HAVE_LTC is not set trying to connect it would segfault. LTC frameno is < 40 by (two bit frame-ten's) git-svn-id: svn://localhost/ardour2/branches/3.0@13314 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/ardour/slave.h | 2 +- libs/ardour/audioengine.cc | 1 + libs/ardour/ltc_slave.cc | 8 +------- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/libs/ardour/ardour/slave.h b/libs/ardour/ardour/slave.h index 07e3fd0e1d..d63004ef07 100644 --- a/libs/ardour/ardour/slave.h +++ b/libs/ardour/ardour/slave.h @@ -341,7 +341,7 @@ public: framecnt_t resolution () const; bool requires_seekahead () const { return false; } - framecnt_t seekahead_distance() const; + framecnt_t seekahead_distance () const { return 0; } bool give_slave_full_control_over_transport_speed() const { return true; } Timecode::TimecodeFormat apparent_timecode_format() const; diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc index 338bc2fd0e..cc04c343e1 100644 --- a/libs/ardour/audioengine.cc +++ b/libs/ardour/audioengine.cc @@ -78,6 +78,7 @@ AudioEngine::AudioEngine (string client_name, string session_uuid) , port_remove_in_progress (false) , m_meter_thread (0) , _main_thread (0) + , _ltc_input () , ports (new Ports) { _instance = this; /* singleton */ diff --git a/libs/ardour/ltc_slave.cc b/libs/ardour/ltc_slave.cc index 39a97677a6..9153facb8c 100644 --- a/libs/ardour/ltc_slave.cc +++ b/libs/ardour/ltc_slave.cc @@ -76,12 +76,6 @@ LTC_Slave::resolution () const return (framecnt_t) (frames_per_ltc_frame); } -ARDOUR::framecnt_t -LTC_Slave::seekahead_distance () const -{ - return 0; -} - bool LTC_Slave::locked () const { @@ -135,7 +129,7 @@ LTC_Slave::detect_ltc_fps(int frameno, bool df) } ltc_detect_fps_cnt++; - if (ltc_detect_fps_cnt > 60) + if (ltc_detect_fps_cnt > 40) { if (ltc_detect_fps_cnt > ltc_detect_fps_max && ( ceil(timecode.rate) != (ltc_detect_fps_max + 1) -- 2.30.2