X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fscopes%2Faudioscopes%2Faudiospectrum.cpp;h=63b477a3579670d5200cb1a93dd9c4dd84ef686b;hb=8a6e4eb1dea318ecd1c0b313c28b764e89a524c4;hp=e60ceab038dc7774e8d880c650d527e52bd930f1;hpb=ddd3e50e4fc7f2744ad8de03650b66714441bc24;p=kdenlive diff --git a/src/scopes/audioscopes/audiospectrum.cpp b/src/scopes/audioscopes/audiospectrum.cpp index e60ceab0..63b477a3 100644 --- a/src/scopes/audioscopes/audiospectrum.cpp +++ b/src/scopes/audioscopes/audiospectrum.cpp @@ -14,9 +14,8 @@ #include "lib/audio/fftTools.h" #include "lib/external/kiss_fft/tools/kiss_fftr.h" -#include #include -#include +#include #include @@ -43,19 +42,19 @@ AudioSpectrum::AudioSpectrum(QWidget *parent) : AbstractAudioScopeWidget(true, parent) - , m_fftTools() - , m_lastFFT() - , m_lastFFTLock(1) - , m_peaks() + , m_fftTools() + , m_lastFFT() + , m_lastFFTLock(1) + , m_peaks() #ifdef DEBUG_AUDIOSPEC - , m_timeTotal(0) - , m_showTotal(0) + , m_timeTotal(0) + , m_showTotal(0) #endif - , m_dBmin(-70) - , m_dBmax(0) - , m_freqMax(0) - , m_customFreq(false) - ,colorizeFactor(0) + , m_dBmin(-70) + , m_dBmax(0) + , m_freqMax(0) + , m_customFreq(false) + ,colorizeFactor(0) { ui = new Ui::AudioSpectrum_UI; ui->setupUi(this); @@ -150,20 +149,38 @@ void AudioSpectrum::writeConfig() scopeConfig.sync(); } -QString AudioSpectrum::widgetName() const { return QString("AudioSpectrum"); } -bool AudioSpectrum::isBackgroundDependingOnInput() const { return false; } -bool AudioSpectrum::isScopeDependingOnInput() const { return true; } -bool AudioSpectrum::isHUDDependingOnInput() const { return false; } +QString AudioSpectrum::widgetName() const +{ + return QLatin1String("AudioSpectrum"); +} + +bool AudioSpectrum::isBackgroundDependingOnInput() const +{ + return false; +} -QImage AudioSpectrum::renderBackground(uint) { return QImage(); } +bool AudioSpectrum::isScopeDependingOnInput() const +{ + return true; +} + +bool AudioSpectrum::isHUDDependingOnInput() const +{ + return false; +} + +QImage AudioSpectrum::renderBackground(uint) +{ + return QImage(); +} -QImage AudioSpectrum::renderAudioScope(uint, const QVector audioFrame, const int freq, const int num_channels, +QImage AudioSpectrum::renderAudioScope(uint, const QVector &audioFrame, const int freq, const int num_channels, const int num_samples, const int) { if ( audioFrame.size() > 63 && m_innerScopeRect.width() > 0 && m_innerScopeRect.height() > 0 // <= 0 if widget is too small (resized by user) - ) { + ) { if (!m_customFreq) { m_freqMax = freq / 2; } @@ -485,21 +502,21 @@ QImage AudioSpectrum::renderHUD(uint) QRect AudioSpectrum::scopeRect() { m_scopeRect = QRect( - QPoint( + QPoint( 10, // Left ui->verticalSpacer->geometry().top()+6 // Top - ), - AbstractAudioScopeWidget::rect().bottomRight() - ); + ), + AbstractAudioScopeWidget::rect().bottomRight() + ); m_innerScopeRect = QRect( - QPoint( + QPoint( m_scopeRect.left()+6, // Left m_scopeRect.top()+6 // Top - ), QPoint( + ), QPoint( ui->verticalSpacer->geometry().right()-70, ui->verticalSpacer->geometry().bottom()-40 - ) - ); + ) + ); return m_scopeRect; }