Mercurial > hg > tony

changeset 433:093c1fb2fb31

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove some debug; set some gain values
author Chris Cannam
date Tue, 31 Mar 2015 13:06:29 +0100
parents 6e8e85edfd48
children 548433164338
files .hgsubstate src/Analyser.cpp
diffstat 2 files changed, 17 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsubstate	Tue Mar 31 12:28:17 2015 +0100
+++ b/.hgsubstate	Tue Mar 31 13:06:29 2015 +0100
@@ -2,6 +2,6 @@
 d16f0fd6db6104d87882bc43788a3bb1b0f8c528 dataquay
 1629209f5bf21fc926bb6abd5ab786e78c5d7677 pyin
 55ece8862b6d3a54aad271a53f9c1615e5d3bcf8 sv-dependency-builds
-ba789baf642bd57b845d77872bcfce33ae26c96e svapp
-9fc8823a73e99aa15796140579f0ab94611f4926 svcore
-2564d0865febbedaef98be605aa1db241c34e794 svgui
+c48bc6ddfe1762b63f1ea29475d59518fc13b281 svapp
+24c48323c662a3631ba004f4701a328cbf753893 svcore
+8744bb5d9fd0015b46d8299ada59d410e6767e59 svgui
--- a/src/Analyser.cpp	Tue Mar 31 12:28:17 2015 +0100
+++ b/src/Analyser.cpp	Tue Mar 31 13:06:29 2015 +0100
@@ -307,7 +307,10 @@
     waveform->setBaseColour
         (ColourDatabase::getInstance()->getColourIndex(tr("Grey")));
     PlayParameters *params = waveform->getPlayParameters();
-    if (params) params->setPlayPan(-1);
+    if (params) {
+        params->setPlayPan(-1);
+        params->setPlayGain(1);
+    }
     
     m_document->addLayerToView(m_pane, waveform);
 
@@ -447,7 +450,10 @@
     if (pitchLayer) {
         pitchLayer->setBaseColour(cdb->getColourIndex(tr("Black")));
         PlayParameters *params = pitchLayer->getPlayParameters();
-        if (params) params->setPlayPan(1);
+        if (params) {
+            params->setPlayPan(1);
+            params->setPlayGain(0.5);
+        }
         connect(pitchLayer, SIGNAL(modelCompletionChanged()),
                 this, SLOT(layerCompletionChanged()));
     }
@@ -457,7 +463,10 @@
     if (flexiNoteLayer) {
         flexiNoteLayer->setBaseColour(cdb->getColourIndex(tr("Bright Blue")));
         PlayParameters *params = flexiNoteLayer->getPlayParameters();
-        if (params) params->setPlayPan(1);
+        if (params) {
+            params->setPlayPan(1);
+            params->setPlayGain(0.5);
+        }
         connect(flexiNoteLayer, SIGNAL(modelCompletionChanged()),
                 this, SLOT(layerCompletionChanged()));
         connect(flexiNoteLayer, SIGNAL(reAnalyseRegion(sv_frame_t, sv_frame_t, float, float)),
@@ -839,6 +848,8 @@
                               myLayer->getModel()->getEndFrame());
     myLayer->deleteSelection(sel);
 
+    cerr << "deleted from " << sel.getStartFrame() << " to " << sel.getEndFrame() << endl;
+    
     sel = Selection(otherLayer->getModel()->getStartFrame(),
                     otherLayer->getModel()->getEndFrame());
     otherLayer->copy(m_pane, sel, clip);