Mercurial > hg > tony
comparison 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 |
comparison
equal
deleted
inserted
replaced
432:6e8e85edfd48 | 433:093c1fb2fb31 |
---|---|
305 waveform->setMiddleLineHeight(0.9); | 305 waveform->setMiddleLineHeight(0.9); |
306 waveform->setShowMeans(false); // too small & pale for this | 306 waveform->setShowMeans(false); // too small & pale for this |
307 waveform->setBaseColour | 307 waveform->setBaseColour |
308 (ColourDatabase::getInstance()->getColourIndex(tr("Grey"))); | 308 (ColourDatabase::getInstance()->getColourIndex(tr("Grey"))); |
309 PlayParameters *params = waveform->getPlayParameters(); | 309 PlayParameters *params = waveform->getPlayParameters(); |
310 if (params) params->setPlayPan(-1); | 310 if (params) { |
311 params->setPlayPan(-1); | |
312 params->setPlayGain(1); | |
313 } | |
311 | 314 |
312 m_document->addLayerToView(m_pane, waveform); | 315 m_document->addLayerToView(m_pane, waveform); |
313 | 316 |
314 m_layers[Audio] = waveform; | 317 m_layers[Audio] = waveform; |
315 return ""; | 318 return ""; |
445 TimeValueLayer *pitchLayer = | 448 TimeValueLayer *pitchLayer = |
446 qobject_cast<TimeValueLayer *>(m_layers[PitchTrack]); | 449 qobject_cast<TimeValueLayer *>(m_layers[PitchTrack]); |
447 if (pitchLayer) { | 450 if (pitchLayer) { |
448 pitchLayer->setBaseColour(cdb->getColourIndex(tr("Black"))); | 451 pitchLayer->setBaseColour(cdb->getColourIndex(tr("Black"))); |
449 PlayParameters *params = pitchLayer->getPlayParameters(); | 452 PlayParameters *params = pitchLayer->getPlayParameters(); |
450 if (params) params->setPlayPan(1); | 453 if (params) { |
454 params->setPlayPan(1); | |
455 params->setPlayGain(0.5); | |
456 } | |
451 connect(pitchLayer, SIGNAL(modelCompletionChanged()), | 457 connect(pitchLayer, SIGNAL(modelCompletionChanged()), |
452 this, SLOT(layerCompletionChanged())); | 458 this, SLOT(layerCompletionChanged())); |
453 } | 459 } |
454 | 460 |
455 FlexiNoteLayer *flexiNoteLayer = | 461 FlexiNoteLayer *flexiNoteLayer = |
456 qobject_cast<FlexiNoteLayer *>(m_layers[Notes]); | 462 qobject_cast<FlexiNoteLayer *>(m_layers[Notes]); |
457 if (flexiNoteLayer) { | 463 if (flexiNoteLayer) { |
458 flexiNoteLayer->setBaseColour(cdb->getColourIndex(tr("Bright Blue"))); | 464 flexiNoteLayer->setBaseColour(cdb->getColourIndex(tr("Bright Blue"))); |
459 PlayParameters *params = flexiNoteLayer->getPlayParameters(); | 465 PlayParameters *params = flexiNoteLayer->getPlayParameters(); |
460 if (params) params->setPlayPan(1); | 466 if (params) { |
467 params->setPlayPan(1); | |
468 params->setPlayGain(0.5); | |
469 } | |
461 connect(flexiNoteLayer, SIGNAL(modelCompletionChanged()), | 470 connect(flexiNoteLayer, SIGNAL(modelCompletionChanged()), |
462 this, SLOT(layerCompletionChanged())); | 471 this, SLOT(layerCompletionChanged())); |
463 connect(flexiNoteLayer, SIGNAL(reAnalyseRegion(sv_frame_t, sv_frame_t, float, float)), | 472 connect(flexiNoteLayer, SIGNAL(reAnalyseRegion(sv_frame_t, sv_frame_t, float, float)), |
464 this, SLOT(reAnalyseRegion(sv_frame_t, sv_frame_t, float, float))); | 473 this, SLOT(reAnalyseRegion(sv_frame_t, sv_frame_t, float, float))); |
465 connect(flexiNoteLayer, SIGNAL(materialiseReAnalysis()), | 474 connect(flexiNoteLayer, SIGNAL(materialiseReAnalysis()), |
837 | 846 |
838 Selection sel = Selection(myLayer->getModel()->getStartFrame(), | 847 Selection sel = Selection(myLayer->getModel()->getStartFrame(), |
839 myLayer->getModel()->getEndFrame()); | 848 myLayer->getModel()->getEndFrame()); |
840 myLayer->deleteSelection(sel); | 849 myLayer->deleteSelection(sel); |
841 | 850 |
851 cerr << "deleted from " << sel.getStartFrame() << " to " << sel.getEndFrame() << endl; | |
852 | |
842 sel = Selection(otherLayer->getModel()->getStartFrame(), | 853 sel = Selection(otherLayer->getModel()->getStartFrame(), |
843 otherLayer->getModel()->getEndFrame()); | 854 otherLayer->getModel()->getEndFrame()); |
844 otherLayer->copy(m_pane, sel, clip); | 855 otherLayer->copy(m_pane, sel, clip); |
845 | 856 |
846 myLayer->paste(m_pane, clip, 0, false); | 857 myLayer->paste(m_pane, clip, 0, false); |