annotate src/Silvet.cpp @ 161:6003a9af43af

Introduce InstrumentPack class
author Chris Cannam
date Tue, 20 May 2014 15:31:05 +0100
parents 58547262e735
children 03ba9b25e0d0
rev   line source
Chris@31 1 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
Chris@31 2
Chris@31 3 /*
Chris@31 4 Silvet
Chris@31 5
Chris@31 6 A Vamp plugin for note transcription.
Chris@31 7 Centre for Digital Music, Queen Mary University of London.
Chris@31 8
Chris@31 9 This program is free software; you can redistribute it and/or
Chris@31 10 modify it under the terms of the GNU General Public License as
Chris@31 11 published by the Free Software Foundation; either version 2 of the
Chris@31 12 License, or (at your option) any later version. See the file
Chris@31 13 COPYING included with this distribution for more information.
Chris@31 14 */
Chris@31 15
Chris@31 16 #include "Silvet.h"
Chris@34 17 #include "EM.h"
Chris@31 18
Chris@152 19 #include <cq/CQSpectrogram.h>
Chris@31 20
Chris@152 21 #include "MedianFilter.h"
Chris@152 22 #include "constant-q-cpp/src/dsp/Resampler.h"
Chris@31 23
Chris@31 24 #include <vector>
Chris@31 25
Chris@32 26 #include <cstdio>
Chris@32 27
Chris@31 28 using std::vector;
Chris@48 29 using std::cout;
Chris@31 30 using std::cerr;
Chris@31 31 using std::endl;
Chris@40 32 using Vamp::RealTime;
Chris@31 33
Chris@31 34 static int processingSampleRate = 44100;
Chris@31 35 static int processingBPO = 60;
Chris@32 36 static int processingHeight = 545;
Chris@38 37 static int processingNotes = 88;
Chris@31 38
Chris@31 39 Silvet::Silvet(float inputSampleRate) :
Chris@31 40 Plugin(inputSampleRate),
Chris@161 41 m_instruments(InstrumentPack::listInstrumentPacks()),
Chris@31 42 m_resampler(0),
Chris@110 43 m_cq(0),
Chris@113 44 m_hqMode(true)
Chris@31 45 {
Chris@31 46 }
Chris@31 47
Chris@31 48 Silvet::~Silvet()
Chris@31 49 {
Chris@31 50 delete m_resampler;
Chris@31 51 delete m_cq;
Chris@41 52 for (int i = 0; i < (int)m_postFilter.size(); ++i) {
Chris@41 53 delete m_postFilter[i];
Chris@41 54 }
Chris@31 55 }
Chris@31 56
Chris@31 57 string
Chris@31 58 Silvet::getIdentifier() const
Chris@31 59 {
Chris@31 60 return "silvet";
Chris@31 61 }
Chris@31 62
Chris@31 63 string
Chris@31 64 Silvet::getName() const
Chris@31 65 {
Chris@31 66 return "Silvet Note Transcription";
Chris@31 67 }
Chris@31 68
Chris@31 69 string
Chris@31 70 Silvet::getDescription() const
Chris@31 71 {
Chris@31 72 // Return something helpful here!
Chris@31 73 return "";
Chris@31 74 }
Chris@31 75
Chris@31 76 string
Chris@31 77 Silvet::getMaker() const
Chris@31 78 {
Chris@31 79 // Your name here
Chris@31 80 return "";
Chris@31 81 }
Chris@31 82
Chris@31 83 int
Chris@31 84 Silvet::getPluginVersion() const
Chris@31 85 {
Chris@31 86 return 1;
Chris@31 87 }
Chris@31 88
Chris@31 89 string
Chris@31 90 Silvet::getCopyright() const
Chris@31 91 {
Chris@31 92 // This function is not ideally named. It does not necessarily
Chris@31 93 // need to say who made the plugin -- getMaker does that -- but it
Chris@31 94 // should indicate the terms under which it is distributed. For
Chris@31 95 // example, "Copyright (year). All Rights Reserved", or "GPL"
Chris@31 96 return "";
Chris@31 97 }
Chris@31 98
Chris@31 99 Silvet::InputDomain
Chris@31 100 Silvet::getInputDomain() const
Chris@31 101 {
Chris@31 102 return TimeDomain;
Chris@31 103 }
Chris@31 104
Chris@31 105 size_t
Chris@31 106 Silvet::getPreferredBlockSize() const
Chris@31 107 {
Chris@31 108 return 0;
Chris@31 109 }
Chris@31 110
Chris@31 111 size_t
Chris@31 112 Silvet::getPreferredStepSize() const
Chris@31 113 {
Chris@31 114 return 0;
Chris@31 115 }
Chris@31 116
Chris@31 117 size_t
Chris@31 118 Silvet::getMinChannelCount() const
Chris@31 119 {
Chris@31 120 return 1;
Chris@31 121 }
Chris@31 122
Chris@31 123 size_t
Chris@31 124 Silvet::getMaxChannelCount() const
Chris@31 125 {
Chris@31 126 return 1;
Chris@31 127 }
Chris@31 128
Chris@31 129 Silvet::ParameterList
Chris@31 130 Silvet::getParameterDescriptors() const
Chris@31 131 {
Chris@31 132 ParameterList list;
Chris@110 133
Chris@110 134 ParameterDescriptor desc;
Chris@110 135 desc.identifier = "mode";
Chris@110 136 desc.name = "Processing mode";
Chris@110 137 desc.unit = "";
Chris@110 138 desc.description = "Determines the tradeoff of processing speed against transcription quality";
Chris@110 139 desc.minValue = 0;
Chris@110 140 desc.maxValue = 1;
Chris@113 141 desc.defaultValue = 1;
Chris@110 142 desc.isQuantized = true;
Chris@110 143 desc.quantizeStep = 1;
Chris@161 144 desc.valueNames.push_back("Draft: faster");
Chris@161 145 desc.valueNames.push_back("Intensive: usually higher quality");
Chris@161 146 list.push_back(desc);
Chris@161 147
Chris@161 148 desc.identifier = "soloinstrument";
Chris@161 149 desc.name = "The recording contains";
Chris@161 150 desc.unit = "";
Chris@161 151 desc.description = "Determines the tradeoff of processing speed against transcription quality";
Chris@161 152 desc.minValue = 0;
Chris@161 153 desc.maxValue = 1;
Chris@161 154 desc.defaultValue = 1;
Chris@161 155 desc.isQuantized = true;
Chris@161 156 desc.quantizeStep = 1;
Chris@161 157 desc.valueNames.clear();
Chris@161 158 desc.valueNames.push_back("Multiple or unknown instruments");
Chris@161 159
Chris@110 160 list.push_back(desc);
Chris@110 161
Chris@31 162 return list;
Chris@31 163 }
Chris@31 164
Chris@31 165 float
Chris@31 166 Silvet::getParameter(string identifier) const
Chris@31 167 {
Chris@110 168 if (identifier == "mode") {
Chris@110 169 return m_hqMode ? 1.f : 0.f;
Chris@110 170 }
Chris@31 171 return 0;
Chris@31 172 }
Chris@31 173
Chris@31 174 void
Chris@31 175 Silvet::setParameter(string identifier, float value)
Chris@31 176 {
Chris@110 177 if (identifier == "mode") {
Chris@110 178 m_hqMode = (value > 0.5);
Chris@110 179 }
Chris@31 180 }
Chris@31 181
Chris@31 182 Silvet::ProgramList
Chris@31 183 Silvet::getPrograms() const
Chris@31 184 {
Chris@31 185 ProgramList list;
Chris@31 186 return list;
Chris@31 187 }
Chris@31 188
Chris@31 189 string
Chris@31 190 Silvet::getCurrentProgram() const
Chris@31 191 {
Chris@31 192 return "";
Chris@31 193 }
Chris@31 194
Chris@31 195 void
Chris@31 196 Silvet::selectProgram(string name)
Chris@31 197 {
Chris@31 198 }
Chris@31 199
Chris@31 200 Silvet::OutputList
Chris@31 201 Silvet::getOutputDescriptors() const
Chris@31 202 {
Chris@31 203 OutputList list;
Chris@31 204
Chris@31 205 OutputDescriptor d;
Chris@51 206 d.identifier = "notes";
Chris@51 207 d.name = "Note transcription";
Chris@51 208 d.description = "Overall note transcription across all instruments";
Chris@41 209 d.unit = "Hz";
Chris@31 210 d.hasFixedBinCount = true;
Chris@31 211 d.binCount = 2;
Chris@41 212 d.binNames.push_back("Frequency");
Chris@31 213 d.binNames.push_back("Velocity");
Chris@31 214 d.hasKnownExtents = false;
Chris@31 215 d.isQuantized = false;
Chris@31 216 d.sampleType = OutputDescriptor::VariableSampleRate;
Chris@51 217 d.sampleRate = m_inputSampleRate / (m_cq ? m_cq->getColumnHop() : 62);
Chris@31 218 d.hasDuration = true;
Chris@32 219 m_notesOutputNo = list.size();
Chris@32 220 list.push_back(d);
Chris@32 221
Chris@31 222 return list;
Chris@31 223 }
Chris@31 224
Chris@38 225 std::string
Chris@38 226 Silvet::noteName(int i) const
Chris@38 227 {
Chris@38 228 static const char *names[] = {
Chris@38 229 "A", "A#", "B", "C", "C#", "D", "D#", "E", "F", "F#", "G", "G#"
Chris@38 230 };
Chris@38 231
Chris@38 232 const char *n = names[i % 12];
Chris@38 233
Chris@38 234 int oct = (i + 9) / 12;
Chris@38 235
Chris@38 236 char buf[20];
Chris@38 237 sprintf(buf, "%s%d", n, oct);
Chris@38 238
Chris@38 239 return buf;
Chris@38 240 }
Chris@38 241
Chris@41 242 float
Chris@41 243 Silvet::noteFrequency(int note) const
Chris@41 244 {
Chris@41 245 return float(27.5 * pow(2.0, note / 12.0));
Chris@41 246 }
Chris@41 247
Chris@31 248 bool
Chris@31 249 Silvet::initialise(size_t channels, size_t stepSize, size_t blockSize)
Chris@31 250 {
Chris@31 251 if (channels < getMinChannelCount() ||
Chris@31 252 channels > getMaxChannelCount()) return false;
Chris@31 253
Chris@31 254 if (stepSize != blockSize) {
Chris@31 255 cerr << "Silvet::initialise: Step size must be the same as block size ("
Chris@31 256 << stepSize << " != " << blockSize << ")" << endl;
Chris@31 257 return false;
Chris@31 258 }
Chris@31 259
Chris@31 260 m_blockSize = blockSize;
Chris@31 261
Chris@31 262 reset();
Chris@31 263
Chris@31 264 return true;
Chris@31 265 }
Chris@31 266
Chris@31 267 void
Chris@31 268 Silvet::reset()
Chris@31 269 {
Chris@31 270 delete m_resampler;
Chris@31 271 delete m_cq;
Chris@31 272
Chris@31 273 if (m_inputSampleRate != processingSampleRate) {
Chris@31 274 m_resampler = new Resampler(m_inputSampleRate, processingSampleRate);
Chris@31 275 } else {
Chris@31 276 m_resampler = 0;
Chris@31 277 }
Chris@31 278
Chris@154 279 CQParameters params(processingSampleRate,
Chris@154 280 27.5,
Chris@154 281 processingSampleRate / 3,
Chris@154 282 processingBPO);
Chris@154 283
Chris@155 284 params.q = 0.95; // MIREX code uses 0.8, but it seems 0.9 or lower
Chris@155 285 // drops the FFT size to 512 from 1024 and alters
Chris@155 286 // some other processing parameters, making
Chris@155 287 // everything much, much slower. Could be a flaw
Chris@155 288 // in the CQ parameter calculations, must check
Chris@154 289 params.atomHopFactor = 0.3;
Chris@154 290 params.threshold = 0.0005;
Chris@155 291 params.window = CQParameters::Hann; //!!! todo: test whether it makes any difference
Chris@154 292
Chris@154 293 m_cq = new CQSpectrogram(params, CQSpectrogram::InterpolateLinear);
Chris@31 294
Chris@41 295 for (int i = 0; i < (int)m_postFilter.size(); ++i) {
Chris@41 296 delete m_postFilter[i];
Chris@41 297 }
Chris@41 298 m_postFilter.clear();
Chris@41 299 for (int i = 0; i < processingNotes; ++i) {
Chris@41 300 m_postFilter.push_back(new MedianFilter<double>(3));
Chris@41 301 }
Chris@41 302 m_pianoRoll.clear();
Chris@32 303 m_columnCount = 0;
Chris@32 304 m_reducedColumnCount = 0;
Chris@40 305 m_startTime = RealTime::zeroTime;
Chris@31 306 }
Chris@31 307
Chris@31 308 Silvet::FeatureSet
Chris@31 309 Silvet::process(const float *const *inputBuffers, Vamp::RealTime timestamp)
Chris@31 310 {
Chris@40 311 if (m_columnCount == 0) {
Chris@40 312 m_startTime = timestamp;
Chris@40 313 }
Chris@40 314
Chris@31 315 vector<double> data;
Chris@40 316 for (int i = 0; i < m_blockSize; ++i) {
Chris@40 317 data.push_back(inputBuffers[0][i]);
Chris@40 318 }
Chris@31 319
Chris@31 320 if (m_resampler) {
Chris@31 321 data = m_resampler->process(data.data(), data.size());
Chris@31 322 }
Chris@31 323
Chris@32 324 Grid cqout = m_cq->process(data);
Chris@51 325 FeatureSet fs = transcribe(cqout);
Chris@51 326 return fs;
Chris@34 327 }
Chris@34 328
Chris@34 329 Silvet::FeatureSet
Chris@34 330 Silvet::getRemainingFeatures()
Chris@34 331 {
Chris@145 332 Grid cqout = m_cq->getRemainingOutput();
Chris@51 333 FeatureSet fs = transcribe(cqout);
Chris@51 334 return fs;
Chris@34 335 }
Chris@34 336
Chris@34 337 Silvet::FeatureSet
Chris@34 338 Silvet::transcribe(const Grid &cqout)
Chris@34 339 {
Chris@32 340 Grid filtered = preProcess(cqout);
Chris@31 341
Chris@32 342 FeatureSet fs;
Chris@32 343
Chris@104 344 if (filtered.empty()) return fs;
Chris@104 345
Chris@34 346 int width = filtered.size();
Chris@34 347
Chris@150 348 int iterations = 12; //!!! more might be good?
Chris@34 349
Chris@123 350 Grid pitchMatrix(width, vector<double>(processingNotes));
Chris@37 351
Chris@123 352 #pragma omp parallel for
Chris@123 353 for (int i = 0; i < width; ++i) {
Chris@104 354
Chris@123 355 double sum = 0.0;
Chris@123 356 for (int j = 0; j < processingHeight; ++j) {
Chris@123 357 sum += filtered.at(i).at(j);
Chris@37 358 }
Chris@37 359
Chris@152 360 // cerr << "sum: " << sum << endl;
Chris@152 361
Chris@123 362 if (sum < 1e-5) continue;
Chris@37 363
Chris@161 364 EM em(&m_instruments[0], m_hqMode);
Chris@104 365
Chris@123 366 for (int j = 0; j < iterations; ++j) {
Chris@123 367 em.iterate(filtered.at(i).data());
Chris@34 368 }
Chris@104 369
Chris@151 370 const float *pitches = em.getPitchDistribution();
Chris@150 371
Chris@150 372 //!!! note: check the CQ output (and most immediately, the sum values here) against the MATLAB implementation
Chris@123 373
Chris@123 374 for (int j = 0; j < processingNotes; ++j) {
Chris@123 375 pitchMatrix[i][j] = pitches[j] * sum;
Chris@123 376 }
Chris@123 377 }
Chris@37 378
Chris@123 379 for (int i = 0; i < width; ++i) {
Chris@123 380
Chris@123 381 FeatureList noteFeatures = postProcess(pitchMatrix[i]);
Chris@38 382
Chris@123 383 for (FeatureList::const_iterator fi = noteFeatures.begin();
Chris@123 384 fi != noteFeatures.end(); ++fi) {
Chris@123 385 fs[m_notesOutputNo].push_back(*fi);
Chris@40 386 }
Chris@34 387 }
Chris@34 388
Chris@32 389 return fs;
Chris@31 390 }
Chris@31 391
Chris@32 392 Silvet::Grid
Chris@32 393 Silvet::preProcess(const Grid &in)
Chris@32 394 {
Chris@32 395 int width = in.size();
Chris@32 396
Chris@32 397 // reduce to 100 columns per second, or one column every 441 samples
Chris@32 398
Chris@32 399 int spacing = processingSampleRate / 100;
Chris@32 400
Chris@32 401 Grid out;
Chris@32 402
Chris@58 403 // We count the CQ latency in terms of processing hops, but
Chris@58 404 // actually it probably isn't an exact number of hops so this
Chris@58 405 // isn't quite accurate. But the small constant offset is
Chris@58 406 // practically irrelevant compared to the jitter from the 40ms
Chris@58 407 // frame size we reduce to in a moment
Chris@33 408 int latentColumns = m_cq->getLatency() / m_cq->getColumnHop();
Chris@33 409
Chris@32 410 for (int i = 0; i < width; ++i) {
Chris@32 411
Chris@33 412 if (m_columnCount < latentColumns) {
Chris@33 413 ++m_columnCount;
Chris@33 414 continue;
Chris@33 415 }
Chris@33 416
Chris@32 417 int prevSampleNo = (m_columnCount - 1) * m_cq->getColumnHop();
Chris@32 418 int sampleNo = m_columnCount * m_cq->getColumnHop();
Chris@32 419
Chris@32 420 bool select = (sampleNo / spacing != prevSampleNo / spacing);
Chris@32 421
Chris@32 422 if (select) {
Chris@32 423 vector<double> inCol = in[i];
Chris@32 424 vector<double> outCol(processingHeight);
Chris@32 425
Chris@32 426 // we reverse the column as we go (the CQ output is
Chris@32 427 // "upside-down", with high frequencies at the start of
Chris@32 428 // each column, and we want it the other way around) and
Chris@32 429 // then ignore the first 55 (lowest-frequency) bins,
Chris@32 430 // giving us 545 bins instead of 600
Chris@32 431
Chris@32 432 for (int j = 0; j < processingHeight; ++j) {
Chris@46 433 int ix = inCol.size() - j - 55;
Chris@46 434 outCol[j] = inCol[ix];
Chris@46 435 }
Chris@32 436
Chris@46 437 vector<double> noiseLevel1 =
Chris@46 438 MedianFilter<double>::filter(40, outCol);
Chris@46 439 for (int j = 0; j < processingHeight; ++j) {
Chris@46 440 noiseLevel1[j] = std::min(outCol[j], noiseLevel1[j]);
Chris@46 441 }
Chris@32 442
Chris@46 443 vector<double> noiseLevel2 =
Chris@46 444 MedianFilter<double>::filter(40, noiseLevel1);
Chris@46 445 for (int j = 0; j < processingHeight; ++j) {
Chris@46 446 outCol[j] = std::max(outCol[j] - noiseLevel2[j], 0.0);
Chris@32 447 }
Chris@32 448
Chris@32 449 // then we only use every fourth filtered column, for 25
Chris@32 450 // columns per second in the eventual grid
Chris@32 451
Chris@32 452 if (m_reducedColumnCount % 4 == 0) {
Chris@32 453 out.push_back(outCol);
Chris@32 454 }
Chris@32 455
Chris@32 456 ++m_reducedColumnCount;
Chris@32 457 }
Chris@32 458
Chris@32 459 ++m_columnCount;
Chris@32 460 }
Chris@32 461
Chris@32 462 return out;
Chris@32 463 }
Chris@32 464
Chris@41 465 Vamp::Plugin::FeatureList
Chris@41 466 Silvet::postProcess(const vector<double> &pitches)
Chris@41 467 {
Chris@41 468 vector<double> filtered;
Chris@41 469
Chris@41 470 for (int j = 0; j < processingNotes; ++j) {
Chris@55 471 m_postFilter[j]->push(pitches[j]);
Chris@41 472 filtered.push_back(m_postFilter[j]->get());
Chris@41 473 }
Chris@41 474
Chris@69 475 int postFilterLatency = int(m_postFilter[0]->getSize() / 2);
Chris@69 476
Chris@41 477 // Threshold for level and reduce number of candidate pitches
Chris@41 478
Chris@41 479 int polyphony = 5;
Chris@150 480
Chris@150 481 //!!! make this a parameter (was 4.8, try adjusting, compare levels against matlab code)
Chris@150 482 double threshold = 6;
Chris@154 483 // double threshold = 4.8;
Chris@41 484
Chris@41 485 typedef std::multimap<double, int> ValueIndexMap;
Chris@41 486
Chris@41 487 ValueIndexMap strengths;
Chris@41 488 for (int j = 0; j < processingNotes; ++j) {
Chris@41 489 strengths.insert(ValueIndexMap::value_type(filtered[j], j));
Chris@41 490 }
Chris@41 491
Chris@55 492 map<int, double> active;
Chris@41 493 ValueIndexMap::const_iterator si = strengths.end();
Chris@45 494 while (int(active.size()) < polyphony) {
Chris@41 495 --si;
Chris@41 496 if (si->first < threshold) break;
Chris@152 497 // cerr << si->second << " : " << si->first << endl;
Chris@55 498 active[si->second] = si->first;
Chris@45 499 if (si == strengths.begin()) break;
Chris@41 500 }
Chris@41 501
Chris@41 502 // Minimum duration pruning, and conversion to notes. We can only
Chris@41 503 // report notes that have just ended (i.e. that are absent in the
Chris@41 504 // latest active set but present in the last set in the piano
Chris@41 505 // roll) -- any notes that ended earlier will have been reported
Chris@41 506 // already, and if they haven't ended, we don't know their
Chris@41 507 // duration.
Chris@41 508
Chris@41 509 int width = m_pianoRoll.size();
Chris@41 510
Chris@150 511 //!!! adjust to only keep notes >= 100ms? or so
Chris@152 512 int durationThreshold = 3; // columns
Chris@41 513
Chris@41 514 FeatureList noteFeatures;
Chris@41 515
Chris@41 516 if (width < durationThreshold + 1) {
Chris@41 517 m_pianoRoll.push_back(active);
Chris@41 518 return noteFeatures;
Chris@41 519 }
Chris@41 520
Chris@41 521 // we have 25 columns per second
Chris@41 522 double columnDuration = 1.0 / 25.0;
Chris@41 523
Chris@150 524 //!!! try: 20ms intervals in intensive mode
Chris@150 525 //!!! try: repeated note detection? (look for change in first derivative of the pitch matrix)
Chris@150 526
Chris@55 527 for (map<int, double>::const_iterator ni = m_pianoRoll[width-1].begin();
Chris@41 528 ni != m_pianoRoll[width-1].end(); ++ni) {
Chris@41 529
Chris@55 530 int note = ni->first;
Chris@41 531
Chris@41 532 if (active.find(note) != active.end()) {
Chris@41 533 // the note is still playing
Chris@41 534 continue;
Chris@41 535 }
Chris@41 536
Chris@41 537 // the note was playing but just ended
Chris@41 538 int end = width;
Chris@41 539 int start = end-1;
Chris@41 540
Chris@57 541 double maxStrength = 0.0;
Chris@55 542
Chris@41 543 while (m_pianoRoll[start].find(note) != m_pianoRoll[start].end()) {
Chris@57 544 double strength = m_pianoRoll[start][note];
Chris@57 545 if (strength > maxStrength) {
Chris@57 546 maxStrength = strength;
Chris@57 547 }
Chris@41 548 --start;
Chris@41 549 }
Chris@41 550 ++start;
Chris@41 551
Chris@41 552 int duration = width - start;
Chris@62 553 // cerr << "duration " << duration << " for just-ended note " << note << endl;
Chris@41 554 if (duration < durationThreshold) {
Chris@41 555 // spurious
Chris@41 556 continue;
Chris@41 557 }
Chris@41 558
Chris@57 559 int velocity = maxStrength * 2;
Chris@55 560 if (velocity > 127) velocity = 127;
Chris@55 561
Chris@152 562 // cerr << "Found a genuine note, starting at " << columnDuration * start << " with duration " << columnDuration * duration << endl;
Chris@62 563
Chris@41 564 Feature nf;
Chris@41 565 nf.hasTimestamp = true;
Chris@69 566 nf.timestamp = RealTime::fromSeconds
Chris@150 567 (columnDuration * (start - postFilterLatency) + 0.02);
Chris@41 568 nf.hasDuration = true;
Chris@69 569 nf.duration = RealTime::fromSeconds
Chris@69 570 (columnDuration * duration);
Chris@41 571 nf.values.push_back(noteFrequency(note));
Chris@55 572 nf.values.push_back(velocity);
Chris@41 573 nf.label = noteName(note);
Chris@41 574 noteFeatures.push_back(nf);
Chris@41 575 }
Chris@41 576
Chris@41 577 m_pianoRoll.push_back(active);
Chris@41 578
Chris@62 579 // cerr << "returning " << noteFeatures.size() << " complete note(s) " << endl;
Chris@41 580
Chris@41 581 return noteFeatures;
Chris@41 582 }
Chris@41 583