summaryrefslogtreecommitdiff
path: root/demos/spectrum
Commit message (Collapse)AuthorAgeFilesLines
* Play whole file in spectrum analyzer demoGareth Stockwell2010-10-2911-467/+369
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change required a significant refactoring of the application, including: * Re-write WavFile class so that it inherits from QFile rather than taking a QIODevice as an argument to its method calls. * Modified Engine class so that its internal QByteArray buffer (m_buffer) need not correspond to the entire clip. This was done by introducing the m_bufferPosition variable, which indicates the offset from the start of the clip to the start of the region of the clip which is currently held in memory. For tone generation and record/playback modes, the buffer does still map directly to the whole clip, so m_bufferPosition is always zero. For file playback, the WavFile instance is the QIODevice which is passed to QAudioOutput; m_buffer is just the part of the file which is currently in memory for spectrum analysis, level calculation and waveform rendering. * For file playback, introduced a second WavFile instance as a member of the Engine class. This is because QFile::seek() is called in order to read the part of the file currently required for analysis. If the QAudioOutput implementation passes its QIODevice across a thread boundary, this seeking causes playback to jump around within the file rather than progressing smoothly forward. * Modified the audioLength utility function so that its return value is always a multiple of the sample size. In the process of making the above changes, a few other minor modifications were made: * Modify all internal APIs concerned with buffer offsets and lengths to deal in bytes. Previously, some calls passed values in microseconds and others in bytes, which was confusing. * Remove write functionality from WavFile class, since it is not used in this application. Task-number: QTBUG-12936
* Do not unnecessarily reset state of spectrum demoGareth Stockwell2010-10-293-45/+61
| | | | | | | | | | | | | | | | | | | This patch ensures that the state of the application is not reset when: - Any of the 'Play generated tone', 'Play file' or settings dialogs are opened - Any of the 'Play generated tone', 'Play file' or settings dialogs are dismissed by pressing the Cancel button - A new input or output device is selected via the settings dialog, and that new device supports the data format which is currently being used within the application - The window function is changed via the settings dialog Note that the application is still reset if a new input or output device is selected via the settings dialog, and this device does not support the current data format. Task-number: QTBUG-12935 Task-number: QTBUG-14810
* Set SpectrumAnalyserThread parent to 0 before calling moveToThread()Gareth Stockwell2010-10-291-0/+2
| | | | QObjects with a parent cannot be moved to a different thread.
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-255-5/+5
|\ | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fixed many spelling errors.
| * Fixed many spelling errors.Rohan McGovern2010-10-255-5/+5
| |
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-10-252-79/+90
|\ \ | |/ |/| | | | | | | Conflicts: src/corelib/tools/qcryptographichash.cpp src/opengl/qgl_p.h
| * Demo Spectrum wav data size is not calculated correctlyJustin McPherson2010-10-132-79/+90
| | | | | | | | | | | | | | | | - Grab length of audio data from Data chunk size - Read from the device no greater than the audio Data chunk size Task-number: QTBUG-13779 Reviewed-by: Andrew den Exter
| * Spectrum demo: fixed installationGareth Stockwell2010-07-062-9/+10
| | | | | | | | | | | | | | | | | | All binaries must be written into $$QT_BUILD_DIR/demos/spectrum in order for them to be correctly installed. Task-number: QTBUG-11572 Task-number: QTBUG-11756 Reviewed-by: Andy Shaw
| * Spectrum build: fixed DLL rpathGareth Stockwell2010-07-062-60/+3
| | | | | | | | | | | | | | | | | | | | Rather than explicitly modifying LD_LIBRARY_PATH using a shell script when the application is launched, the relative path from the application binary to the FFT library is encoded in the application using an --rpath flag. Task-number: QTBUG-11756 Reviewed-by: Andy Shaw
* | Spectrum demo: only use --rpath for linux-g++* mkspecsGareth Stockwell2010-10-111-1/+1
| | | | | | | | | | Task-number: QTBUG-13940 Reviewed-by: Martin Pejcoch
* | Spectrum demo: put binaries into correct locations on WindowsGareth Stockwell2010-10-113-8/+15
| | | | | | | | | | Task-number: QTBUG-13483 Reviewed-by: Miikka Heikkinen
* | Fixed build failureGareth Stockwell2010-08-123-4/+4
| | | | | | | | Task-number: QTBUG-12713
* | Do not include Spectrum Analyzer demo in static buildsGareth Stockwell2010-08-111-0/+4
| | | | | | | | | | | | | | | | | | This demo includes a 3rd party library which is licensed under the LGPL. As such, the demo application may only link to the library dynamically. Task-number: QTBUG-12713 Reviewed-by: Justin McPherson
* | Spectrum demo: fixed installationGareth Stockwell2010-07-062-10/+11
| | | | | | | | | | | | | | | | | | All binaries must be written into $$QT_BUILD_DIR/demos/spectrum in order for them to be correctly installed. Task-number: QTBUG-11572 Task-number: QTBUG-11756 Reviewed-by: Andy Shaw
* | Spectrum build: fixed DLL rpathGareth Stockwell2010-07-062-60/+3
| | | | | | | | | | | | | | | | | | | | Rather than explicitly modifying LD_LIBRARY_PATH using a shell script when the application is launched, the relative path from the application binary to the FFT library is encoded in the application using an --rpath flag. Task-number: QTBUG-11756 Reviewed-by: Andy Shaw
* | Hide some more files from git-status.axis2010-07-021-0/+2
| |
* | Fixed deployment locations for various profiles.axis2010-07-021-1/+1
| | | | | | | | RevBy: Trust me
* | Merge branch '4.6-s60' into 4.7-s60axis2010-06-243-3/+3
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/3rdparty/phonon/qt7/mediaobject.mm src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/plugins/phonon/mmf/mmf.pro
| * Updated UIDs for spectrum demoGareth Stockwell2010-06-233-3/+3
| | | | | | | | | | | | Resolving UID clash with other example apps Reviewed-by: Miikka Heikkinen
* | Removed unnecessary data_caging_paths.prf loading from applicationsMiikka Heikkinen2010-06-221-2/+0
| | | | | | | | | | | | | | | | | | Since plugin and import paths variables were moved to symbian.conf, there were many unnecessary load(data_caging_paths) statements left in applications. Task-number: QTBUG-11619 Reviewed-by: Janne Koskinen
* | Demos: Fix compilation with namespace.ck2010-06-101-1/+0
| |
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-06-082-1/+43
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp src/3rdparty/webkit/WebKit/qt/ChangeLog src/gui/painting/qpainter.cpp src/gui/painting/qtextureglyphcache.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtCoreu.def src/s60installs/eabi/QtGuiu.def src/s60installs/eabi/QtNetworku.def src/s60installs/eabi/QtOpenVGu.def tests/auto/qfontmetrics/tst_qfontmetrics.cpp tools/linguist/lupdate/main.cpp
| * Add missing license header.Jason McDonald2010-05-281-0/+41
| | | | | | | | Reviewed-by: Trust Me
| * Moved Symbian-specific .pro directive into symbian{} blockGareth Stockwell2010-05-271-1/+2
| | | | | | | | Reviewed-by: Miikka Heikkinen
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-291-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix location of QtMultimedia def files Freeze 4.7 def files on top of 4.6.3 Update def files for 4.6.3 Add runtime_graphics_system flag to QApplicationPrivate. Add missign license headers. Fix the compilation for tst_qabstractprintdialog and tst_qprinter on symbian. Make link on linux/symbian Fix double slashes on few data caging paths Fix for QRuntimePixmapData serial number setting. Enable QTouchEvent for S60 5.0 Add missing license header. Fix build error on S60 3.1 environments QRuntimeGraphicsSystem Fix replacement functions in platform_paths.prf
| * \ Merge commit 'origin/4.7' into symbian47Thomas Zander2010-05-279-1/+22
| |\ \ | | | | | | | | | | | | | | | | Conflicts: src/plugins/bearer/symbian/qnetworksession_impl.h
| * \ \ Merge branch '4.7' of scm.dev.troll.no:qt/qt into 4.7Shane Kearns2010-05-263-14/+19
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qapplication_s60.cpp
| * | | | Make link on linux/symbianThomas Zander2010-05-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | On systems where libs don't automagically go to the system dirs we need to add the build dir for using the lib.
* | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-05-2830-731/+742
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/spectrum/app/engine.h demos/spectrum/app/mainwidget.h demos/spectrum/app/settingsdialog.h demos/spectrum/app/spectrograph.h demos/spectrum/app/spectrumanalyser.h demos/spectrum/app/tonegenerator.h demos/spectrum/app/tonegeneratordialog.h demos/spectrum/app/utils.h demos/spectrum/app/waveform.h tests/auto/qtextcodec/tst_qtextcodec.cpp
| * | | Removed unnecessary PlatSec capabilities from spectrum demo DLLGareth Stockwell2010-05-262-2/+2
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10964 Reviewed-by: Miikka Heikkinen
| * | | Added missing PlatSec capabilities to spectrum demo DLLGareth Stockwell2010-05-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Symbian, spectrum.exe has UserEnvironment capability in order to allow it to use QAudioInput. This means that the capabilities of any DLL which it loads must include UserEnvironment. Prior to this patch, fftreal.dll was built without any capabilities, causing startup of the application to fail. Although granting only UserEnvironment to fftreal.dll would fix the bug, the usual pattern on Symbian OS is to grant 'all -tcb' capabilities to DLLs. The capabilities with which the DLL actually runs are inherited from its parent process. Task-number: QTBUG-10964 Reviewed-by: Liang Qi
| * | | Build fix for spectrum demo when -qtnamespace is usedGareth Stockwell2010-05-259-24/+27
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10881 Reviewed-by: Liang Qi
| * | | Fixed license headers in spectrum demoGareth Stockwell2010-05-2528-688/+716
| | |/ | |/| | | | | | | | | | Reviewed-by: Jason McDonald Task-number: QTBUG-10887
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-259-1/+22
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (50 commits) Dont crash when assigning the same input context twice. Fixed a typo in variable name in qlocale data generator. Fix for Norwegian and Korean languages on symbian. Remove unused function in QDBusConnectionPrivate Doc: Fixing bugs in HTML generator Updating 4.7.0 change log. Doc: Correcting style to class lists qdoc: Improved class index page. Added MSVC 2010 project files to .gitignore Fix architecture detection on GNU/Hurd. Revert "tst_bic: make it possible to test for cross-compilation" fix typo in documentation Improve Bearer Management related documentation in QNetworkAccessManager Compile with QT_NO_ACTION. Unbreak compilation outside Mac QDBusAbstractInterface: don't set lastError outside the object's own thread tst_bic: make it possible to test for cross-compilation Remove Q_PACKED from QChar and QLocale::Data. QDebug operator for QFlags Removing unneeded qDebug statement. ...
| * | Merge remote branch 'origin/4.7' into oslo-staging-1Aaron McCarthy2010-05-241-1/+1
| |\ \ | | |/ | | | | | | | | | Conflicts: src/gui/styles/qmacstyle_mac.mm
| | * Fix shadow building of spectrum demoRhys Weatherley2010-05-221-1/+1
| | | | | | | | | | | | Reviewed-by: trustme
| * | Examples: Fix compilation with namespace.ck2010-05-209-1/+22
| |/
* | Removed DEPLOYMENT from demos/spectrum/spectrum.proGareth Stockwell2010-05-211-13/+0
| | | | | | | | | | | | | | | | | | DEPLOYMENT was added to demos/spectrum/spectrum.pro as a workaround for QTBUG-5312, in order to allow 'make sis' to be executed from the demos/spectrum directory. While this workaround is OK for SBSv2, it causes a build failure when using SBSv1. Task-number: QTBUG-10833
* | Install source for spectrum demoGareth Stockwell2010-05-213-0/+18
| | | | | | | | | | Task-number: QTBUG-10880 Reviewed-by: Thomas Zander
* | Fixed path for copying launcher script for spectrum demoGareth Stockwell2010-05-211-1/+1
|/ | | | | Task-number: QTBUG-10879 Reviewed-by: Thomas Zander
* Compilation fix for Metrowerks compilerGareth Stockwell2010-05-121-1/+1
| | | | | | | | Compiler was failing to disambiguate the following overloads: pow(double, double) pow(float, float) Reviewed-by: mread
* Spectrum Analyzer demo Symbian fixJanne Koskinen2010-05-111-12/+10
| | | | | | | Fixes compilation and deployment issue when compiling the app from root directory. Reviewed-by: Gareth Stockwell
* Corrected headers for spectrum analyzer demoGareth Stockwell2010-05-0672-14/+44
| | | | | | | | - Added /3rdparty/ to directory path for FFTReal code - Added missing $QT_BEGIN_LICENSE$, $QT_END_LICENSE$ - Fixed incorrect license in app/wavfile.cpp Reviewed-by: trustme
* Add spectrum analyzer demo appGareth Stockwell2010-05-0592-0/+13727
This application is a demo which uses the QtMultimedia APIs to capture and play back PCM audio. While either recording or playback is ongoing, the application performs real-time level and frequency spectrum analysis. Reviewed-by: Alessandro Portale
View Lorry Controller Status