Mercurial > hg > svcore
view data/model/NoteModel.cpp @ 249:d3ac9f953ebf
* Fix #1672407 confused by plugin-named files in cwd (or home?)
* Fix #1491848 crash when loading new file while transform plugin runs
* Fix #1502287 Background remains black after spectrogram layer deleted
* Fix #1604477 Replacing the main audio file silences secondary audio file
* Fix failure to initialise property box layout to last preference on startup
* Fix resample/wrong-rate display in Pane, ensure that right rate is chosen
if all current models have an acceptable rate even if previous main model
had a different one
* Fix "global zoom" broken in previous commit
* Some fixes to spectrogram cache area updating (makes spectrogram appear
more quickly, previously it had a tendency to refresh with empty space)
* Fixes to colour 3d plot normalization
author | Chris Cannam |
---|---|
date | Thu, 08 Mar 2007 16:53:08 +0000 |
parents | 3a13b0d4934e |
children | dc46851837d6 |
line wrap: on
line source
/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */ /* Sonic Visualiser An audio file viewer and annotation editor. Centre for Digital Music, Queen Mary, University of London. This file copyright 2006 Chris Cannam. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. See the file COPYING included with this distribution for more information. */ #include "NoteModel.h" NoteModel::PointList NoteModel::getPoints(long start, long end) const { if (start > end) return PointList(); QMutexLocker locker(&m_mutex); Note endPoint(end); PointListIterator endItr = m_points.upper_bound(endPoint); if (endItr != m_points.end()) ++endItr; if (endItr != m_points.end()) ++endItr; PointList rv; for (PointListIterator i = endItr; i != m_points.begin(); ) { --i; if (i->frame < start) { if (i->frame + i->duration >= start) { rv.insert(*i); } } else if (i->frame <= end) { rv.insert(*i); } } return rv; } NoteModel::PointList NoteModel::getPoints(long frame) const { QMutexLocker locker(&m_mutex); if (m_resolution == 0) return PointList(); long start = (frame / m_resolution) * m_resolution; long end = start + m_resolution; Note endPoint(end); PointListIterator endItr = m_points.upper_bound(endPoint); PointList rv; for (PointListIterator i = endItr; i != m_points.begin(); ) { --i; if (i->frame < start) { if (i->frame + i->duration >= start) { rv.insert(*i); } } else if (i->frame <= end) { rv.insert(*i); } } return rv; }