diff options
-rw-r--r-- | examples/audiolevels/audiolevels.pro | 11 | ||||
-rw-r--r-- | examples/audiolevels/doc/src/audiolevels.qdoc (renamed from examples/spectrum/doc/src/spectrum.qdoc) | 0 | ||||
-rw-r--r-- | examples/audiolevels/main.cpp | 198 | ||||
-rw-r--r-- | examples/examples.pro | 4 | ||||
-rw-r--r-- | examples/spectrum/doc/images/spectrum-example.png | bin | 79769 -> 0 bytes | |||
-rw-r--r-- | tests/spectrum/3rdparty/fftreal/Array.h (renamed from examples/spectrum/3rdparty/fftreal/Array.h) | 0 | ||||
-rw-r--r-- | tests/spectrum/3rdparty/fftreal/Array.hpp (renamed from examples/spectrum/3rdparty/fftreal/Array.hpp) | 0 | ||||
-rw-r--r-- | tests/spectrum/3rdparty/fftreal/DynArray.h (renamed from examples/spectrum/3rdparty/fftreal/DynArray.h) | 0 | ||||
-rw-r--r-- | tests/spectrum/3rdparty/fftreal/DynArray.hpp (renamed from examples/spectrum/3rdparty/fftreal/DynArray.hpp) | 0 | ||||
-rw-r--r-- | tests/spectrum/3rdparty/fftreal/FFTReal.dsp (renamed from examples/spectrum/3rdparty/fftreal/FFTReal.dsp) | 0 | ||||
-rw-r--r-- | tests/spectrum/3rdparty/fftreal/FFTReal.dsw (renamed from examples/spectrum/3rdparty/fftreal/FFTReal.dsw) | 0 | ||||
-rw-r--r-- | tests/spectrum/3rdparty/fftreal/FFTReal.h (renamed from examples/spectrum/3rdparty/fftreal/FFTReal.h) | 0 | ||||
-rw-r--r-- | tests/spectrum/3rdparty/fftreal/FFTReal.hpp (renamed from examples/spectrum/3rdparty/fftreal/FFTReal.hpp) | 0 | ||||
-rw-r--r-- | tests/spectrum/3rdparty/fftreal/FFTRealFixLen.h (renamed from examples/spectrum/3rdparty/fftreal/FFTRealFixLen.h) | 0 | ||||
-rw-r--r-- | tests/spectrum/3rdparty/fftreal/FFTRealFixLen.hpp (renamed from examples/spectrum/3rdparty/fftreal/FFTRealFixLen.hpp) | 0 | ||||
-rw-r--r-- | tests/spectrum/3rdparty/fftreal/FFTRealFixLenParam.h (renamed from examples/spectrum/3rdparty/fftreal/FFTRealFixLenParam.h) | 0 | ||||
-rw-r--r-- | tests/spectrum/3rdparty/fftreal/FFTRealPassDirect.h (renamed from examples/spectrum/3rdparty/fftreal/FFTRealPassDirect.h) | 0 | ||||
-rw-r--r-- | tests/spectrum/3rdparty/fftreal/FFTRealPassDirect.hpp (renamed from examples/spectrum/3rdparty/fftreal/FFTRealPassDirect.hpp) | 0 | ||||
-rw-r--r-- | tests/spectrum/3rdparty/fftreal/FFTRealPassInverse.h (renamed from examples/spectrum/3rdparty/fftreal/FFTRealPassInverse.h) | 0 | ||||
-rw-r--r-- | tests/spectrum/3rdparty/fftreal/FFTRealPassInverse.hpp (renamed from examples/spectrum/3rdparty/fftreal/FFTRealPassInverse.hpp) | 0 | ||||
-rw-r--r-- | tests/spectrum/3rdparty/fftreal/FFTRealSelect.h (renamed from examples/spectrum/3rdparty/fftreal/FFTRealSelect.h) | 0 | ||||
-rw-r--r-- | tests/spectrum/3rdparty/fftreal/FFTRealSelect.hpp (renamed from examples/spectrum/3rdparty/fftreal/FFTRealSelect.hpp) | 0 | ||||
-rw-r--r-- | tests/spectrum/3rdparty/fftreal/FFTRealUseTrigo.h (renamed from examples/spectrum/3rdparty/fftreal/FFTRealUseTrigo.h) | 0 | ||||
-rw-r--r-- | tests/spectrum/3rdparty/fftreal/FFTRealUseTrigo.hpp (renamed from examples/spectrum/3rdparty/fftreal/FFTRealUseTrigo.hpp) | 0 | ||||
-rw-r--r-- | tests/spectrum/3rdparty/fftreal/OscSinCos.h (renamed from examples/spectrum/3rdparty/fftreal/OscSinCos.h) | 0 | ||||
-rw-r--r-- | tests/spectrum/3rdparty/fftreal/OscSinCos.hpp (renamed from examples/spectrum/3rdparty/fftreal/OscSinCos.hpp) | 0 | ||||
-rw-r--r-- | tests/spectrum/3rdparty/fftreal/TestAccuracy.h (renamed from examples/spectrum/3rdparty/fftreal/TestAccuracy.h) | 0 | ||||
-rw-r--r-- | tests/spectrum/3rdparty/fftreal/TestAccuracy.hpp (renamed from examples/spectrum/3rdparty/fftreal/TestAccuracy.hpp) | 0 | ||||
-rw-r--r-- | tests/spectrum/3rdparty/fftreal/TestHelperFixLen.h (renamed from examples/spectrum/3rdparty/fftreal/TestHelperFixLen.h) | 0 | ||||
-rw-r--r-- | tests/spectrum/3rdparty/fftreal/TestHelperFixLen.hpp (renamed from examples/spectrum/3rdparty/fftreal/TestHelperFixLen.hpp) | 0 | ||||
-rw-r--r-- | tests/spectrum/3rdparty/fftreal/TestHelperNormal.h (renamed from examples/spectrum/3rdparty/fftreal/TestHelperNormal.h) | 0 | ||||
-rw-r--r-- | tests/spectrum/3rdparty/fftreal/TestHelperNormal.hpp (renamed from examples/spectrum/3rdparty/fftreal/TestHelperNormal.hpp) | 0 | ||||
-rw-r--r-- | tests/spectrum/3rdparty/fftreal/TestSpeed.h (renamed from examples/spectrum/3rdparty/fftreal/TestSpeed.h) | 0 | ||||
-rw-r--r-- | tests/spectrum/3rdparty/fftreal/TestSpeed.hpp (renamed from examples/spectrum/3rdparty/fftreal/TestSpeed.hpp) | 0 | ||||
-rw-r--r-- | tests/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.h (renamed from examples/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.h) | 0 | ||||
-rw-r--r-- | tests/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.hpp (renamed from examples/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.hpp) | 0 | ||||
-rw-r--r-- | tests/spectrum/3rdparty/fftreal/def.h (renamed from examples/spectrum/3rdparty/fftreal/def.h) | 0 | ||||
-rw-r--r-- | tests/spectrum/3rdparty/fftreal/fftreal.pas (renamed from examples/spectrum/3rdparty/fftreal/fftreal.pas) | 0 | ||||
-rw-r--r-- | tests/spectrum/3rdparty/fftreal/fftreal.pro (renamed from examples/spectrum/3rdparty/fftreal/fftreal.pro) | 0 | ||||
-rw-r--r-- | tests/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp (renamed from examples/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp) | 0 | ||||
-rw-r--r-- | tests/spectrum/3rdparty/fftreal/fftreal_wrapper.h (renamed from examples/spectrum/3rdparty/fftreal/fftreal_wrapper.h) | 0 | ||||
-rw-r--r-- | tests/spectrum/3rdparty/fftreal/license.txt (renamed from examples/spectrum/3rdparty/fftreal/license.txt) | 0 | ||||
-rw-r--r-- | tests/spectrum/3rdparty/fftreal/readme.txt (renamed from examples/spectrum/3rdparty/fftreal/readme.txt) | 0 | ||||
-rw-r--r-- | tests/spectrum/3rdparty/fftreal/test.cpp (renamed from examples/spectrum/3rdparty/fftreal/test.cpp) | 0 | ||||
-rw-r--r-- | tests/spectrum/3rdparty/fftreal/test_fnc.h (renamed from examples/spectrum/3rdparty/fftreal/test_fnc.h) | 0 | ||||
-rw-r--r-- | tests/spectrum/3rdparty/fftreal/test_fnc.hpp (renamed from examples/spectrum/3rdparty/fftreal/test_fnc.hpp) | 0 | ||||
-rw-r--r-- | tests/spectrum/3rdparty/fftreal/test_settings.h (renamed from examples/spectrum/3rdparty/fftreal/test_settings.h) | 0 | ||||
-rw-r--r-- | tests/spectrum/3rdparty/fftreal/testapp.dpr (renamed from examples/spectrum/3rdparty/fftreal/testapp.dpr) | 0 | ||||
-rw-r--r-- | tests/spectrum/README.txt (renamed from examples/spectrum/README.txt) | 0 | ||||
-rw-r--r-- | tests/spectrum/spectrum.pri (renamed from examples/spectrum/spectrum.pri) | 0 | ||||
-rw-r--r-- | tests/spectrum/spectrum.pro (renamed from examples/spectrum/spectrum.pro) | 3 | ||||
-rw-r--r-- | tests/spectrum/spectrumapp/engine.cpp (renamed from examples/spectrum/spectrumapp/engine.cpp) | 6 | ||||
-rw-r--r-- | tests/spectrum/spectrumapp/engine.h (renamed from examples/spectrum/spectrumapp/engine.h) | 0 | ||||
-rw-r--r-- | tests/spectrum/spectrumapp/frequencyspectrum.cpp (renamed from examples/spectrum/spectrumapp/frequencyspectrum.cpp) | 0 | ||||
-rw-r--r-- | tests/spectrum/spectrumapp/frequencyspectrum.h (renamed from examples/spectrum/spectrumapp/frequencyspectrum.h) | 0 | ||||
-rw-r--r-- | tests/spectrum/spectrumapp/main.cpp (renamed from examples/spectrum/spectrumapp/main.cpp) | 0 | ||||
-rw-r--r-- | tests/spectrum/spectrumapp/soundFiles/Rockhop.wav (renamed from examples/spectrum/spectrumapp/soundFiles/Rockhop.wav) | bin | 1059308 -> 1059308 bytes | |||
-rw-r--r-- | tests/spectrum/spectrumapp/soundFiles/futurebells_beat.wav (renamed from examples/spectrum/spectrumapp/soundFiles/futurebells_beat.wav) | bin | 352084 -> 352084 bytes | |||
-rw-r--r-- | tests/spectrum/spectrumapp/soundFiles/onclassical_demo_fiati-di-parma_thuille_terzo-tempo_sestetto_small-version.wav (renamed from examples/spectrum/spectrumapp/soundFiles/onclassical_demo_fiati-di-parma_thuille_terzo-tempo_sestetto_small-version.wav) | bin | 1055502 -> 1055502 bytes | |||
-rw-r--r-- | tests/spectrum/spectrumapp/spectrum.h (renamed from examples/spectrum/spectrumapp/spectrum.h) | 0 | ||||
-rw-r--r-- | tests/spectrum/spectrumapp/spectrum.qrc (renamed from examples/spectrum/spectrumapp/spectrum.qrc) | 0 | ||||
-rw-r--r-- | tests/spectrum/spectrumapp/spectrumanalyser.cpp (renamed from examples/spectrum/spectrumapp/spectrumanalyser.cpp) | 0 | ||||
-rw-r--r-- | tests/spectrum/spectrumapp/spectrumanalyser.h (renamed from examples/spectrum/spectrumapp/spectrumanalyser.h) | 0 | ||||
-rw-r--r-- | tests/spectrum/spectrumapp/spectrumapp.pro (renamed from examples/spectrum/spectrumapp/spectrumapp.pro) | 4 | ||||
-rw-r--r-- | tests/spectrum/spectrumapp/utils.cpp (renamed from examples/spectrum/spectrumapp/utils.cpp) | 0 | ||||
-rw-r--r-- | tests/spectrum/spectrumapp/utils.h (renamed from examples/spectrum/spectrumapp/utils.h) | 0 | ||||
-rw-r--r-- | tests/spectrum/spectrumapp/wavfile.cpp (renamed from examples/spectrum/spectrumapp/wavfile.cpp) | 0 | ||||
-rw-r--r-- | tests/spectrum/spectrumapp/wavfile.h (renamed from examples/spectrum/spectrumapp/wavfile.h) | 0 | ||||
-rw-r--r-- | tests/tests.pro | 2 |
69 files changed, 224 insertions, 4 deletions
diff --git a/examples/audiolevels/audiolevels.pro b/examples/audiolevels/audiolevels.pro new file mode 100644 index 00000000..8a75e6f3 --- /dev/null +++ b/examples/audiolevels/audiolevels.pro @@ -0,0 +1,11 @@ +!include( ../examples.pri ) { + error( "Couldn't find the examples.pri file!" ) +} + +TARGET = audiolevels + +QT += multimedia + +SOURCES += main.cpp + +INSTALLS += target diff --git a/examples/spectrum/doc/src/spectrum.qdoc b/examples/audiolevels/doc/src/audiolevels.qdoc index 612c31cd..612c31cd 100644 --- a/examples/spectrum/doc/src/spectrum.qdoc +++ b/examples/audiolevels/doc/src/audiolevels.qdoc diff --git a/examples/audiolevels/main.cpp b/examples/audiolevels/main.cpp new file mode 100644 index 00000000..c31b35cc --- /dev/null +++ b/examples/audiolevels/main.cpp @@ -0,0 +1,198 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVis3D module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +#include <QtDataVis3D/q3dbars.h> +#include <QtDataVis3D/qbardataproxy.h> +#include <QtDataVis3D/qvalueaxis.h> + +#include <QGuiApplication> +#include <QAudio> +#include <QTimer> + +//#define USE_CONES + +using namespace QtDataVis3D; +#if 0 +class AudioLevels : public QObject +{ +public: + AudioLevels(Q3DBars *window); + ~AudioLevels(); + + void start(QString fileName); + +public slots: + void spectrumChanged(qint64 position, qint64 length, const FrequencySpectrum &spectrum); + void stateChanged(QAudio::Mode mode, QAudio::State state); + +private slots: + void restart(); + +private: + int barIndex(qreal frequency) const; + +private: + Q3DBars *m_chart; + Engine *m_engine; + QTimer *m_restartTimer; + // Lower bound of first band in the spectrum in Hz + qreal m_lowFreq; + // Upper band of last band in the spectrum in Hz + qreal m_highFreq; +}; + +AudioLevels::AudioLevels(Q3DBars *window) + : m_chart(window), + m_engine(new Engine(this)), + m_restartTimer(new QTimer(this)), + m_lowFreq(SpectrumLowFreq), + m_highFreq(SpectrumHighFreq) +{ + m_chart->setDataWindow(SpectrumNumBands * 2, SpectrumNumBands); + // Disable grid + m_chart->setGridVisible(false); + // Disable auto-scaling of height by defining explicit range + m_chart->valueAxis()->setRange(0.0, 1.0); + // Disable shadows + m_chart->setShadowQuality(QDataVis::ShadowNone); +#if USE_CONES + // Set bar specifications; make them a bit wider than deep and make them be drawn 75% + // inside each other + m_chart->setBarSpecs(1.25), QSizeF(0.2, -0.75)); + // Set bar type, smooth cones + m_chart->setBarType(QDataVis::Cones, true); + // Adjust zoom manually; automatic zoom level calculation does not work well with negative + // spacings (in setBarSpecs) + m_chart->setCameraPosition(10.0f, 5.0f, 70); +#else + // Set bar specifications; make them twice as wide as they're deep + m_chart->setBarSpecs(2.0, QSizeF(0.0, 0.0)); + // Set bar type, flat bars + m_chart->setBarType(QDataVis::Bars, false); + // Adjust camera position + m_chart->setCameraPosition(10.0f, 7.5f, 75); +#endif + // Set color scheme + m_chart->setBarColor(QColor(Qt::black), QColor(Qt::red), QColor(Qt::darkYellow)); + // Disable selection + m_chart->setSelectionMode(QDataVis::ModeNone); + QObject::connect(m_engine, &Engine::changedSpectrum, this, &AudioLevels::spectrumChanged); + QObject::connect(m_engine, &Engine::stateChanged, this, &AudioLevels::stateChanged); + m_restartTimer->setSingleShot(true); + QObject::connect(m_restartTimer, &QTimer::timeout, this, &AudioLevels::restart); + + QBarDataProxy *proxy = new QBarDataProxy; + m_chart->setActiveDataProxy(proxy); +} + +AudioLevels::~AudioLevels() +{ + delete m_engine; + delete m_restartTimer; +} + +void AudioLevels::start(QString fileName) +{ + m_engine->loadFile(fileName); + m_engine->startPlayback(); +} + +//----------------------------------------------------------------------------- +// Public slots +//----------------------------------------------------------------------------- + +void AudioLevels::spectrumChanged(qint64 position, qint64 length, const FrequencySpectrum &spectrum) +{ + Q_UNUSED(position); + Q_UNUSED(length); + //qDebug() << "updating bar values" << position << length; + QBarDataRow *data = new QBarDataRow(SpectrumNumBands); + for (int bar = 0; bar < SpectrumNumBands; bar++) { + // init data set + (*data)[bar].setValue(qreal(0.0)); + } + FrequencySpectrum::const_iterator i = spectrum.begin(); + const FrequencySpectrum::const_iterator end = spectrum.end(); + for ( ; i != end; ++i) { + const FrequencySpectrum::Element e = *i; + if (e.frequency >= m_lowFreq && e.frequency < m_highFreq) { + (*data)[barIndex(e.frequency)].setValue(qMax(data->at(barIndex(e.frequency)).value(), qreal(e.amplitude))); + } + } + static_cast<QBarDataProxy *>(m_chart->activeDataProxy())->insertRow(0, data); +} + +void AudioLevels::stateChanged(QAudio::Mode mode, QAudio::State state) +{ + //qDebug() << "mode:" << mode << " state: " << state; + // Restart once playback is finished + if (QAudio::AudioOutput == mode && QAudio::StoppedState == state) + m_restartTimer->start(500); +} + +//----------------------------------------------------------------------------- +// Private slots +//----------------------------------------------------------------------------- + +void AudioLevels::restart() +{ + // Change file each time + QString fileToLoad = QStringLiteral(":/file"); + static int fileNo = 3; + QString nrStr; + nrStr.setNum(fileNo); + fileToLoad.append(nrStr); + //qDebug() << fileToLoad; + start(fileToLoad); + fileNo++; + if (fileNo > 3) + fileNo = 1; +} + +//----------------------------------------------------------------------------- +// Private functions +//----------------------------------------------------------------------------- + +int AudioLevels::barIndex(qreal frequency) const +{ + Q_ASSERT(frequency >= m_lowFreq && frequency < m_highFreq); + const qreal bandWidth = (m_highFreq - m_lowFreq) / SpectrumNumBands; + const int index = (frequency - m_lowFreq) / bandWidth; + if (index < 0 || index >= SpectrumNumBands) + Q_ASSERT(false); + //qDebug() << "insert to" << index; + return index; +} +#endif +//----------------------------------------------------------------------------- +// main +//----------------------------------------------------------------------------- +int main(int argc, char *argv[]) +{ + QGuiApplication app(argc, argv); + app.setApplicationName("QtDataVis3D spectrum analyzer"); + + Q3DBars window; + window.resize(1024, 768); + window.show(); + +// AudioLevels *AudioLevels = new AudioLevels(&window); +// AudioLevels->start(QStringLiteral(":/file2")); + + return app.exec(); +} diff --git a/examples/examples.pro b/examples/examples.pro index 4db7ed2f..4712e0d0 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -2,11 +2,11 @@ TEMPLATE = subdirs SUBDIRS += barchart \ rainfall \ widget \ - mapdata \ + #mapdata \ qmlbarchart \ #qmlmaps \ qmlscatter \ surfacechart \ scatterchart -qtHaveModule(multimedia):!android: SUBDIRS += spectrum +qtHaveModule(multimedia):!android: SUBDIRS += audiolevels diff --git a/examples/spectrum/doc/images/spectrum-example.png b/examples/spectrum/doc/images/spectrum-example.png Binary files differdeleted file mode 100644 index 2a703948..00000000 --- a/examples/spectrum/doc/images/spectrum-example.png +++ /dev/null diff --git a/examples/spectrum/3rdparty/fftreal/Array.h b/tests/spectrum/3rdparty/fftreal/Array.h index a08e3cf2..a08e3cf2 100644 --- a/examples/spectrum/3rdparty/fftreal/Array.h +++ b/tests/spectrum/3rdparty/fftreal/Array.h diff --git a/examples/spectrum/3rdparty/fftreal/Array.hpp b/tests/spectrum/3rdparty/fftreal/Array.hpp index 8300077e..8300077e 100644 --- a/examples/spectrum/3rdparty/fftreal/Array.hpp +++ b/tests/spectrum/3rdparty/fftreal/Array.hpp diff --git a/examples/spectrum/3rdparty/fftreal/DynArray.h b/tests/spectrum/3rdparty/fftreal/DynArray.h index 8041a0c1..8041a0c1 100644 --- a/examples/spectrum/3rdparty/fftreal/DynArray.h +++ b/tests/spectrum/3rdparty/fftreal/DynArray.h diff --git a/examples/spectrum/3rdparty/fftreal/DynArray.hpp b/tests/spectrum/3rdparty/fftreal/DynArray.hpp index e62b10f8..e62b10f8 100644 --- a/examples/spectrum/3rdparty/fftreal/DynArray.hpp +++ b/tests/spectrum/3rdparty/fftreal/DynArray.hpp diff --git a/examples/spectrum/3rdparty/fftreal/FFTReal.dsp b/tests/spectrum/3rdparty/fftreal/FFTReal.dsp index fe970db0..fe970db0 100644 --- a/examples/spectrum/3rdparty/fftreal/FFTReal.dsp +++ b/tests/spectrum/3rdparty/fftreal/FFTReal.dsp diff --git a/examples/spectrum/3rdparty/fftreal/FFTReal.dsw b/tests/spectrum/3rdparty/fftreal/FFTReal.dsw index 076b0aeb..076b0aeb 100644 --- a/examples/spectrum/3rdparty/fftreal/FFTReal.dsw +++ b/tests/spectrum/3rdparty/fftreal/FFTReal.dsw diff --git a/examples/spectrum/3rdparty/fftreal/FFTReal.h b/tests/spectrum/3rdparty/fftreal/FFTReal.h index 9fb27250..9fb27250 100644 --- a/examples/spectrum/3rdparty/fftreal/FFTReal.h +++ b/tests/spectrum/3rdparty/fftreal/FFTReal.h diff --git a/examples/spectrum/3rdparty/fftreal/FFTReal.hpp b/tests/spectrum/3rdparty/fftreal/FFTReal.hpp index 335d771d..335d771d 100644 --- a/examples/spectrum/3rdparty/fftreal/FFTReal.hpp +++ b/tests/spectrum/3rdparty/fftreal/FFTReal.hpp diff --git a/examples/spectrum/3rdparty/fftreal/FFTRealFixLen.h b/tests/spectrum/3rdparty/fftreal/FFTRealFixLen.h index 0b802668..0b802668 100644 --- a/examples/spectrum/3rdparty/fftreal/FFTRealFixLen.h +++ b/tests/spectrum/3rdparty/fftreal/FFTRealFixLen.h diff --git a/examples/spectrum/3rdparty/fftreal/FFTRealFixLen.hpp b/tests/spectrum/3rdparty/fftreal/FFTRealFixLen.hpp index 6defb009..6defb009 100644 --- a/examples/spectrum/3rdparty/fftreal/FFTRealFixLen.hpp +++ b/tests/spectrum/3rdparty/fftreal/FFTRealFixLen.hpp diff --git a/examples/spectrum/3rdparty/fftreal/FFTRealFixLenParam.h b/tests/spectrum/3rdparty/fftreal/FFTRealFixLenParam.h index 163c0832..163c0832 100644 --- a/examples/spectrum/3rdparty/fftreal/FFTRealFixLenParam.h +++ b/tests/spectrum/3rdparty/fftreal/FFTRealFixLenParam.h diff --git a/examples/spectrum/3rdparty/fftreal/FFTRealPassDirect.h b/tests/spectrum/3rdparty/fftreal/FFTRealPassDirect.h index 7d19c02e..7d19c02e 100644 --- a/examples/spectrum/3rdparty/fftreal/FFTRealPassDirect.h +++ b/tests/spectrum/3rdparty/fftreal/FFTRealPassDirect.h diff --git a/examples/spectrum/3rdparty/fftreal/FFTRealPassDirect.hpp b/tests/spectrum/3rdparty/fftreal/FFTRealPassDirect.hpp index db9d568e..db9d568e 100644 --- a/examples/spectrum/3rdparty/fftreal/FFTRealPassDirect.hpp +++ b/tests/spectrum/3rdparty/fftreal/FFTRealPassDirect.hpp diff --git a/examples/spectrum/3rdparty/fftreal/FFTRealPassInverse.h b/tests/spectrum/3rdparty/fftreal/FFTRealPassInverse.h index 2de89527..2de89527 100644 --- a/examples/spectrum/3rdparty/fftreal/FFTRealPassInverse.h +++ b/tests/spectrum/3rdparty/fftreal/FFTRealPassInverse.h diff --git a/examples/spectrum/3rdparty/fftreal/FFTRealPassInverse.hpp b/tests/spectrum/3rdparty/fftreal/FFTRealPassInverse.hpp index 57375469..57375469 100644 --- a/examples/spectrum/3rdparty/fftreal/FFTRealPassInverse.hpp +++ b/tests/spectrum/3rdparty/fftreal/FFTRealPassInverse.hpp diff --git a/examples/spectrum/3rdparty/fftreal/FFTRealSelect.h b/tests/spectrum/3rdparty/fftreal/FFTRealSelect.h index bd722d4d..bd722d4d 100644 --- a/examples/spectrum/3rdparty/fftreal/FFTRealSelect.h +++ b/tests/spectrum/3rdparty/fftreal/FFTRealSelect.h diff --git a/examples/spectrum/3rdparty/fftreal/FFTRealSelect.hpp b/tests/spectrum/3rdparty/fftreal/FFTRealSelect.hpp index 9ddf5864..9ddf5864 100644 --- a/examples/spectrum/3rdparty/fftreal/FFTRealSelect.hpp +++ b/tests/spectrum/3rdparty/fftreal/FFTRealSelect.hpp diff --git a/examples/spectrum/3rdparty/fftreal/FFTRealUseTrigo.h b/tests/spectrum/3rdparty/fftreal/FFTRealUseTrigo.h index c4368ee0..c4368ee0 100644 --- a/examples/spectrum/3rdparty/fftreal/FFTRealUseTrigo.h +++ b/tests/spectrum/3rdparty/fftreal/FFTRealUseTrigo.h diff --git a/examples/spectrum/3rdparty/fftreal/FFTRealUseTrigo.hpp b/tests/spectrum/3rdparty/fftreal/FFTRealUseTrigo.hpp index aa968b81..aa968b81 100644 --- a/examples/spectrum/3rdparty/fftreal/FFTRealUseTrigo.hpp +++ b/tests/spectrum/3rdparty/fftreal/FFTRealUseTrigo.hpp diff --git a/examples/spectrum/3rdparty/fftreal/OscSinCos.h b/tests/spectrum/3rdparty/fftreal/OscSinCos.h index 775fc14f..775fc14f 100644 --- a/examples/spectrum/3rdparty/fftreal/OscSinCos.h +++ b/tests/spectrum/3rdparty/fftreal/OscSinCos.h diff --git a/examples/spectrum/3rdparty/fftreal/OscSinCos.hpp b/tests/spectrum/3rdparty/fftreal/OscSinCos.hpp index 749aef04..749aef04 100644 --- a/examples/spectrum/3rdparty/fftreal/OscSinCos.hpp +++ b/tests/spectrum/3rdparty/fftreal/OscSinCos.hpp diff --git a/examples/spectrum/3rdparty/fftreal/TestAccuracy.h b/tests/spectrum/3rdparty/fftreal/TestAccuracy.h index 4b07a6b6..4b07a6b6 100644 --- a/examples/spectrum/3rdparty/fftreal/TestAccuracy.h +++ b/tests/spectrum/3rdparty/fftreal/TestAccuracy.h diff --git a/examples/spectrum/3rdparty/fftreal/TestAccuracy.hpp b/tests/spectrum/3rdparty/fftreal/TestAccuracy.hpp index 5c794f74..5c794f74 100644 --- a/examples/spectrum/3rdparty/fftreal/TestAccuracy.hpp +++ b/tests/spectrum/3rdparty/fftreal/TestAccuracy.hpp diff --git a/examples/spectrum/3rdparty/fftreal/TestHelperFixLen.h b/tests/spectrum/3rdparty/fftreal/TestHelperFixLen.h index ecff96d3..ecff96d3 100644 --- a/examples/spectrum/3rdparty/fftreal/TestHelperFixLen.h +++ b/tests/spectrum/3rdparty/fftreal/TestHelperFixLen.h diff --git a/examples/spectrum/3rdparty/fftreal/TestHelperFixLen.hpp b/tests/spectrum/3rdparty/fftreal/TestHelperFixLen.hpp index 25048b91..25048b91 100644 --- a/examples/spectrum/3rdparty/fftreal/TestHelperFixLen.hpp +++ b/tests/spectrum/3rdparty/fftreal/TestHelperFixLen.hpp diff --git a/examples/spectrum/3rdparty/fftreal/TestHelperNormal.h b/tests/spectrum/3rdparty/fftreal/TestHelperNormal.h index a7bff5c2..a7bff5c2 100644 --- a/examples/spectrum/3rdparty/fftreal/TestHelperNormal.h +++ b/tests/spectrum/3rdparty/fftreal/TestHelperNormal.h diff --git a/examples/spectrum/3rdparty/fftreal/TestHelperNormal.hpp b/tests/spectrum/3rdparty/fftreal/TestHelperNormal.hpp index e037696a..e037696a 100644 --- a/examples/spectrum/3rdparty/fftreal/TestHelperNormal.hpp +++ b/tests/spectrum/3rdparty/fftreal/TestHelperNormal.hpp diff --git a/examples/spectrum/3rdparty/fftreal/TestSpeed.h b/tests/spectrum/3rdparty/fftreal/TestSpeed.h index 22957818..22957818 100644 --- a/examples/spectrum/3rdparty/fftreal/TestSpeed.h +++ b/tests/spectrum/3rdparty/fftreal/TestSpeed.h diff --git a/examples/spectrum/3rdparty/fftreal/TestSpeed.hpp b/tests/spectrum/3rdparty/fftreal/TestSpeed.hpp index e716b2a7..e716b2a7 100644 --- a/examples/spectrum/3rdparty/fftreal/TestSpeed.hpp +++ b/tests/spectrum/3rdparty/fftreal/TestSpeed.hpp diff --git a/examples/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.h b/tests/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.h index d815f8e3..d815f8e3 100644 --- a/examples/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.h +++ b/tests/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.h diff --git a/examples/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.hpp b/tests/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.hpp index 13b7eb3e..13b7eb3e 100644 --- a/examples/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.hpp +++ b/tests/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.hpp diff --git a/examples/spectrum/3rdparty/fftreal/def.h b/tests/spectrum/3rdparty/fftreal/def.h index 99c545f5..99c545f5 100644 --- a/examples/spectrum/3rdparty/fftreal/def.h +++ b/tests/spectrum/3rdparty/fftreal/def.h diff --git a/examples/spectrum/3rdparty/fftreal/fftreal.pas b/tests/spectrum/3rdparty/fftreal/fftreal.pas index ea637545..ea637545 100644 --- a/examples/spectrum/3rdparty/fftreal/fftreal.pas +++ b/tests/spectrum/3rdparty/fftreal/fftreal.pas diff --git a/examples/spectrum/3rdparty/fftreal/fftreal.pro b/tests/spectrum/3rdparty/fftreal/fftreal.pro index f6abeeb1..f6abeeb1 100644 --- a/examples/spectrum/3rdparty/fftreal/fftreal.pro +++ b/tests/spectrum/3rdparty/fftreal/fftreal.pro diff --git a/examples/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp b/tests/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp index 45aee653..45aee653 100644 --- a/examples/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp +++ b/tests/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp diff --git a/examples/spectrum/3rdparty/fftreal/fftreal_wrapper.h b/tests/spectrum/3rdparty/fftreal/fftreal_wrapper.h index 2fb602de..2fb602de 100644 --- a/examples/spectrum/3rdparty/fftreal/fftreal_wrapper.h +++ b/tests/spectrum/3rdparty/fftreal/fftreal_wrapper.h diff --git a/examples/spectrum/3rdparty/fftreal/license.txt b/tests/spectrum/3rdparty/fftreal/license.txt index 918fe68e..918fe68e 100644 --- a/examples/spectrum/3rdparty/fftreal/license.txt +++ b/tests/spectrum/3rdparty/fftreal/license.txt diff --git a/examples/spectrum/3rdparty/fftreal/readme.txt b/tests/spectrum/3rdparty/fftreal/readme.txt index 0c5ce162..0c5ce162 100644 --- a/examples/spectrum/3rdparty/fftreal/readme.txt +++ b/tests/spectrum/3rdparty/fftreal/readme.txt diff --git a/examples/spectrum/3rdparty/fftreal/test.cpp b/tests/spectrum/3rdparty/fftreal/test.cpp index 7b6ed2ca..7b6ed2ca 100644 --- a/examples/spectrum/3rdparty/fftreal/test.cpp +++ b/tests/spectrum/3rdparty/fftreal/test.cpp diff --git a/examples/spectrum/3rdparty/fftreal/test_fnc.h b/tests/spectrum/3rdparty/fftreal/test_fnc.h index 26221566..26221566 100644 --- a/examples/spectrum/3rdparty/fftreal/test_fnc.h +++ b/tests/spectrum/3rdparty/fftreal/test_fnc.h diff --git a/examples/spectrum/3rdparty/fftreal/test_fnc.hpp b/tests/spectrum/3rdparty/fftreal/test_fnc.hpp index 4b5f9f59..4b5f9f59 100644 --- a/examples/spectrum/3rdparty/fftreal/test_fnc.hpp +++ b/tests/spectrum/3rdparty/fftreal/test_fnc.hpp diff --git a/examples/spectrum/3rdparty/fftreal/test_settings.h b/tests/spectrum/3rdparty/fftreal/test_settings.h index b893afc8..b893afc8 100644 --- a/examples/spectrum/3rdparty/fftreal/test_settings.h +++ b/tests/spectrum/3rdparty/fftreal/test_settings.h diff --git a/examples/spectrum/3rdparty/fftreal/testapp.dpr b/tests/spectrum/3rdparty/fftreal/testapp.dpr index 54f2eb99..54f2eb99 100644 --- a/examples/spectrum/3rdparty/fftreal/testapp.dpr +++ b/tests/spectrum/3rdparty/fftreal/testapp.dpr diff --git a/examples/spectrum/README.txt b/tests/spectrum/README.txt index c39d4a70..c39d4a70 100644 --- a/examples/spectrum/README.txt +++ b/tests/spectrum/README.txt diff --git a/examples/spectrum/spectrum.pri b/tests/spectrum/spectrum.pri index 31a3767c..31a3767c 100644 --- a/examples/spectrum/spectrum.pri +++ b/tests/spectrum/spectrum.pri diff --git a/examples/spectrum/spectrum.pro b/tests/spectrum/spectrum.pro index 9a8d45ae..2f44bfac 100644 --- a/examples/spectrum/spectrum.pro +++ b/tests/spectrum/spectrum.pro @@ -1,4 +1,7 @@ qtHaveModule(multimedia) { +!include( ../tests.pri ) { + error( "Couldn't find the tests.pri file!" ) +} include(spectrum.pri) TEMPLATE = subdirs diff --git a/examples/spectrum/spectrumapp/engine.cpp b/tests/spectrum/spectrumapp/engine.cpp index c23a4f78..60605223 100644 --- a/examples/spectrum/spectrumapp/engine.cpp +++ b/tests/spectrum/spectrumapp/engine.cpp @@ -81,6 +81,12 @@ Engine::Engine(QObject *parent) SLOT(spectrumChanged(FrequencySpectrum))); initialize(); + qDebug() << "output devices:"; + foreach (QAudioDeviceInfo device, m_availableAudioOutputDevices) + qDebug() << device.deviceName(); + qDebug() << "input devices:"; + foreach (QAudioDeviceInfo device, m_availableAudioInputDevices) + qDebug() << device.deviceName(); } Engine::~Engine() diff --git a/examples/spectrum/spectrumapp/engine.h b/tests/spectrum/spectrumapp/engine.h index cdd8373f..cdd8373f 100644 --- a/examples/spectrum/spectrumapp/engine.h +++ b/tests/spectrum/spectrumapp/engine.h diff --git a/examples/spectrum/spectrumapp/frequencyspectrum.cpp b/tests/spectrum/spectrumapp/frequencyspectrum.cpp index 013d0454..013d0454 100644 --- a/examples/spectrum/spectrumapp/frequencyspectrum.cpp +++ b/tests/spectrum/spectrumapp/frequencyspectrum.cpp diff --git a/examples/spectrum/spectrumapp/frequencyspectrum.h b/tests/spectrum/spectrumapp/frequencyspectrum.h index fac9a1b7..fac9a1b7 100644 --- a/examples/spectrum/spectrumapp/frequencyspectrum.h +++ b/tests/spectrum/spectrumapp/frequencyspectrum.h diff --git a/examples/spectrum/spectrumapp/main.cpp b/tests/spectrum/spectrumapp/main.cpp index 32076b88..32076b88 100644 --- a/examples/spectrum/spectrumapp/main.cpp +++ b/tests/spectrum/spectrumapp/main.cpp diff --git a/examples/spectrum/spectrumapp/soundFiles/Rockhop.wav b/tests/spectrum/spectrumapp/soundFiles/Rockhop.wav Binary files differindex e56e1c0f..e56e1c0f 100644 --- a/examples/spectrum/spectrumapp/soundFiles/Rockhop.wav +++ b/tests/spectrum/spectrumapp/soundFiles/Rockhop.wav diff --git a/examples/spectrum/spectrumapp/soundFiles/futurebells_beat.wav b/tests/spectrum/spectrumapp/soundFiles/futurebells_beat.wav Binary files differindex c45cbc71..c45cbc71 100644 --- a/examples/spectrum/spectrumapp/soundFiles/futurebells_beat.wav +++ b/tests/spectrum/spectrumapp/soundFiles/futurebells_beat.wav diff --git a/examples/spectrum/spectrumapp/soundFiles/onclassical_demo_fiati-di-parma_thuille_terzo-tempo_sestetto_small-version.wav b/tests/spectrum/spectrumapp/soundFiles/onclassical_demo_fiati-di-parma_thuille_terzo-tempo_sestetto_small-version.wav Binary files differindex 78b8dbda..78b8dbda 100644 --- a/examples/spectrum/spectrumapp/soundFiles/onclassical_demo_fiati-di-parma_thuille_terzo-tempo_sestetto_small-version.wav +++ b/tests/spectrum/spectrumapp/soundFiles/onclassical_demo_fiati-di-parma_thuille_terzo-tempo_sestetto_small-version.wav diff --git a/examples/spectrum/spectrumapp/spectrum.h b/tests/spectrum/spectrumapp/spectrum.h index 015989d5..015989d5 100644 --- a/examples/spectrum/spectrumapp/spectrum.h +++ b/tests/spectrum/spectrumapp/spectrum.h diff --git a/examples/spectrum/spectrumapp/spectrum.qrc b/tests/spectrum/spectrumapp/spectrum.qrc index 9368abc7..9368abc7 100644 --- a/examples/spectrum/spectrumapp/spectrum.qrc +++ b/tests/spectrum/spectrumapp/spectrum.qrc diff --git a/examples/spectrum/spectrumapp/spectrumanalyser.cpp b/tests/spectrum/spectrumapp/spectrumanalyser.cpp index 4cebfde9..4cebfde9 100644 --- a/examples/spectrum/spectrumapp/spectrumanalyser.cpp +++ b/tests/spectrum/spectrumapp/spectrumanalyser.cpp diff --git a/examples/spectrum/spectrumapp/spectrumanalyser.h b/tests/spectrum/spectrumapp/spectrumanalyser.h index 6d9291ef..6d9291ef 100644 --- a/examples/spectrum/spectrumapp/spectrumanalyser.h +++ b/tests/spectrum/spectrumapp/spectrumanalyser.h diff --git a/examples/spectrum/spectrumapp/spectrumapp.pro b/tests/spectrum/spectrumapp/spectrumapp.pro index c2455f78..0fc0584c 100644 --- a/examples/spectrum/spectrumapp/spectrumapp.pro +++ b/tests/spectrum/spectrumapp/spectrumapp.pro @@ -1,5 +1,5 @@ -!include( ../../examples.pri ) { - error( "Couldn't find the examples.pri file!" ) +!include( ../../tests.pri ) { + error( "Couldn't find the tests.pri file!" ) } !include( ../spectrum.pri ) { diff --git a/examples/spectrum/spectrumapp/utils.cpp b/tests/spectrum/spectrumapp/utils.cpp index bad6cc48..bad6cc48 100644 --- a/examples/spectrum/spectrumapp/utils.cpp +++ b/tests/spectrum/spectrumapp/utils.cpp diff --git a/examples/spectrum/spectrumapp/utils.h b/tests/spectrum/spectrumapp/utils.h index f0ae5633..f0ae5633 100644 --- a/examples/spectrum/spectrumapp/utils.h +++ b/tests/spectrum/spectrumapp/utils.h diff --git a/examples/spectrum/spectrumapp/wavfile.cpp b/tests/spectrum/spectrumapp/wavfile.cpp index 24482507..24482507 100644 --- a/examples/spectrum/spectrumapp/wavfile.cpp +++ b/tests/spectrum/spectrumapp/wavfile.cpp diff --git a/examples/spectrum/spectrumapp/wavfile.h b/tests/spectrum/spectrumapp/wavfile.h index e408911b..e408911b 100644 --- a/examples/spectrum/spectrumapp/wavfile.h +++ b/tests/spectrum/spectrumapp/wavfile.h diff --git a/tests/tests.pro b/tests/tests.pro index 42550420..46fccb20 100644 --- a/tests/tests.pro +++ b/tests/tests.pro @@ -9,3 +9,5 @@ TEMPLATE = subdirs SUBDIRS += barstest \ scattertest + +qtHaveModule(multimedia):!android: SUBDIRS += spectrum |