diff options
| author | Bent Bisballe Nyeng <deva@aasimon.org> | 2014-05-02 15:16:00 +0200 |
|---|---|---|
| committer | Bent Bisballe Nyeng <deva@aasimon.org> | 2014-05-02 15:16:00 +0200 |
| commit | 52f81e6e8ef4d80b006a3063afabb4fc4b60e594 (patch) | |
| tree | 338ad22c0c022bddd9341a7ffeb2bb044e3ae699 | |
| parent | 2b055b728ac0c58eb571413e7aba31dd3b90f685 (diff) | |
| parent | 7ec14ac0fa7e95dda01d396edbd190a8aeb78b2b (diff) | |
Merge branch 'master' of http://git.drumgizmo.org/drumgizmo
| -rw-r--r-- | dgedit/mainwindow.cc | 3 | ||||
| -rw-r--r-- | dgedit/player.cc | 4 | ||||
| -rw-r--r-- | dgedit/volumefader.cc | 5 |
3 files changed, 9 insertions, 3 deletions
diff --git a/dgedit/mainwindow.cc b/dgedit/mainwindow.cc index 9c88631..0e154ed 100644 --- a/dgedit/mainwindow.cc +++ b/dgedit/mainwindow.cc @@ -189,6 +189,9 @@ MainWindow::MainWindow() &player, SLOT(setGainDB(double))); connect(&player, SIGNAL(peakUpdate(double)), vol, SLOT(updatePeakPower(double))); +// connect(&player, SIGNAL(peakUpdateDB(double)), +// vol, SLOT(updatePeakDb(double))); + vol->setVolumeDb(0); dockWidget->widget()->layout()->addWidget(vol); diff --git a/dgedit/player.cc b/dgedit/player.cc index 64b3067..3a2bfd2 100644 --- a/dgedit/player.cc +++ b/dgedit/player.cc @@ -102,7 +102,9 @@ void Player::run() sample = pcm_data[p] * fade * gain_scalar; } - if(abs(sample) > peak) peak = abs(sample); + if(fabs(sample) > peak) { + peak = fabs(sample); + } s[i] = _MIN(sample * SHRT_MAX, SHRT_MAX); } diff --git a/dgedit/volumefader.cc b/dgedit/volumefader.cc index 33b1f57..08bab80 100644 --- a/dgedit/volumefader.cc +++ b/dgedit/volumefader.cc @@ -61,13 +61,14 @@ VolumeFader::~VolumeFader() } -void VolumeFader::updatePeakDb(double) +void VolumeFader::updatePeakDb(double db) { +// updatePeakPower(pow(10, db/20)); } void VolumeFader::updatePeakPower(double newpeak) { - peak = (newpeak * (1-P) + peak * P); + peak = (newpeak * (1.0-P) + peak * P); volumepeak->setText("Peak " + QString::number(peak, 'f', 5)); handleValueChanged(); } |