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 similarity index 100% rename from examples/spectrum/doc/src/spectrum.qdoc rename to 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 +#include +#include + +#include +#include +#include + +//#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(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 deleted file mode 100644 index 2a703948..00000000 Binary files a/examples/spectrum/doc/images/spectrum-example.png and /dev/null differ diff --git a/examples/spectrum/3rdparty/fftreal/Array.h b/tests/spectrum/3rdparty/fftreal/Array.h similarity index 100% rename from examples/spectrum/3rdparty/fftreal/Array.h rename to tests/spectrum/3rdparty/fftreal/Array.h diff --git a/examples/spectrum/3rdparty/fftreal/Array.hpp b/tests/spectrum/3rdparty/fftreal/Array.hpp similarity index 100% rename from examples/spectrum/3rdparty/fftreal/Array.hpp rename to tests/spectrum/3rdparty/fftreal/Array.hpp diff --git a/examples/spectrum/3rdparty/fftreal/DynArray.h b/tests/spectrum/3rdparty/fftreal/DynArray.h similarity index 100% rename from examples/spectrum/3rdparty/fftreal/DynArray.h rename to tests/spectrum/3rdparty/fftreal/DynArray.h diff --git a/examples/spectrum/3rdparty/fftreal/DynArray.hpp b/tests/spectrum/3rdparty/fftreal/DynArray.hpp similarity index 100% rename from examples/spectrum/3rdparty/fftreal/DynArray.hpp rename to tests/spectrum/3rdparty/fftreal/DynArray.hpp diff --git a/examples/spectrum/3rdparty/fftreal/FFTReal.dsp b/tests/spectrum/3rdparty/fftreal/FFTReal.dsp similarity index 100% rename from examples/spectrum/3rdparty/fftreal/FFTReal.dsp rename to tests/spectrum/3rdparty/fftreal/FFTReal.dsp diff --git a/examples/spectrum/3rdparty/fftreal/FFTReal.dsw b/tests/spectrum/3rdparty/fftreal/FFTReal.dsw similarity index 100% rename from examples/spectrum/3rdparty/fftreal/FFTReal.dsw rename to tests/spectrum/3rdparty/fftreal/FFTReal.dsw diff --git a/examples/spectrum/3rdparty/fftreal/FFTReal.h b/tests/spectrum/3rdparty/fftreal/FFTReal.h similarity index 100% rename from examples/spectrum/3rdparty/fftreal/FFTReal.h rename to tests/spectrum/3rdparty/fftreal/FFTReal.h diff --git a/examples/spectrum/3rdparty/fftreal/FFTReal.hpp b/tests/spectrum/3rdparty/fftreal/FFTReal.hpp similarity index 100% rename from examples/spectrum/3rdparty/fftreal/FFTReal.hpp rename to tests/spectrum/3rdparty/fftreal/FFTReal.hpp diff --git a/examples/spectrum/3rdparty/fftreal/FFTRealFixLen.h b/tests/spectrum/3rdparty/fftreal/FFTRealFixLen.h similarity index 100% rename from examples/spectrum/3rdparty/fftreal/FFTRealFixLen.h rename to tests/spectrum/3rdparty/fftreal/FFTRealFixLen.h diff --git a/examples/spectrum/3rdparty/fftreal/FFTRealFixLen.hpp b/tests/spectrum/3rdparty/fftreal/FFTRealFixLen.hpp similarity index 100% rename from examples/spectrum/3rdparty/fftreal/FFTRealFixLen.hpp rename to tests/spectrum/3rdparty/fftreal/FFTRealFixLen.hpp diff --git a/examples/spectrum/3rdparty/fftreal/FFTRealFixLenParam.h b/tests/spectrum/3rdparty/fftreal/FFTRealFixLenParam.h similarity index 100% rename from examples/spectrum/3rdparty/fftreal/FFTRealFixLenParam.h rename to tests/spectrum/3rdparty/fftreal/FFTRealFixLenParam.h diff --git a/examples/spectrum/3rdparty/fftreal/FFTRealPassDirect.h b/tests/spectrum/3rdparty/fftreal/FFTRealPassDirect.h similarity index 100% rename from examples/spectrum/3rdparty/fftreal/FFTRealPassDirect.h rename to tests/spectrum/3rdparty/fftreal/FFTRealPassDirect.h diff --git a/examples/spectrum/3rdparty/fftreal/FFTRealPassDirect.hpp b/tests/spectrum/3rdparty/fftreal/FFTRealPassDirect.hpp similarity index 100% rename from examples/spectrum/3rdparty/fftreal/FFTRealPassDirect.hpp rename to tests/spectrum/3rdparty/fftreal/FFTRealPassDirect.hpp diff --git a/examples/spectrum/3rdparty/fftreal/FFTRealPassInverse.h b/tests/spectrum/3rdparty/fftreal/FFTRealPassInverse.h similarity index 100% rename from examples/spectrum/3rdparty/fftreal/FFTRealPassInverse.h rename to tests/spectrum/3rdparty/fftreal/FFTRealPassInverse.h diff --git a/examples/spectrum/3rdparty/fftreal/FFTRealPassInverse.hpp b/tests/spectrum/3rdparty/fftreal/FFTRealPassInverse.hpp similarity index 100% rename from examples/spectrum/3rdparty/fftreal/FFTRealPassInverse.hpp rename to tests/spectrum/3rdparty/fftreal/FFTRealPassInverse.hpp diff --git a/examples/spectrum/3rdparty/fftreal/FFTRealSelect.h b/tests/spectrum/3rdparty/fftreal/FFTRealSelect.h similarity index 100% rename from examples/spectrum/3rdparty/fftreal/FFTRealSelect.h rename to tests/spectrum/3rdparty/fftreal/FFTRealSelect.h diff --git a/examples/spectrum/3rdparty/fftreal/FFTRealSelect.hpp b/tests/spectrum/3rdparty/fftreal/FFTRealSelect.hpp similarity index 100% rename from examples/spectrum/3rdparty/fftreal/FFTRealSelect.hpp rename to tests/spectrum/3rdparty/fftreal/FFTRealSelect.hpp diff --git a/examples/spectrum/3rdparty/fftreal/FFTRealUseTrigo.h b/tests/spectrum/3rdparty/fftreal/FFTRealUseTrigo.h similarity index 100% rename from examples/spectrum/3rdparty/fftreal/FFTRealUseTrigo.h rename to tests/spectrum/3rdparty/fftreal/FFTRealUseTrigo.h diff --git a/examples/spectrum/3rdparty/fftreal/FFTRealUseTrigo.hpp b/tests/spectrum/3rdparty/fftreal/FFTRealUseTrigo.hpp similarity index 100% rename from examples/spectrum/3rdparty/fftreal/FFTRealUseTrigo.hpp rename to tests/spectrum/3rdparty/fftreal/FFTRealUseTrigo.hpp diff --git a/examples/spectrum/3rdparty/fftreal/OscSinCos.h b/tests/spectrum/3rdparty/fftreal/OscSinCos.h similarity index 100% rename from examples/spectrum/3rdparty/fftreal/OscSinCos.h rename to tests/spectrum/3rdparty/fftreal/OscSinCos.h diff --git a/examples/spectrum/3rdparty/fftreal/OscSinCos.hpp b/tests/spectrum/3rdparty/fftreal/OscSinCos.hpp similarity index 100% rename from examples/spectrum/3rdparty/fftreal/OscSinCos.hpp rename to tests/spectrum/3rdparty/fftreal/OscSinCos.hpp diff --git a/examples/spectrum/3rdparty/fftreal/TestAccuracy.h b/tests/spectrum/3rdparty/fftreal/TestAccuracy.h similarity index 100% rename from examples/spectrum/3rdparty/fftreal/TestAccuracy.h rename to tests/spectrum/3rdparty/fftreal/TestAccuracy.h diff --git a/examples/spectrum/3rdparty/fftreal/TestAccuracy.hpp b/tests/spectrum/3rdparty/fftreal/TestAccuracy.hpp similarity index 100% rename from examples/spectrum/3rdparty/fftreal/TestAccuracy.hpp rename to tests/spectrum/3rdparty/fftreal/TestAccuracy.hpp diff --git a/examples/spectrum/3rdparty/fftreal/TestHelperFixLen.h b/tests/spectrum/3rdparty/fftreal/TestHelperFixLen.h similarity index 100% rename from examples/spectrum/3rdparty/fftreal/TestHelperFixLen.h rename to tests/spectrum/3rdparty/fftreal/TestHelperFixLen.h diff --git a/examples/spectrum/3rdparty/fftreal/TestHelperFixLen.hpp b/tests/spectrum/3rdparty/fftreal/TestHelperFixLen.hpp similarity index 100% rename from examples/spectrum/3rdparty/fftreal/TestHelperFixLen.hpp rename to tests/spectrum/3rdparty/fftreal/TestHelperFixLen.hpp diff --git a/examples/spectrum/3rdparty/fftreal/TestHelperNormal.h b/tests/spectrum/3rdparty/fftreal/TestHelperNormal.h similarity index 100% rename from examples/spectrum/3rdparty/fftreal/TestHelperNormal.h rename to tests/spectrum/3rdparty/fftreal/TestHelperNormal.h diff --git a/examples/spectrum/3rdparty/fftreal/TestHelperNormal.hpp b/tests/spectrum/3rdparty/fftreal/TestHelperNormal.hpp similarity index 100% rename from examples/spectrum/3rdparty/fftreal/TestHelperNormal.hpp rename to tests/spectrum/3rdparty/fftreal/TestHelperNormal.hpp diff --git a/examples/spectrum/3rdparty/fftreal/TestSpeed.h b/tests/spectrum/3rdparty/fftreal/TestSpeed.h similarity index 100% rename from examples/spectrum/3rdparty/fftreal/TestSpeed.h rename to tests/spectrum/3rdparty/fftreal/TestSpeed.h diff --git a/examples/spectrum/3rdparty/fftreal/TestSpeed.hpp b/tests/spectrum/3rdparty/fftreal/TestSpeed.hpp similarity index 100% rename from examples/spectrum/3rdparty/fftreal/TestSpeed.hpp rename to tests/spectrum/3rdparty/fftreal/TestSpeed.hpp diff --git a/examples/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.h b/tests/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.h similarity index 100% rename from examples/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.h rename to tests/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.h diff --git a/examples/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.hpp b/tests/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.hpp similarity index 100% rename from examples/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.hpp rename to tests/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.hpp diff --git a/examples/spectrum/3rdparty/fftreal/def.h b/tests/spectrum/3rdparty/fftreal/def.h similarity index 100% rename from examples/spectrum/3rdparty/fftreal/def.h rename to tests/spectrum/3rdparty/fftreal/def.h diff --git a/examples/spectrum/3rdparty/fftreal/fftreal.pas b/tests/spectrum/3rdparty/fftreal/fftreal.pas similarity index 100% rename from examples/spectrum/3rdparty/fftreal/fftreal.pas rename to tests/spectrum/3rdparty/fftreal/fftreal.pas diff --git a/examples/spectrum/3rdparty/fftreal/fftreal.pro b/tests/spectrum/3rdparty/fftreal/fftreal.pro similarity index 100% rename from examples/spectrum/3rdparty/fftreal/fftreal.pro rename to tests/spectrum/3rdparty/fftreal/fftreal.pro diff --git a/examples/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp b/tests/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp similarity index 100% rename from examples/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp rename to 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 similarity index 100% rename from examples/spectrum/3rdparty/fftreal/fftreal_wrapper.h rename to tests/spectrum/3rdparty/fftreal/fftreal_wrapper.h diff --git a/examples/spectrum/3rdparty/fftreal/license.txt b/tests/spectrum/3rdparty/fftreal/license.txt similarity index 100% rename from examples/spectrum/3rdparty/fftreal/license.txt rename to tests/spectrum/3rdparty/fftreal/license.txt diff --git a/examples/spectrum/3rdparty/fftreal/readme.txt b/tests/spectrum/3rdparty/fftreal/readme.txt similarity index 100% rename from examples/spectrum/3rdparty/fftreal/readme.txt rename to tests/spectrum/3rdparty/fftreal/readme.txt diff --git a/examples/spectrum/3rdparty/fftreal/test.cpp b/tests/spectrum/3rdparty/fftreal/test.cpp similarity index 100% rename from examples/spectrum/3rdparty/fftreal/test.cpp rename to tests/spectrum/3rdparty/fftreal/test.cpp diff --git a/examples/spectrum/3rdparty/fftreal/test_fnc.h b/tests/spectrum/3rdparty/fftreal/test_fnc.h similarity index 100% rename from examples/spectrum/3rdparty/fftreal/test_fnc.h rename to 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 similarity index 100% rename from examples/spectrum/3rdparty/fftreal/test_fnc.hpp rename to 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 similarity index 100% rename from examples/spectrum/3rdparty/fftreal/test_settings.h rename to tests/spectrum/3rdparty/fftreal/test_settings.h diff --git a/examples/spectrum/3rdparty/fftreal/testapp.dpr b/tests/spectrum/3rdparty/fftreal/testapp.dpr similarity index 100% rename from examples/spectrum/3rdparty/fftreal/testapp.dpr rename to tests/spectrum/3rdparty/fftreal/testapp.dpr diff --git a/examples/spectrum/README.txt b/tests/spectrum/README.txt similarity index 100% rename from examples/spectrum/README.txt rename to tests/spectrum/README.txt diff --git a/examples/spectrum/spectrum.pri b/tests/spectrum/spectrum.pri similarity index 100% rename from examples/spectrum/spectrum.pri rename to tests/spectrum/spectrum.pri diff --git a/examples/spectrum/spectrum.pro b/tests/spectrum/spectrum.pro similarity index 73% rename from examples/spectrum/spectrum.pro rename to 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 similarity index 98% rename from examples/spectrum/spectrumapp/engine.cpp rename to 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 similarity index 100% rename from examples/spectrum/spectrumapp/engine.h rename to tests/spectrum/spectrumapp/engine.h diff --git a/examples/spectrum/spectrumapp/frequencyspectrum.cpp b/tests/spectrum/spectrumapp/frequencyspectrum.cpp similarity index 100% rename from examples/spectrum/spectrumapp/frequencyspectrum.cpp rename to tests/spectrum/spectrumapp/frequencyspectrum.cpp diff --git a/examples/spectrum/spectrumapp/frequencyspectrum.h b/tests/spectrum/spectrumapp/frequencyspectrum.h similarity index 100% rename from examples/spectrum/spectrumapp/frequencyspectrum.h rename to tests/spectrum/spectrumapp/frequencyspectrum.h diff --git a/examples/spectrum/spectrumapp/main.cpp b/tests/spectrum/spectrumapp/main.cpp similarity index 100% rename from examples/spectrum/spectrumapp/main.cpp rename to tests/spectrum/spectrumapp/main.cpp diff --git a/examples/spectrum/spectrumapp/soundFiles/Rockhop.wav b/tests/spectrum/spectrumapp/soundFiles/Rockhop.wav similarity index 100% rename from examples/spectrum/spectrumapp/soundFiles/Rockhop.wav rename to tests/spectrum/spectrumapp/soundFiles/Rockhop.wav diff --git a/examples/spectrum/spectrumapp/soundFiles/futurebells_beat.wav b/tests/spectrum/spectrumapp/soundFiles/futurebells_beat.wav similarity index 100% rename from examples/spectrum/spectrumapp/soundFiles/futurebells_beat.wav rename to 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 similarity index 100% rename from examples/spectrum/spectrumapp/soundFiles/onclassical_demo_fiati-di-parma_thuille_terzo-tempo_sestetto_small-version.wav rename to 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 similarity index 100% rename from examples/spectrum/spectrumapp/spectrum.h rename to tests/spectrum/spectrumapp/spectrum.h diff --git a/examples/spectrum/spectrumapp/spectrum.qrc b/tests/spectrum/spectrumapp/spectrum.qrc similarity index 100% rename from examples/spectrum/spectrumapp/spectrum.qrc rename to tests/spectrum/spectrumapp/spectrum.qrc diff --git a/examples/spectrum/spectrumapp/spectrumanalyser.cpp b/tests/spectrum/spectrumapp/spectrumanalyser.cpp similarity index 100% rename from examples/spectrum/spectrumapp/spectrumanalyser.cpp rename to tests/spectrum/spectrumapp/spectrumanalyser.cpp diff --git a/examples/spectrum/spectrumapp/spectrumanalyser.h b/tests/spectrum/spectrumapp/spectrumanalyser.h similarity index 100% rename from examples/spectrum/spectrumapp/spectrumanalyser.h rename to tests/spectrum/spectrumapp/spectrumanalyser.h diff --git a/examples/spectrum/spectrumapp/spectrumapp.pro b/tests/spectrum/spectrumapp/spectrumapp.pro similarity index 96% rename from examples/spectrum/spectrumapp/spectrumapp.pro rename to 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 similarity index 100% rename from examples/spectrum/spectrumapp/utils.cpp rename to tests/spectrum/spectrumapp/utils.cpp diff --git a/examples/spectrum/spectrumapp/utils.h b/tests/spectrum/spectrumapp/utils.h similarity index 100% rename from examples/spectrum/spectrumapp/utils.h rename to tests/spectrum/spectrumapp/utils.h diff --git a/examples/spectrum/spectrumapp/wavfile.cpp b/tests/spectrum/spectrumapp/wavfile.cpp similarity index 100% rename from examples/spectrum/spectrumapp/wavfile.cpp rename to tests/spectrum/spectrumapp/wavfile.cpp diff --git a/examples/spectrum/spectrumapp/wavfile.h b/tests/spectrum/spectrumapp/wavfile.h similarity index 100% rename from examples/spectrum/spectrumapp/wavfile.h rename to 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