comparison data/model/Model.cpp @ 1599:ce185d4dd408 bqaudiostream

Merge from default branch
author Chris Cannam
date Wed, 23 Jan 2019 14:43:43 +0000
parents 70e172e6cc59
children 1d1a16968f03 f9b6e99e0520
comparison
equal deleted inserted replaced
1598:d2555df635ec 1599:ce185d4dd408
92 } 92 }
93 93
94 void 94 void
95 Model::sourceModelAboutToBeDeleted() 95 Model::sourceModelAboutToBeDeleted()
96 { 96 {
97 m_sourceModel = 0; 97 m_sourceModel = nullptr;
98 } 98 }
99 99
100 void 100 void
101 Model::setAlignment(AlignmentModel *alignment) 101 Model::setAlignment(AlignmentModel *alignment)
102 { 102 {
122 const Model * 122 const Model *
123 Model::getAlignmentReference() const 123 Model::getAlignmentReference() const
124 { 124 {
125 if (!m_alignment) { 125 if (!m_alignment) {
126 if (m_sourceModel) return m_sourceModel->getAlignmentReference(); 126 if (m_sourceModel) return m_sourceModel->getAlignmentReference();
127 return 0; 127 return nullptr;
128 } 128 }
129 return m_alignment->getReferenceModel(); 129 return m_alignment->getReferenceModel();
130 } 130 }
131 131
132 sv_frame_t 132 sv_frame_t