comparison data/model/FFTModel.cpp @ 383:94fc0591ea43 1.2-stable

* merge from trunk (1.2 ended up being tracked from trunk, but we may want this branch for fixes later)
author Chris Cannam
date Wed, 27 Feb 2008 10:32:45 +0000
parents aa8dbac62024
children
comparison
equal deleted inserted replaced
349:f39d33b0b265 383:94fc0591ea43
78 } 78 }
79 79
80 FFTModel::~FFTModel() 80 FFTModel::~FFTModel()
81 { 81 {
82 if (m_server) FFTDataServer::releaseInstance(m_server); 82 if (m_server) FFTDataServer::releaseInstance(m_server);
83 }
84
85 void
86 FFTModel::sourceModelAboutToBeDeleted()
87 {
88 if (m_sourceModel) {
89 std::cerr << "FFTModel[" << this << "]::sourceModelAboutToBeDeleted(" << m_sourceModel << ")" << std::endl;
90 if (m_server) {
91 FFTDataServer::releaseInstance(m_server);
92 m_server = 0;
93 }
94 FFTDataServer::modelAboutToBeDeleted(m_sourceModel);
95 }
83 } 96 }
84 97
85 FFTDataServer * 98 FFTDataServer *
86 FFTModel::getServer(const DenseTimeValueModel *model, 99 FFTModel::getServer(const DenseTimeValueModel *model,
87 int channel, 100 int channel,