From 957d2e39c479608db8c060d9f3e8dc7fabe169de Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 23 Feb 2007 16:10:33 +0000 Subject: [PATCH] more complete fix for MTC time signal not providing FPS/drop values git-svn-id: svn://localhost/ardour2/trunk@1500 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/audio_playlist.cc | 2 +- libs/midi++2/midi++/parser.h | 4 ++-- libs/midi++2/mtc.cc | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libs/ardour/audio_playlist.cc b/libs/ardour/audio_playlist.cc index 51b11a9145..501482c840 100644 --- a/libs/ardour/audio_playlist.cc +++ b/libs/ardour/audio_playlist.cc @@ -382,7 +382,7 @@ AudioPlaylist::check_dependents (boost::shared_ptr r, bool norefresh) OverlapType c = top->coverage (bottom->position(), bottom->last_frame()); - + try { switch (c) { case OverlapNone: diff --git a/libs/midi++2/midi++/parser.h b/libs/midi++2/midi++/parser.h index 36d19f3da9..5b0244ef19 100644 --- a/libs/midi++2/midi++/parser.h +++ b/libs/midi++2/midi++/parser.h @@ -162,8 +162,8 @@ class Parser : public sigc::trackable { bool _mmc_forward; bool _mtc_forward; int expected_mtc_quarter_frame_code; - byte _mtc_time[4]; - byte _qtr_mtc_time[4]; + byte _mtc_time[5]; + byte _qtr_mtc_time[5]; unsigned long consecutive_qtr_frame_cnt; MTC_FPS _mtc_fps; MTC_Status _mtc_running; diff --git a/libs/midi++2/mtc.cc b/libs/midi++2/mtc.cc index 1da9ae6e36..7fd86eff35 100644 --- a/libs/midi++2/mtc.cc +++ b/libs/midi++2/mtc.cc @@ -264,6 +264,7 @@ Parser::process_mtc_quarter_frame (byte *msg) _qtr_mtc_time[3] |= ((msg[1] & 0x1) << 4); _mtc_fps = MTC_FPS ((msg[1] & 0x6) >> 1); + _qtr_mtc_time[4] = _mtc_fps; break; default: