summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
Diffstat (limited to 'libs')
-rw-r--r--libs/ardour/ardour/slave.h2
-rw-r--r--libs/ardour/audioengine.cc1
-rw-r--r--libs/ardour/ltc_slave.cc8
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)