# HG changeset patch # User Chris Cannam # Date 1568721058 -3600 # Node ID 872873aa64632ac5c484e490b1b72736821b10f5 # Parent 8145a9c4c2538b70c1ae16d089ddf401bff08bf8# Parent 395ef06beab118832b0dac75c168f733d94f9680 Merge diff -r 395ef06beab1 -r 872873aa6463 view/AlignmentView.cpp --- a/view/AlignmentView.cpp Mon Sep 16 13:34:56 2019 +0100 +++ b/view/AlignmentView.cpp Tue Sep 17 12:50:58 2019 +0100 @@ -307,7 +307,9 @@ AlignmentView::getDefaultKeyFrames() { vector keyFrames; + return keyFrames; +#ifdef NOT_REALLY if (!m_above || !m_manager) return keyFrames; sv_samplerate_t rate = m_manager->getMainModelSampleRate(); @@ -320,6 +322,7 @@ } return keyFrames; +#endif } ModelId