annotate src/Analyser.cpp @ 433:093c1fb2fb31

Remove some debug; set some gain values
author Chris Cannam
date Tue, 31 Mar 2015 13:06:29 +0100
parents 6e8e85edfd48
children 692852208b6c
rev   line source
Chris@6 1 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
Chris@6 2
Chris@6 3 /*
Chris@6 4 Tony
Chris@6 5 An intonation analysis and annotation tool
Chris@6 6 Centre for Digital Music, Queen Mary, University of London.
Chris@6 7 This file copyright 2006-2012 Chris Cannam and QMUL.
Chris@6 8
Chris@6 9 This program is free software; you can redistribute it and/or
Chris@6 10 modify it under the terms of the GNU General Public License as
Chris@6 11 published by the Free Software Foundation; either version 2 of the
Chris@6 12 License, or (at your option) any later version. See the file
Chris@6 13 COPYING included with this distribution for more information.
Chris@6 14 */
Chris@6 15
Chris@6 16 #include "Analyser.h"
Chris@6 17
Chris@6 18 #include "transform/TransformFactory.h"
Chris@6 19 #include "transform/ModelTransformer.h"
gyorgyf@14 20 #include "transform/FeatureExtractionModelTransformer.h"
Chris@6 21 #include "framework/Document.h"
Chris@6 22 #include "data/model/WaveFileModel.h"
Chris@6 23 #include "view/Pane.h"
Chris@6 24 #include "view/PaneStack.h"
Chris@6 25 #include "layer/Layer.h"
Chris@6 26 #include "layer/TimeValueLayer.h"
matthiasm@13 27 #include "layer/NoteLayer.h"
matthiasm@11 28 #include "layer/FlexiNoteLayer.h"
Chris@120 29 #include "layer/WaveformLayer.h"
Chris@6 30 #include "layer/ColourDatabase.h"
Chris@145 31 #include "layer/ColourMapper.h"
gyorgyf@16 32 #include "layer/LayerFactory.h"
Chris@145 33 #include "layer/SpectrogramLayer.h"
Chris@161 34 #include "layer/Colour3DPlotLayer.h"
Chris@199 35 #include "layer/ShowLayerCommand.h"
Chris@6 36
Chris@83 37 #include <QSettings>
Chris@341 38 #include <QMutexLocker>
Chris@83 39
Chris@163 40 using std::vector;
Chris@163 41
Chris@6 42 Analyser::Analyser() :
Chris@6 43 m_document(0),
Chris@6 44 m_fileModel(0),
Chris@133 45 m_paneStack(0),
Chris@188 46 m_pane(0),
Chris@188 47 m_currentCandidate(-1),
Chris@341 48 m_candidatesVisible(false),
Chris@341 49 m_currentAsyncHandle(0)
Chris@6 50 {
Chris@83 51 QSettings settings;
Chris@83 52 settings.beginGroup("LayerDefaults");
Chris@83 53 settings.setValue
Chris@83 54 ("timevalues",
Chris@83 55 QString("<layer verticalScale=\"%1\" plotStyle=\"%2\" "
Chris@83 56 "scaleMinimum=\"%3\" scaleMaximum=\"%4\"/>")
Chris@145 57 .arg(int(TimeValueLayer::AutoAlignScale))
matthiasm@182 58 .arg(int(TimeValueLayer::PlotPoints))
Chris@83 59 .arg(27.5f).arg(880.f)); // temporary values: better get the real extents of the data from the model
Chris@83 60 settings.setValue
Chris@83 61 ("flexinotes",
Chris@83 62 QString("<layer verticalScale=\"%1\"/>")
Chris@83 63 .arg(int(FlexiNoteLayer::AutoAlignScale)));
Chris@83 64 settings.endGroup();
Chris@6 65 }
Chris@6 66
Chris@6 67 Analyser::~Analyser()
Chris@6 68 {
Chris@6 69 }
Chris@6 70
Chris@140 71 QString
Chris@6 72 Analyser::newFileLoaded(Document *doc, WaveFileModel *model,
Chris@6 73 PaneStack *paneStack, Pane *pane)
Chris@6 74 {
Chris@6 75 m_document = doc;
Chris@6 76 m_fileModel = model;
Chris@133 77 m_paneStack = paneStack;
Chris@6 78 m_pane = pane;
Chris@6 79
Chris@242 80 connect(doc, SIGNAL(layerAboutToBeDeleted(Layer *)),
Chris@242 81 this, SLOT(layerAboutToBeDeleted(Layer *)));
Chris@242 82
Chris@326 83 QSettings settings;
Chris@326 84 settings.beginGroup("Analyser");
Chris@326 85 bool autoAnalyse = settings.value("auto-analysis", true).toBool();
Chris@326 86 settings.endGroup();
Chris@326 87
Chris@326 88 return doAllAnalyses(autoAnalyse);
Chris@325 89 }
Chris@325 90
Chris@325 91 QString
Chris@325 92 Analyser::analyseExistingFile()
Chris@325 93 {
Chris@325 94 if (!m_document) return "Internal error: Analyser::analyseExistingFile() called with no document present";
Chris@325 95
Chris@325 96 if (!m_pane) return "Internal error: Analyser::analyseExistingFile() called with no pane present";
Chris@325 97
Chris@325 98 if (m_layers[PitchTrack]) {
Chris@325 99 m_document->removeLayerFromView(m_pane, m_layers[PitchTrack]);
Chris@325 100 m_layers[PitchTrack] = 0;
Chris@325 101 }
Chris@325 102 if (m_layers[Notes]) {
Chris@325 103 m_document->removeLayerFromView(m_pane, m_layers[Notes]);
Chris@325 104 m_layers[Notes] = 0;
Chris@325 105 }
Chris@325 106
Chris@326 107 return doAllAnalyses(true);
Chris@325 108 }
Chris@325 109
Chris@325 110 QString
Chris@326 111 Analyser::doAllAnalyses(bool withPitchTrack)
Chris@325 112 {
Chris@165 113 m_reAnalysingSelection = Selection();
Chris@165 114 m_reAnalysisCandidates.clear();
Chris@167 115 m_currentCandidate = -1;
Chris@184 116 m_candidatesVisible = false;
Chris@165 117
Chris@161 118 // Note that we need at least one main-model layer (time ruler,
Chris@161 119 // waveform or what have you). It could be hidden if we don't want
Chris@161 120 // to see it but it must exist.
Chris@6 121
Chris@161 122 QString warning, error;
Chris@161 123
Chris@260 124 cerr << "Analyser::newFileLoaded: about to check visualisations etc" << endl;
Chris@260 125
Chris@161 126 // This isn't fatal -- we can proceed without
Chris@161 127 // visualisations. Other failures are fatal though.
Chris@161 128 warning = addVisualisations();
Chris@161 129
Chris@161 130 error = addWaveform();
Chris@161 131 if (error != "") return error;
Chris@161 132
Chris@326 133 if (withPitchTrack) {
Chris@326 134 error = addAnalyses();
Chris@326 135 if (error != "") return error;
Chris@326 136 }
Chris@161 137
Chris@161 138 loadState(Audio);
Chris@161 139 loadState(PitchTrack);
Chris@161 140 loadState(Notes);
Chris@161 141 loadState(Spectrogram);
Chris@161 142
Chris@260 143 stackLayers();
Chris@260 144
Chris@161 145 emit layersChanged();
Chris@161 146
Chris@161 147 return warning;
Chris@161 148 }
Chris@161 149
Chris@226 150 void
Chris@226 151 Analyser::fileClosed()
Chris@226 152 {
Chris@226 153 cerr << "Analyser::fileClosed" << endl;
Chris@226 154 m_layers.clear();
Chris@226 155 m_reAnalysisCandidates.clear();
Chris@226 156 m_currentCandidate = -1;
Chris@226 157 m_reAnalysingSelection = Selection();
Chris@226 158 }
Chris@226 159
Chris@227 160 bool
Chris@399 161 Analyser::getDisplayFrequencyExtents(double &min, double &max)
Chris@227 162 {
Chris@227 163 if (!m_layers[Spectrogram]) return false;
Chris@227 164 return m_layers[Spectrogram]->getDisplayExtents(min, max);
Chris@227 165 }
Chris@227 166
Chris@227 167 bool
Chris@399 168 Analyser::setDisplayFrequencyExtents(double min, double max)
Chris@227 169 {
Chris@227 170 if (!m_layers[Spectrogram]) return false;
Chris@227 171 m_layers[Spectrogram]->setDisplayExtents(min, max);
Chris@242 172 return true;
Chris@227 173 }
Chris@227 174
Chris@314 175 int
Chris@314 176 Analyser::getInitialAnalysisCompletion()
Chris@314 177 {
Chris@314 178 int completion = 0;
Chris@314 179
Chris@314 180 if (m_layers[PitchTrack]) {
Chris@314 181 completion = m_layers[PitchTrack]->getCompletion(m_pane);
Chris@314 182 }
Chris@314 183
Chris@314 184 if (m_layers[Notes]) {
Chris@314 185 int c = m_layers[Notes]->getCompletion(m_pane);
Chris@314 186 if (c < completion) completion = c;
Chris@314 187 }
Chris@314 188
Chris@314 189 return completion;
Chris@314 190 }
Chris@314 191
Chris@314 192 void
Chris@314 193 Analyser::layerCompletionChanged()
Chris@314 194 {
Chris@314 195 if (getInitialAnalysisCompletion() == 100) {
Chris@432 196
Chris@314 197 emit initialAnalysisCompleted();
Chris@432 198
Chris@432 199 if (m_layers[Audio]) {
Chris@432 200
Chris@432 201 // Extend pitch-track and note layers so as to nominally
Chris@432 202 // end at the same time as the audio. This affects any
Chris@432 203 // time-filling done on export etc.
Chris@432 204
Chris@432 205 sv_frame_t endFrame = m_layers[Audio]->getModel()->getEndFrame();
Chris@432 206
Chris@432 207 if (m_layers[PitchTrack]) {
Chris@432 208 SparseTimeValueModel *model = qobject_cast<SparseTimeValueModel *>
Chris@432 209 (m_layers[PitchTrack]->getModel());
Chris@432 210 if (model) {
Chris@432 211 model->extendEndFrame(endFrame);
Chris@432 212 }
Chris@432 213 }
Chris@432 214 if (m_layers[Notes]) {
Chris@432 215 NoteModel *model = qobject_cast<NoteModel *>
Chris@432 216 (m_layers[Notes]->getModel());
Chris@432 217 if (model) {
Chris@432 218 model->extendEndFrame(endFrame);
Chris@432 219 }
Chris@432 220 }
Chris@432 221 }
Chris@314 222 }
Chris@314 223 }
Chris@314 224
Chris@161 225 QString
Chris@161 226 Analyser::addVisualisations()
Chris@161 227 {
Chris@227 228 // A spectrogram, off by default. Must go at the back because it's
Chris@227 229 // opaque
Chris@227 230
Chris@227 231 /* This is roughly what we'd do for a constant-Q spectrogram, but it
Chris@227 232 currently has issues with y-axis alignment
Chris@227 233
Chris@161 234 TransformFactory *tf = TransformFactory::getInstance();
Chris@161 235
Chris@161 236 QString name = "Constant-Q";
Chris@161 237 QString base = "vamp:cqvamp:cqvamp:";
Chris@161 238 QString out = "constantq";
Chris@6 239
Chris@161 240 QString notFound = tr("Transform \"%1\" not found, spectrogram will not be enabled.<br><br>Is the %2 Vamp plugin correctly installed?");
Chris@161 241 if (!tf->haveTransform(base + out)) {
Chris@161 242 return notFound.arg(base + out).arg(name);
Chris@161 243 }
Chris@161 244
Chris@161 245 Transform transform = tf->getDefaultTransformFor
Chris@161 246 (base + out, m_fileModel->getSampleRate());
Chris@162 247 transform.setParameter("bpo", 36);
Chris@161 248
Chris@161 249 Colour3DPlotLayer *spectrogram = qobject_cast<Colour3DPlotLayer *>
Chris@161 250 (m_document->createDerivedLayer(transform, m_fileModel));
Chris@161 251
Chris@161 252 if (!spectrogram) return tr("Transform \"%1\" did not run correctly (no layer or wrong layer type returned)").arg(base + out);
Chris@165 253 */
Chris@165 254
Chris@260 255 // As with all the visualisation layers, if we already have one in
Chris@260 256 // the pane we do not create another, just record its
Chris@260 257 // existence. (We create a new one when loading a new audio file,
Chris@260 258 // but just note the existing one when loading a complete session.)
Chris@260 259
Chris@260 260 for (int i = 0; i < m_pane->getLayerCount(); ++i) {
Chris@260 261 SpectrogramLayer *existing = qobject_cast<SpectrogramLayer *>
Chris@260 262 (m_pane->getLayer(i));
Chris@260 263 if (existing) {
Chris@260 264 cerr << "recording existing spectrogram layer" << endl;
Chris@260 265 m_layers[Spectrogram] = existing;
Chris@260 266 return "";
Chris@260 267 }
Chris@260 268 }
Chris@260 269
Chris@145 270 SpectrogramLayer *spectrogram = qobject_cast<SpectrogramLayer *>
Chris@145 271 (m_document->createMainModelLayer(LayerFactory::MelodicRangeSpectrogram));
Chris@165 272
Chris@145 273 spectrogram->setColourMap((int)ColourMapper::BlackOnWhite);
Chris@162 274 spectrogram->setNormalizeHybrid(true);
Chris@165 275 spectrogram->setGain(100);
Chris@145 276 m_document->addLayerToView(m_pane, spectrogram);
Chris@145 277 spectrogram->setLayerDormant(m_pane, true);
Chris@145 278
Chris@145 279 m_layers[Spectrogram] = spectrogram;
Chris@145 280
Chris@161 281 return "";
Chris@161 282 }
Chris@161 283
Chris@161 284 QString
Chris@161 285 Analyser::addWaveform()
Chris@161 286 {
Chris@131 287 // Our waveform layer is just a shadow, light grey and taking up
Chris@260 288 // little space at the bottom.
Chris@260 289
Chris@260 290 // As with the spectrogram above, if one exists already we just
Chris@260 291 // use it
Chris@260 292 for (int i = 0; i < m_pane->getLayerCount(); ++i) {
Chris@260 293 WaveformLayer *existing = qobject_cast<WaveformLayer *>
Chris@260 294 (m_pane->getLayer(i));
Chris@260 295 if (existing) {
Chris@260 296 cerr << "recording existing waveform layer" << endl;
Chris@260 297 m_layers[Audio] = existing;
Chris@260 298 return "";
Chris@260 299 }
Chris@260 300 }
Chris@120 301
Chris@120 302 WaveformLayer *waveform = qobject_cast<WaveformLayer *>
Chris@120 303 (m_document->createMainModelLayer(LayerFactory::Waveform));
Chris@120 304
Chris@120 305 waveform->setMiddleLineHeight(0.9);
Chris@120 306 waveform->setShowMeans(false); // too small & pale for this
Chris@120 307 waveform->setBaseColour
Chris@120 308 (ColourDatabase::getInstance()->getColourIndex(tr("Grey")));
Chris@130 309 PlayParameters *params = waveform->getPlayParameters();
Chris@433 310 if (params) {
Chris@433 311 params->setPlayPan(-1);
Chris@433 312 params->setPlayGain(1);
Chris@433 313 }
Chris@128 314
Chris@128 315 m_document->addLayerToView(m_pane, waveform);
Chris@120 316
Chris@128 317 m_layers[Audio] = waveform;
Chris@161 318 return "";
Chris@161 319 }
Chris@161 320
Chris@161 321 QString
Chris@161 322 Analyser::addAnalyses()
Chris@161 323 {
Chris@260 324 // As with the spectrogram above, if these layers exist we use
Chris@260 325 // them
Chris@260 326 TimeValueLayer *existingPitch = 0;
Chris@260 327 FlexiNoteLayer *existingNotes = 0;
Chris@260 328 for (int i = 0; i < m_pane->getLayerCount(); ++i) {
Chris@260 329 if (!existingPitch) {
Chris@260 330 existingPitch = qobject_cast<TimeValueLayer *>(m_pane->getLayer(i));
Chris@260 331 }
Chris@260 332 if (!existingNotes) {
Chris@260 333 existingNotes = qobject_cast<FlexiNoteLayer *>(m_pane->getLayer(i));
Chris@260 334 }
Chris@260 335 }
Chris@260 336 if (existingPitch && existingNotes) {
Chris@260 337 cerr << "recording existing pitch and notes layers" << endl;
Chris@260 338 m_layers[PitchTrack] = existingPitch;
Chris@260 339 m_layers[Notes] = existingNotes;
Chris@260 340 return "";
Chris@326 341 } else {
Chris@326 342 if (existingPitch) {
Chris@326 343 m_document->removeLayerFromView(m_pane, existingPitch);
Chris@326 344 m_layers[PitchTrack] = 0;
Chris@326 345 }
Chris@326 346 if (existingNotes) {
Chris@326 347 m_document->removeLayerFromView(m_pane, existingNotes);
Chris@326 348 m_layers[Notes] = 0;
Chris@326 349 }
Chris@260 350 }
Chris@260 351
Chris@161 352 TransformFactory *tf = TransformFactory::getInstance();
Chris@161 353
Chris@161 354 QString plugname = "pYIN";
Chris@161 355 QString base = "vamp:pyin:pyin:";
Chris@161 356 QString f0out = "smoothedpitchtrack";
Chris@161 357 QString noteout = "notes";
Chris@120 358
Chris@83 359 Transforms transforms;
Chris@138 360
Chris@138 361 /*!!! we could have more than one pitch track...
Chris@138 362 QString cx = "vamp:cepstral-pitchtracker:cepstral-pitchtracker:f0";
Chris@138 363 if (tf->haveTransform(cx)) {
Chris@138 364 Transform tx = tf->getDefaultTransformFor(cx);
Chris@138 365 TimeValueLayer *lx = qobject_cast<TimeValueLayer *>
Chris@138 366 (m_document->createDerivedLayer(tx, m_fileModel));
Chris@138 367 lx->setVerticalScale(TimeValueLayer::AutoAlignScale);
Chris@138 368 lx->setBaseColour(ColourDatabase::getInstance()->getColourIndex(tr("Bright Red")));
Chris@138 369 m_document->addLayerToView(m_pane, lx);
Chris@138 370 }
Chris@138 371 */
Chris@138 372
Chris@140 373 QString notFound = tr("Transform \"%1\" not found. Unable to analyse audio file.<br><br>Is the %2 Vamp plugin correctly installed?");
Chris@140 374 if (!tf->haveTransform(base + f0out)) {
Chris@140 375 return notFound.arg(base + f0out).arg(plugname);
Chris@140 376 }
Chris@140 377 if (!tf->haveTransform(base + noteout)) {
Chris@140 378 return notFound.arg(base + noteout).arg(plugname);
Chris@6 379 }
Chris@6 380
Chris@326 381 QSettings settings;
Chris@326 382 settings.beginGroup("Analyser");
Chris@326 383 bool precise = settings.value("precision-analysis", false).toBool();
matthiasm@345 384 bool lowamp = settings.value("lowamp-analysis", false).toBool();
matthiasm@423 385 bool onset = settings.value("onset-analysis", true).toBool(); // should these be the same as in MainWindow.cpp?
matthiasm@423 386 bool prune = settings.value("prune-analysis", true).toBool();
matthiasm@345 387 settings.endGroup();
matthiasm@345 388
Chris@83 389 Transform t = tf->getDefaultTransformFor
Chris@83 390 (base + f0out, m_fileModel->getSampleRate());
Chris@83 391 t.setStepSize(256);
Chris@83 392 t.setBlockSize(2048);
Chris@6 393
Chris@326 394 if (precise) {
Chris@326 395 cerr << "setting parameters for precise mode" << endl;
Chris@326 396 t.setParameter("precisetime", 1);
Chris@326 397 } else {
Chris@326 398 cerr << "setting parameters for vague mode" << endl;
Chris@326 399 t.setParameter("precisetime", 0);
Chris@326 400 }
Chris@326 401
matthiasm@345 402 if (lowamp) {
matthiasm@345 403 cerr << "setting parameters for lowamp suppression" << endl;
matthiasm@422 404 t.setParameter("lowampsuppression", 0.2f);
matthiasm@345 405 } else {
matthiasm@345 406 cerr << "setting parameters for no lowamp suppression" << endl;
matthiasm@345 407 t.setParameter("lowampsuppression", 0.0f);
matthiasm@345 408 }
matthiasm@345 409
matthiasm@423 410 if (onset) {
matthiasm@423 411 cerr << "setting parameters for increased onset sensitivity" << endl;
matthiasm@423 412 t.setParameter("onsetsensitivity", 0.7f);
matthiasm@423 413 } else {
matthiasm@423 414 cerr << "setting parameters for non-increased onset sensitivity" << endl;
matthiasm@423 415 t.setParameter("onsetsensitivity", 0.0f);
matthiasm@423 416 }
matthiasm@423 417
matthiasm@423 418 if (prune) {
matthiasm@423 419 cerr << "setting parameters for duration pruning" << endl;
matthiasm@423 420 t.setParameter("prunethresh", 0.1f);
matthiasm@423 421 } else {
matthiasm@423 422 cerr << "setting parameters for no duration pruning" << endl;
matthiasm@423 423 t.setParameter("prunethresh", 0.0f);
matthiasm@423 424 }
matthiasm@423 425
Chris@83 426 transforms.push_back(t);
Chris@83 427
Chris@83 428 t.setOutput(noteout);
Chris@83 429
Chris@83 430 transforms.push_back(t);
Chris@83 431
Chris@83 432 std::vector<Layer *> layers =
Chris@83 433 m_document->createDerivedLayers(transforms, m_fileModel);
Chris@83 434
Chris@162 435 for (int i = 0; i < (int)layers.size(); ++i) {
Chris@83 436
Chris@162 437 FlexiNoteLayer *f = qobject_cast<FlexiNoteLayer *>(layers[i]);
Chris@162 438 TimeValueLayer *t = qobject_cast<TimeValueLayer *>(layers[i]);
Chris@162 439
Chris@162 440 if (f) m_layers[Notes] = f;
Chris@162 441 if (t) m_layers[PitchTrack] = t;
Chris@162 442
Chris@162 443 m_document->addLayerToView(m_pane, layers[i]);
Chris@6 444 }
Chris@161 445
Chris@162 446 ColourDatabase *cdb = ColourDatabase::getInstance();
Chris@162 447
Chris@162 448 TimeValueLayer *pitchLayer =
Chris@162 449 qobject_cast<TimeValueLayer *>(m_layers[PitchTrack]);
Chris@162 450 if (pitchLayer) {
Chris@162 451 pitchLayer->setBaseColour(cdb->getColourIndex(tr("Black")));
Chris@162 452 PlayParameters *params = pitchLayer->getPlayParameters();
Chris@433 453 if (params) {
Chris@433 454 params->setPlayPan(1);
Chris@433 455 params->setPlayGain(0.5);
Chris@433 456 }
Chris@396 457 connect(pitchLayer, SIGNAL(modelCompletionChanged()),
Chris@396 458 this, SLOT(layerCompletionChanged()));
Chris@162 459 }
Chris@162 460
Chris@162 461 FlexiNoteLayer *flexiNoteLayer =
Chris@162 462 qobject_cast<FlexiNoteLayer *>(m_layers[Notes]);
Chris@162 463 if (flexiNoteLayer) {
Chris@162 464 flexiNoteLayer->setBaseColour(cdb->getColourIndex(tr("Bright Blue")));
Chris@162 465 PlayParameters *params = flexiNoteLayer->getPlayParameters();
Chris@433 466 if (params) {
Chris@433 467 params->setPlayPan(1);
Chris@433 468 params->setPlayGain(0.5);
Chris@433 469 }
Chris@396 470 connect(flexiNoteLayer, SIGNAL(modelCompletionChanged()),
Chris@396 471 this, SLOT(layerCompletionChanged()));
Chris@403 472 connect(flexiNoteLayer, SIGNAL(reAnalyseRegion(sv_frame_t, sv_frame_t, float, float)),
Chris@403 473 this, SLOT(reAnalyseRegion(sv_frame_t, sv_frame_t, float, float)));
Chris@398 474 connect(flexiNoteLayer, SIGNAL(materialiseReAnalysis()),
Chris@398 475 this, SLOT(materialiseReAnalysis()));
Chris@162 476 }
Chris@162 477
Chris@162 478 return "";
Chris@162 479 }
Chris@162 480
Chris@396 481 void
Chris@403 482 Analyser::reAnalyseRegion(sv_frame_t frame0, sv_frame_t frame1, float freq0, float freq1)
Chris@396 483 {
Chris@396 484 cerr << "Analyser::reAnalyseRegion(" << frame0 << ", " << frame1
Chris@396 485 << ", " << freq0 << ", " << freq1 << ")" << endl;
Chris@396 486 showPitchCandidates(true);
Chris@396 487 (void)reAnalyseSelection(Selection(frame0, frame1),
Chris@396 488 FrequencyRange(freq0, freq1));
Chris@396 489 }
Chris@396 490
Chris@398 491 void
Chris@398 492 Analyser::materialiseReAnalysis()
Chris@398 493 {
Chris@398 494 if (m_reAnalysingSelection.isEmpty()) return;
Chris@398 495 switchPitchCandidate(m_reAnalysingSelection, true); // or false, doesn't matter
Chris@398 496 }
Chris@398 497
Chris@162 498 QString
Chris@192 499 Analyser::reAnalyseSelection(Selection sel, FrequencyRange range)
Chris@162 500 {
Chris@341 501 QMutexLocker locker(&m_asyncMutex);
Chris@341 502
Chris@396 503 if (!m_reAnalysingSelection.isEmpty()) {
Chris@396 504 if (sel == m_reAnalysingSelection && range == m_reAnalysingRange) {
Chris@396 505 cerr << "selection & range are same as current analysis, ignoring" << endl;
Chris@396 506 return "";
Chris@396 507 }
Chris@396 508 }
Chris@396 509
Chris@396 510 if (sel.isEmpty()) return "";
Chris@165 511
Chris@341 512 if (m_currentAsyncHandle) {
Chris@341 513 m_document->cancelAsyncLayerCreation(m_currentAsyncHandle);
Chris@341 514 }
Chris@341 515
Chris@252 516 if (!m_reAnalysisCandidates.empty()) {
Chris@252 517 CommandHistory::getInstance()->startCompoundOperation
Chris@252 518 (tr("Discard Previous Candidates"), true);
Chris@252 519 discardPitchCandidates();
Chris@252 520 CommandHistory::getInstance()->endCompoundOperation();
Chris@252 521 }
Chris@199 522
Chris@194 523 m_reAnalysingSelection = sel;
Chris@396 524 m_reAnalysingRange = range;
Chris@167 525
Chris@194 526 m_preAnalysis = Clipboard();
Chris@194 527 Layer *myLayer = m_layers[PitchTrack];
Chris@194 528 if (myLayer) {
Chris@194 529 myLayer->copy(m_pane, sel, m_preAnalysis);
Chris@194 530 }
Chris@165 531
Chris@162 532 TransformFactory *tf = TransformFactory::getInstance();
Chris@162 533
Chris@223 534 QString plugname1 = "pYIN";
Chris@223 535 QString plugname2 = "CHP";
Chris@223 536
Chris@162 537 QString base = "vamp:pyin:localcandidatepyin:";
Chris@162 538 QString out = "pitchtrackcandidates";
Chris@162 539
Chris@192 540 if (range.isConstrained()) {
Chris@223 541 base = "vamp:chp:constrainedharmonicpeak:";
Chris@223 542 out = "peak";
Chris@192 543 }
Chris@192 544
Chris@162 545 Transforms transforms;
Chris@162 546
Chris@223 547 QString notFound = tr("Transform \"%1\" not found. Unable to perform interactive analysis.<br><br>Are the %2 and %3 Vamp plugins correctly installed?");
Chris@162 548 if (!tf->haveTransform(base + out)) {
Chris@223 549 return notFound.arg(base + out).arg(plugname1).arg(plugname2);
Chris@162 550 }
Chris@162 551
Chris@162 552 Transform t = tf->getDefaultTransformFor
Chris@162 553 (base + out, m_fileModel->getSampleRate());
Chris@162 554 t.setStepSize(256);
Chris@162 555 t.setBlockSize(2048);
Chris@162 556
Chris@192 557 if (range.isConstrained()) {
Chris@399 558 t.setParameter("minfreq", float(range.min));
Chris@399 559 t.setParameter("maxfreq", float(range.max));
Chris@223 560 t.setBlockSize(4096);
Chris@192 561 }
Chris@192 562
matthiasm@273 563 // get time stamps that align with the 256-sample grid of the original extraction
Chris@399 564 const sv_frame_t grid = 256;
Chris@399 565 sv_frame_t startSample = (sel.getStartFrame() / grid) * grid;
Chris@399 566 if (startSample < sel.getStartFrame()) startSample += grid;
Chris@399 567 sv_frame_t endSample = (sel.getEndFrame() / grid) * grid;
Chris@399 568 if (endSample < sel.getEndFrame()) endSample += grid;
matthiasm@273 569 if (!range.isConstrained()) {
Chris@399 570 startSample -= 4*grid; // 4*256 is for 4 frames offset due to timestamp shift
Chris@399 571 endSample -= 4*grid;
matthiasm@273 572 } else {
Chris@399 573 endSample -= 9*grid; // MM says: not sure what the CHP plugin does there
matthiasm@273 574 }
matthiasm@273 575 RealTime start = RealTime::frame2RealTime(startSample, m_fileModel->getSampleRate());
matthiasm@273 576 RealTime end = RealTime::frame2RealTime(endSample, m_fileModel->getSampleRate());
Chris@164 577
Chris@164 578 RealTime duration;
Chris@164 579
Chris@164 580 if (sel.getEndFrame() > sel.getStartFrame()) {
Chris@164 581 duration = end - start;
Chris@164 582 }
Chris@164 583
Chris@200 584 cerr << "Analyser::reAnalyseSelection: start " << start << " end " << end << " original selection start " << sel.getStartFrame() << " end " << sel.getEndFrame() << " duration " << duration << endl;
Chris@200 585
Chris@200 586 if (duration <= RealTime::zeroTime) {
Chris@200 587 cerr << "Analyser::reAnalyseSelection: duration <= 0, not analysing" << endl;
Chris@200 588 return "";
Chris@200 589 }
Chris@200 590
Chris@164 591 t.setStartTime(start);
Chris@164 592 t.setDuration(duration);
Chris@162 593
Chris@162 594 transforms.push_back(t);
Chris@341 595
Chris@341 596 m_currentAsyncHandle =
Chris@341 597 m_document->createDerivedLayersAsync(transforms, m_fileModel, this);
Chris@162 598
Chris@163 599 return "";
Chris@163 600 }
Chris@162 601
Chris@184 602 bool
Chris@184 603 Analyser::arePitchCandidatesShown() const
Chris@184 604 {
Chris@184 605 return m_candidatesVisible;
Chris@184 606 }
Chris@184 607
Chris@184 608 void
Chris@184 609 Analyser::showPitchCandidates(bool shown)
Chris@184 610 {
Chris@184 611 if (m_candidatesVisible == shown) return;
Chris@184 612
Chris@184 613 foreach (Layer *layer, m_reAnalysisCandidates) {
Chris@184 614 if (shown) {
Chris@199 615 CommandHistory::getInstance()->addCommand
Chris@199 616 (new ShowLayerCommand(m_pane, layer, true,
Chris@199 617 tr("Show Pitch Candidates")));
Chris@184 618 } else {
Chris@199 619 CommandHistory::getInstance()->addCommand
Chris@199 620 (new ShowLayerCommand(m_pane, layer, false,
Chris@199 621 tr("Hide Pitch Candidates")));
Chris@184 622 }
Chris@184 623 }
Chris@184 624
Chris@184 625 m_candidatesVisible = shown;
Chris@184 626 }
Chris@184 627
Chris@163 628 void
Chris@341 629 Analyser::layersCreated(Document::LayerCreationAsyncHandle handle,
Chris@341 630 vector<Layer *> primary,
Chris@163 631 vector<Layer *> additional)
Chris@163 632 {
Chris@349 633 {
Chris@349 634 QMutexLocker locker(&m_asyncMutex);
Chris@165 635
Chris@349 636 if (handle != m_currentAsyncHandle ||
Chris@349 637 m_reAnalysingSelection == Selection()) {
Chris@349 638 // We don't want these!
Chris@349 639 for (int i = 0; i < (int)primary.size(); ++i) {
Chris@349 640 m_document->deleteLayer(primary[i]);
Chris@349 641 }
Chris@349 642 for (int i = 0; i < (int)additional.size(); ++i) {
Chris@349 643 m_document->deleteLayer(additional[i]);
Chris@349 644 }
Chris@349 645 return;
Chris@349 646 }
Chris@349 647 m_currentAsyncHandle = 0;
Chris@349 648
Chris@349 649 CommandHistory::getInstance()->startCompoundOperation
Chris@349 650 (tr("Re-Analyse Selection"), true);
Chris@349 651
Chris@349 652 m_reAnalysisCandidates.clear();
Chris@349 653
Chris@349 654 vector<Layer *> all;
Chris@226 655 for (int i = 0; i < (int)primary.size(); ++i) {
Chris@349 656 all.push_back(primary[i]);
Chris@226 657 }
Chris@226 658 for (int i = 0; i < (int)additional.size(); ++i) {
Chris@349 659 all.push_back(additional[i]);
Chris@226 660 }
Chris@349 661
Chris@349 662 for (int i = 0; i < (int)all.size(); ++i) {
Chris@349 663 TimeValueLayer *t = qobject_cast<TimeValueLayer *>(all[i]);
Chris@349 664 if (t) {
Chris@349 665 PlayParameters *params = t->getPlayParameters();
Chris@349 666 if (params) {
Chris@349 667 params->setPlayAudible(false);
Chris@349 668 }
Chris@349 669 t->setBaseColour
Chris@349 670 (ColourDatabase::getInstance()->getColourIndex(tr("Bright Orange")));
Chris@349 671 t->setPresentationName("candidate");
Chris@349 672 m_document->addLayerToView(m_pane, t);
Chris@349 673 m_reAnalysisCandidates.push_back(t);
Chris@428 674 cerr << "New re-analysis candidate model has "
Chris@428 675 << ((SparseTimeValueModel *)t->getModel())->getPoints().size() << " point(s)" << endl;
Chris@349 676 }
Chris@349 677 }
Chris@349 678
Chris@349 679 if (!all.empty()) {
Chris@349 680 bool show = m_candidatesVisible;
Chris@349 681 m_candidatesVisible = !show; // to ensure the following takes effect
Chris@349 682 showPitchCandidates(show);
Chris@349 683 }
Chris@349 684
Chris@349 685 CommandHistory::getInstance()->endCompoundOperation();
Chris@226 686 }
Chris@199 687
Chris@187 688 emit layersChanged();
Chris@6 689 }
Chris@6 690
Chris@198 691 bool
Chris@198 692 Analyser::haveHigherPitchCandidate() const
Chris@198 693 {
Chris@198 694 if (m_reAnalysisCandidates.empty()) return false;
Chris@198 695 return (m_currentCandidate < 0 ||
Chris@198 696 (m_currentCandidate + 1 < (int)m_reAnalysisCandidates.size()));
Chris@198 697 }
Chris@198 698
Chris@198 699 bool
Chris@198 700 Analyser::haveLowerPitchCandidate() const
Chris@198 701 {
Chris@198 702 if (m_reAnalysisCandidates.empty()) return false;
Chris@198 703 return (m_currentCandidate < 0 || m_currentCandidate >= 1);
Chris@198 704 }
Chris@198 705
gyorgyf@45 706 void
Chris@167 707 Analyser::switchPitchCandidate(Selection sel, bool up)
Chris@167 708 {
Chris@167 709 if (m_reAnalysisCandidates.empty()) return;
Chris@167 710
Chris@167 711 if (up) {
Chris@167 712 m_currentCandidate = m_currentCandidate + 1;
Chris@168 713 if (m_currentCandidate >= (int)m_reAnalysisCandidates.size()) {
Chris@167 714 m_currentCandidate = 0;
Chris@167 715 }
Chris@167 716 } else {
Chris@167 717 m_currentCandidate = m_currentCandidate - 1;
Chris@167 718 if (m_currentCandidate < 0) {
Chris@168 719 m_currentCandidate = (int)m_reAnalysisCandidates.size() - 1;
Chris@167 720 }
Chris@167 721 }
Chris@167 722
Chris@167 723 Layer *pitchTrack = m_layers[PitchTrack];
Chris@167 724 if (!pitchTrack) return;
Chris@167 725
Chris@167 726 Clipboard clip;
Chris@167 727 pitchTrack->deleteSelection(sel);
Chris@167 728 m_reAnalysisCandidates[m_currentCandidate]->copy(m_pane, sel, clip);
Chris@167 729 pitchTrack->paste(m_pane, clip, 0, false);
Chris@264 730
Chris@264 731 stackLayers();
Chris@260 732 }
Chris@167 733
Chris@260 734 void
Chris@260 735 Analyser::stackLayers()
Chris@260 736 {
Chris@167 737 // raise the pitch track, then notes on top (if present)
Chris@260 738 if (m_layers[PitchTrack]) {
Chris@260 739 m_paneStack->setCurrentLayer(m_pane, m_layers[PitchTrack]);
Chris@260 740 }
Chris@167 741 if (m_layers[Notes] && !m_layers[Notes]->isLayerDormant(m_pane)) {
Chris@167 742 m_paneStack->setCurrentLayer(m_pane, m_layers[Notes]);
Chris@167 743 }
Chris@167 744 }
Chris@167 745
Chris@167 746 void
Chris@168 747 Analyser::shiftOctave(Selection sel, bool up)
Chris@168 748 {
Chris@168 749 float factor = (up ? 2.f : 0.5f);
Chris@168 750
Chris@168 751 vector<Layer *> actOn;
Chris@168 752
Chris@168 753 Layer *pitchTrack = m_layers[PitchTrack];
Chris@168 754 if (pitchTrack) actOn.push_back(pitchTrack);
Chris@168 755
Chris@168 756 foreach (Layer *layer, actOn) {
Chris@168 757
Chris@168 758 Clipboard clip;
Chris@168 759 layer->copy(m_pane, sel, clip);
Chris@168 760 layer->deleteSelection(sel);
Chris@168 761
Chris@168 762 Clipboard shifted;
Chris@168 763 foreach (Clipboard::Point p, clip.getPoints()) {
Chris@168 764 if (p.haveValue()) {
Chris@168 765 Clipboard::Point sp = p.withValue(p.getValue() * factor);
Chris@168 766 shifted.addPoint(sp);
Chris@168 767 } else {
Chris@168 768 shifted.addPoint(p);
Chris@168 769 }
Chris@168 770 }
Chris@168 771
Chris@168 772 layer->paste(m_pane, shifted, 0, false);
Chris@168 773 }
Chris@168 774 }
Chris@168 775
Chris@168 776 void
Chris@184 777 Analyser::deletePitches(Selection sel)
Chris@168 778 {
Chris@168 779 Layer *pitchTrack = m_layers[PitchTrack];
Chris@168 780 if (!pitchTrack) return;
Chris@168 781
Chris@168 782 pitchTrack->deleteSelection(sel);
Chris@168 783 }
Chris@168 784
Chris@168 785 void
Chris@199 786 Analyser::abandonReAnalysis(Selection sel)
Chris@167 787 {
Chris@252 788 // A compound command is already in progress
Chris@252 789
Chris@199 790 discardPitchCandidates();
Chris@194 791
Chris@194 792 Layer *myLayer = m_layers[PitchTrack];
Chris@194 793 if (!myLayer) return;
Chris@194 794 myLayer->deleteSelection(sel);
Chris@194 795 myLayer->paste(m_pane, m_preAnalysis, 0, false);
Chris@167 796 }
Chris@167 797
Chris@167 798 void
Chris@269 799 Analyser::clearReAnalysis()
Chris@269 800 {
Chris@269 801 discardPitchCandidates();
Chris@269 802 }
Chris@269 803
Chris@269 804 void
Chris@199 805 Analyser::discardPitchCandidates()
Chris@199 806 {
Chris@242 807 if (!m_reAnalysisCandidates.empty()) {
Chris@252 808 // We don't use a compound command here, because we may be
Chris@252 809 // already in one. Caller bears responsibility for doing that
Chris@242 810 foreach (Layer *layer, m_reAnalysisCandidates) {
Chris@242 811 // This will cause the layer to be deleted later (ownership is
Chris@242 812 // transferred to the remove command)
Chris@242 813 m_document->removeLayerFromView(m_pane, layer);
Chris@242 814 }
Chris@243 815 m_reAnalysisCandidates.clear();
Chris@199 816 }
Chris@199 817
Chris@199 818 m_currentCandidate = -1;
Chris@199 819 m_reAnalysingSelection = Selection();
Chris@199 820 m_candidatesVisible = false;
Chris@199 821 }
Chris@199 822
Chris@199 823 void
Chris@242 824 Analyser::layerAboutToBeDeleted(Layer *doomed)
Chris@242 825 {
Chris@242 826 cerr << "Analyser::layerAboutToBeDeleted(" << doomed << ")" << endl;
Chris@242 827
Chris@242 828 vector<Layer *> notDoomed;
Chris@242 829
Chris@242 830 foreach (Layer *layer, m_reAnalysisCandidates) {
Chris@242 831 if (layer != doomed) {
Chris@242 832 notDoomed.push_back(layer);
Chris@242 833 }
Chris@242 834 }
Chris@242 835
Chris@242 836 m_reAnalysisCandidates = notDoomed;
Chris@242 837 }
Chris@242 838
Chris@242 839 void
Chris@174 840 Analyser::takePitchTrackFrom(Layer *otherLayer)
Chris@174 841 {
Chris@174 842 Layer *myLayer = m_layers[PitchTrack];
Chris@174 843 if (!myLayer) return;
Chris@174 844
Chris@174 845 Clipboard clip;
Chris@174 846
Chris@174 847 Selection sel = Selection(myLayer->getModel()->getStartFrame(),
Chris@174 848 myLayer->getModel()->getEndFrame());
Chris@174 849 myLayer->deleteSelection(sel);
Chris@174 850
Chris@433 851 cerr << "deleted from " << sel.getStartFrame() << " to " << sel.getEndFrame() << endl;
Chris@433 852
Chris@174 853 sel = Selection(otherLayer->getModel()->getStartFrame(),
Chris@174 854 otherLayer->getModel()->getEndFrame());
Chris@174 855 otherLayer->copy(m_pane, sel, clip);
Chris@174 856
Chris@174 857 myLayer->paste(m_pane, clip, 0, false);
Chris@174 858 }
Chris@174 859
Chris@174 860 void
Chris@399 861 Analyser::getEnclosingSelectionScope(sv_frame_t f, sv_frame_t &f0, sv_frame_t &f1)
Chris@139 862 {
Chris@139 863 FlexiNoteLayer *flexiNoteLayer =
Chris@139 864 qobject_cast<FlexiNoteLayer *>(m_layers[Notes]);
Chris@139 865
Chris@399 866 sv_frame_t f0i = f, f1i = f;
Chris@355 867 int res = 1;
Chris@139 868
Chris@139 869 if (!flexiNoteLayer) {
Chris@139 870 f0 = f1 = f;
Chris@139 871 return;
Chris@139 872 }
Chris@139 873
Chris@139 874 flexiNoteLayer->snapToFeatureFrame(m_pane, f0i, res, Layer::SnapLeft);
Chris@139 875 flexiNoteLayer->snapToFeatureFrame(m_pane, f1i, res, Layer::SnapRight);
Chris@139 876
Chris@139 877 f0 = (f0i < 0 ? 0 : f0i);
Chris@139 878 f1 = (f1i < 0 ? 0 : f1i);
Chris@139 879 }
Chris@139 880
Chris@139 881 void
Chris@132 882 Analyser::saveState(Component c) const
Chris@132 883 {
Chris@132 884 bool v = isVisible(c);
Chris@132 885 bool a = isAudible(c);
Chris@132 886 QSettings settings;
Chris@132 887 settings.beginGroup("Analyser");
Chris@145 888 settings.setValue(QString("visible-%1").arg(int(c)), v);
Chris@145 889 settings.setValue(QString("audible-%1").arg(int(c)), a);
Chris@132 890 settings.endGroup();
Chris@132 891 }
Chris@132 892
Chris@132 893 void
Chris@132 894 Analyser::loadState(Component c)
Chris@132 895 {
Chris@132 896 QSettings settings;
Chris@132 897 settings.beginGroup("Analyser");
Chris@145 898 bool deflt = (c == Spectrogram ? false : true);
Chris@145 899 bool v = settings.value(QString("visible-%1").arg(int(c)), deflt).toBool();
Chris@145 900 bool a = settings.value(QString("audible-%1").arg(int(c)), true).toBool();
Chris@132 901 settings.endGroup();
Chris@132 902 setVisible(c, v);
Chris@132 903 setAudible(c, a);
Chris@132 904 }
Chris@132 905
Chris@132 906 void
gyorgyf@45 907 Analyser::setIntelligentActions(bool on)
gyorgyf@45 908 {
gyorgyf@45 909 std::cerr << "toggle setIntelligentActions " << on << std::endl;
Chris@128 910
Chris@128 911 FlexiNoteLayer *flexiNoteLayer =
Chris@128 912 qobject_cast<FlexiNoteLayer *>(m_layers[Notes]);
Chris@128 913 if (flexiNoteLayer) {
Chris@128 914 flexiNoteLayer->setIntelligentActions(on);
Chris@70 915 }
gyorgyf@45 916 }
Chris@128 917
Chris@128 918 bool
Chris@128 919 Analyser::isVisible(Component c) const
Chris@128 920 {
Chris@128 921 if (m_layers[c]) {
Chris@128 922 return !m_layers[c]->isLayerDormant(m_pane);
Chris@128 923 } else {
Chris@128 924 return false;
Chris@128 925 }
Chris@128 926 }
Chris@128 927
Chris@128 928 void
Chris@128 929 Analyser::setVisible(Component c, bool v)
Chris@128 930 {
Chris@128 931 if (m_layers[c]) {
Chris@128 932 m_layers[c]->setLayerDormant(m_pane, !v);
Chris@133 933
Chris@167 934 if (v) {
Chris@167 935 if (c == Notes) {
Chris@167 936 m_paneStack->setCurrentLayer(m_pane, m_layers[c]);
Chris@167 937 } else if (c == PitchTrack) {
Chris@167 938 // raise the pitch track, then notes on top (if present)
Chris@167 939 m_paneStack->setCurrentLayer(m_pane, m_layers[c]);
Chris@167 940 if (m_layers[Notes] &&
Chris@167 941 !m_layers[Notes]->isLayerDormant(m_pane)) {
Chris@167 942 m_paneStack->setCurrentLayer(m_pane, m_layers[Notes]);
Chris@167 943 }
Chris@167 944 }
Chris@133 945 }
Chris@133 946
Chris@128 947 m_pane->layerParametersChanged();
Chris@132 948 saveState(c);
Chris@128 949 }
Chris@128 950 }
Chris@128 951
Chris@128 952 bool
Chris@128 953 Analyser::isAudible(Component c) const
Chris@128 954 {
Chris@128 955 if (m_layers[c]) {
Chris@128 956 PlayParameters *params = m_layers[c]->getPlayParameters();
Chris@128 957 if (!params) return false;
Chris@128 958 return params->isPlayAudible();
Chris@128 959 } else {
Chris@128 960 return false;
Chris@128 961 }
Chris@128 962 }
Chris@128 963
Chris@128 964 void
Chris@128 965 Analyser::setAudible(Component c, bool a)
Chris@128 966 {
Chris@128 967 if (m_layers[c]) {
Chris@128 968 PlayParameters *params = m_layers[c]->getPlayParameters();
Chris@128 969 if (!params) return;
Chris@128 970 params->setPlayAudible(a);
Chris@132 971 saveState(c);
Chris@128 972 }
Chris@128 973 }
Chris@128 974
Chris@158 975 float
Chris@158 976 Analyser::getGain(Component c) const
Chris@158 977 {
Chris@158 978 if (m_layers[c]) {
Chris@158 979 PlayParameters *params = m_layers[c]->getPlayParameters();
Chris@158 980 if (!params) return 1.f;
Chris@158 981 return params->getPlayGain();
Chris@158 982 } else {
Chris@158 983 return 1.f;
Chris@158 984 }
Chris@158 985 }
Chris@158 986
Chris@158 987 void
Chris@158 988 Analyser::setGain(Component c, float gain)
Chris@158 989 {
Chris@158 990 if (m_layers[c]) {
Chris@158 991 PlayParameters *params = m_layers[c]->getPlayParameters();
Chris@158 992 if (!params) return;
Chris@158 993 params->setPlayGain(gain);
Chris@158 994 saveState(c);
Chris@158 995 }
Chris@158 996 }
Chris@158 997
Chris@158 998 float
Chris@158 999 Analyser::getPan(Component c) const
Chris@158 1000 {
Chris@158 1001 if (m_layers[c]) {
Chris@158 1002 PlayParameters *params = m_layers[c]->getPlayParameters();
Chris@158 1003 if (!params) return 1.f;
Chris@158 1004 return params->getPlayPan();
Chris@158 1005 } else {
Chris@158 1006 return 1.f;
Chris@158 1007 }
Chris@158 1008 }
Chris@158 1009
Chris@158 1010 void
Chris@158 1011 Analyser::setPan(Component c, float pan)
Chris@158 1012 {
Chris@158 1013 if (m_layers[c]) {
Chris@158 1014 PlayParameters *params = m_layers[c]->getPlayParameters();
Chris@158 1015 if (!params) return;
Chris@158 1016 params->setPlayPan(pan);
Chris@158 1017 saveState(c);
Chris@158 1018 }
Chris@158 1019 }
Chris@158 1020
Chris@158 1021
Chris@158 1022