ardour/livetrax
13
0
Fork 0
Code

LTC Slave cleanup

Browse Source 
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
This commit is contained in:
Robin Gareus 2012-10-21 14:07:07 +00:00
parent 7f8d2e32da
commit 4c13d205d4
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/ardour/ardour/slave.h
View File

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

1
libs/ardour/audioengine.cc
View File

@ -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 */

8
libs/ardour/ltc_slave.cc
View File

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