summaryrefslogtreecommitdiffstats
path: root/src/imports/audioengine
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-2110-55/+3
|\ | | | | | | Change-Id: Ieb1a3081907093e31e8c8b7f95993bb3b2173672
| * Update version number in QML plugins.v5.6.0Yoann Lopes2016-02-2510-55/+3
| | | | | | | | | | | | | | | | | | Also removes unnecessary references of that import version in the documentation and snippets. The import version is always displayed at the top of every doc page anyway. Change-Id: Ifbf4666e0bc333c51f51104a5720b988e8c04d0b Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* | Updated license headersAntti Kokko2016-01-1926-364/+520
| | | | | | | | | | | | | | | | | | | | | | From Qt 5.7 -> LGPL v2.1 isn't an option anymore, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new LGPL header instead of LGPL21 one (in those files which will be under LGPL v3) Change-Id: I324f65c61171f36641472964d095d72e452afb3a Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | imports: replace foreach with range-based forAnton Kudryavtsev2016-01-152-7/+10
| | | | | | | | | | Change-Id: I495438c99337b9423b0a589c1c8d8171d20b0cff Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | Enable using the module in a statically built applicationAndy Shaw2016-01-111-0/+8
|/ | | | | | Change-Id: Iafdb4359f051fcd20178f3c5f42f2cff2bf8c359 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* Add missing "We mean it" comments to private headers.Friedemann Kleint2015-10-0613-0/+143
| | | | | | Task-number: QTBUG-48595 Change-Id: I1370d9229b0606582cbd828de84ee2717dca3daf Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* Fix QML revisions registration for 5.6.Yoann Lopes2015-09-152-8/+38
| | | | | | | | And update plugins.qmltypes file. Change-Id: I9b3cbeda4c8a0ce88a88f5a16fae6834dc8363d7 Reviewed-by: Marco Benelli <marco.benelli@theqtcompany.com> Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* Refactored code for audio engine to allow dynamic object creationSiteshwar Vashisht2015-04-2313-229/+425
| | | | | | | | | | | | QDeclarativeSound, QDeclarativeAudioSample, QDeclarativeAudioCategory and QDeclarativeAttenuationModel can now be dynamically added to AudioEngine instance or declared inside AudioEngine object definition. QDeclarativePlayVariation can now be dynamically added to Sound instance or declared inside Sound object definition. Change-Id: If4c2e16895a71eb71ded1998c107360698f8ac7f Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* [QSoundBuffer] Replace isReady() with state() statesKonstantin Ritt2015-04-156-18/+36
| | | | | | | | | The two-state "isReady" is not enough for checking if loading was already requested. This also makes it abvious we're accepting load() after error. Change-Id: I8181f99e8b36be484ec791862941b5b2ec78eb1f Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.4' into 5.5Liang Qi2015-04-151-0/+5
|\ | | | | | | | | | | | | | | Conflicts: src/multimedia/playback/playlistfileparser.cpp src/plugins/windowsaudio/qwindowsaudiodeviceinfo.cpp Change-Id: I52950def2b8283ae15797d05d4ead6a1256eba19
| * Add missing documentation for AudioSample::source.Yoann Lopes2015-03-241-0/+5
| | | | | | | | | | Change-Id: Iabfb7749bf42413fc19b53b907027caad931092c Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
| * Fix some typosSergio Ahumada2015-02-112-8/+8
| | | | | | | | | | Change-Id: Iaf8f50741d3103480668b4a654a202d8a363bc45 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | [QtAudioEngine] Fix C&P typo in the SoundInstance docsKonstantin Ritt2015-04-131-2/+2
| | | | | | | | | | Change-Id: Iffe26a13f58c1e4cffe81099d5f0ef204f582999 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | [QDeclarativeSound] Pass QString by const-refKonstantin Ritt2015-04-132-2/+2
| | | | | | | | | | | | Change-Id: Ic600e62420c2e3ccc66f037e0fe44374e505c0d1 Reviewed-by: Sérgio Martins <sergio.martins@kdab.com> Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | [AudioEngine] Minor code clean-upKonstantin Ritt2015-04-132-144/+146
| | | | | | | | | | | | | | | | Move StaticSoundBufferAL declaration to .h file and replace inherits("StaticSoundBufferAL") check with qobject_cast. Change-Id: Icedc2796cf31b3a92335112a77cac24a5a34ac15 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | [AudioEngine] Do not crash on destruction after sample loading errorKonstantin Ritt2015-04-131-4/+19
| | | | | | | | | | | | | | | | | | m_sampleLoader must be destroyed AFTER releasing the buffers it holds. Also properly release sample on error and be safer while destroying the buffer. Change-Id: I5e39c6c815b8760f72cc5fdc61fad020d3cd1cc1 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | [AudioEngine] Minor improvement to the docu snippetsKonstantin Ritt2015-04-132-2/+4
| | | | | | | | | | | | | | | | | | | | Without mentioning the playType property, it is unclear for the user not familiar with AudioEngine why there are several PlayVariation-s binded to a single Sound element. Also fix a simply typo. Change-Id: Ie6b4bff759318c70c94e75797cc6991cb9b918ca Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | Fix incorrect warning in QML AudioEngine.Yoann Lopes2015-04-071-0/+1
| | | | | | | | | | | | | | | | We need to do an early return when an AudioCategory is successfully added to an AudioEngine, otherwise a warning is incorrectly shown. Change-Id: If310c694a703242aff7f1c5ae04ad3e40c3f1acd Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* | Update copyright headersAntti Kokko2015-02-1226-182/+182
| | | | | | | | | | | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I1c6faa4f59f8eca54f01ef20941fa60161dd7872 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | Fix some typos in strings.Dmitry Shachnev2014-12-252-8/+8
|/ | | | | | | | s/Endianess/Endianness/ s/changable/changeable/ Change-Id: I91a43ff6e6143f2d3fc0a93aa8bbf34a415eea90 Reviewed-by: Andrew Knight <qt@panimo.net>
* Update license headers and add new license filesAntti Kokko2014-08-2426-494/+286
| | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 & LICENSE.GPLv2 - Removed LICENSE.GPL Change-Id: Ied06887225df341064c12bcc14c259ae74116f2e Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* Tidy up Audio documentation.Mitch Curtis2014-03-192-19/+18
| | | | | Change-Id: I864ba13375d7b8b035686c11687e76fbf672c431 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Doc: Document signals (not handlers) under \qmlsignalSze Howe Koh2014-03-182-16/+32
| | | | | | | | | Append the handler names to the end of the corresponding signal doc. Task-number: QTBUG-35846 Change-Id: I325cdab75ef18a19c9f29d6333039c31baa8daf6 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Doc: Qt Audio Engine: Restore lost docsSze Howe Koh2014-03-178-80/+80
| | | | | | | | When QDoc stopped accepting the version number of QML modules, some parts of QML documentation disappeared silently. Change-Id: I528a2d77587e5803ed971dfe8849d0b37d9c555a Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Add classnames for QML plugins.Andy Nichols2013-11-041-0/+1
| | | | | | | Needed for static builds on iOS Change-Id: I2e16353a50661ac5b65a80fd37363b6e29c8b4a7 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Doc: Various fixes to Qt Audio Engine documentationJerome Pasion2013-10-038-18/+18
| | | | | | | | | | | -fixed \since to "\since 5.0" (Qt version 5.0) -made a \qmlmodule page so the list of related classes are automatically listed -made changes in the Qt Multimedia documentation to link to the Qt Audio Engine documentation Change-Id: Ibdd3da02871648988a73172934e684840c4ce0ae Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Update qmldir file for QtAudioEngineLiang Qi2013-05-271-0/+2
| | | | | Change-Id: I2fe64c72520a7b2b6b1d79bbddfdeb7d0bf4f977 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* audioengine: update qmltypesFawzi Mohamed2013-04-301-43/+53
| | | | | Change-Id: I13488291f543748716891cfa0ab9b5dd548ccc86 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Doc: Fix minor typosSze Howe Koh2013-04-101-1/+1
| | | | | | Task-number: QTWEBSITE-514 Change-Id: Ie8f3689d18d15fd0e88e0ada4a745d9994d9c2ae Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-1926-37/+27
|\ | | | | | | | | | | | | | | | | | | Conflicts: src/multimedia/doc/qtmultimedia.qdocconf src/plugins/blackberry/mediaplayer/bbmetadata.cpp src/plugins/blackberry/mediaplayer/bbmetadata.h tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp Change-Id: I447c297ea15a94d1d2feb0fb5f9edac8c5d4505a
| * Doc: Fixed random QDoc warningsVenugopal Shivashankar2013-01-151-11/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed \snippet paths - Minor language edits - Removed unnecessary multiple page commands in a single comment block. For example, \fn and \qmlsignal in a single comment block is not allowed. Such instances must be documented in separate comment blocks. Change-Id: I65f4518499e2600c4e1807356d4116c575e48c19 Reviewed-by: Andy Nichols <andy.nichols@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Update copyright year in Digia's license headersSergio Ahumada2013-01-1026-26/+26
| | | | | | | | | | | | Change-Id: Ia8c1c38aba1544603fada8c414cc856f365fd15b Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Remove QT_{BEGIN,END}_HEADER macro usageSergio Ahumada2013-01-2813-52/+0
|/ | | | | | | | | The macro was made empty in qtbase/ba3dc5f3b56d1fab6fe37fe7ae08096d7dc68bcb and is no longer necessary or used. Discussed-on: http://lists.qt-project.org/pipermail/development/2013-January/009284.html Change-Id: Id95d10f5d9c146d9eb496119af6a8b8501ffcb17 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Blackberry: Enable support for audioengine if availableThomas McGuire2012-11-071-1/+2
| | | | | | | | BB10 ships OpenAL, so the audio engine works there. Change-Id: I49ba6201788cb41cabb1670522dc97a36fd5f2c2 Reviewed-by: Kevin Ottens <kevin.ottens.qnx@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix the QML list interfaceFriedemann Kleint2012-10-242-2/+2
| | | | | | | | | | | | | The QML list interface was changed, so that there is now a read only constructor and the default properties are removed. This is because the original interface was very runtime centric, like other parts in QML. The new interface was changed for the needs of the QML designer and debugger. Task-number: QTBUG-9390 Change-Id: Ia61a2457432b4fc5c0cf440eeebd9d3a6c4c6463 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-2426-624/+624
| | | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: Id77334cfb15de096941c88e32d04ca07b4eb4709 Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix compilation after the qreal->float change in Math3DThiago Macieira2012-09-121-1/+1
| | | | | | | | QVector3D::length() returns float now, so this qBound call was running into template substitution failure. Change-Id: Ib03ab96bf18a4b04fa80a8f706761329faab2541 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* Doc: Changed \qmlclass to \qmltype and added \instantiatesJerome Pasion2012-07-278-9/+18
| | | | | | | | | -New qdoc command \qmltype replaces \qmlclass -\instantiates <C++ class> for determining if the QML type has a C++ implementation Change-Id: I83d1e2c3f376f96ea51afedadf88c3cf478e33d8 Reviewed-by: Martin Smith <martin.smith@nokia.com>
* Fixed QDoc errors related to snippets and quotefromfile commandsVenugopal Shivashankar2012-07-261-0/+3
| | | | | Change-Id: I9dd6381eb95dcbd9aa5cc8f596d87cf55eee7427 Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
* Fixed the QDoc errors related to \qmlproperty usageVenugopal Shivashankar2012-07-241-1/+1
| | | | | | Change-Id: Ie4d5f8698fe8a1a774fd8f0bb127c20fc63a14e3 Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fix a crash problem in AudioEngine due to class name change.Ling Hu2012-07-131-1/+1
| | | | | Change-Id: I18a831ffc692b5aa6de6e2626f0dc916eb57c8b7 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* use centralized qml plugin project handlingOswald Buddenhagen2012-07-111-30/+3
| | | | | | Change-Id: If9561a27d9b96d020e2ffcf2dcc6deedb4d89e4a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Delete obsolete class methods and update related codeMithra Pattison2012-07-101-1/+1
| | | | | | | | Delete obsolete methods from QAudioFormat and QAudioDeviceInfo and update code that relied on the obsolete methods. Change-Id: I007e36375a45399b1d5a289341bc5d5a05dc68cc Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fix header path for audio engine on Mac.Michael Goddard2012-06-272-5/+9
| | | | | | | There's a different prefix here. Change-Id: Ifda82e19824801b1d903ab6ad40c97428fff236c Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Fix namespace compilation.Toby Tomkins2012-06-252-4/+2
| | | | | | Change-Id: Id8d71a48df20da16647834e8f9732012f26f928f Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix a number of other qdoc issues.Michael Goddard2012-06-158-18/+19
| | | | | | | | | | | | | | * Several places needed the forward class declaration hack * Missing/wrong minor version numbers on imports * A few typos * Any number of attempts to work around qdoc * A few missing docs * Tweaked soundeffect docs Change-Id: I3c2ab998a11cbb0956712e0423e01fdb70f5bfff Reviewed-by: Peter Yard <peter.yard@nokia.com> Reviewed-by: Angus Cummings <angus.cummings@nokia.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
* Updating brief layout of QML typesAngus Cummings2012-06-146-6/+6
| | | | | | Change-Id: I1dcd7bf7427f25bb9e19cbe3c7e17808b0fc9708 Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Peter Yard <peter.yard@nokia.com>
* Renaming StopppedState to StoppedStateAngus Cummings2012-06-135-10/+10
| | | | | Change-Id: Ib23e9795960f40b46c0b2441ec03e8b1812033e5 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Minor doc fixes for QMLAngus Cummings2012-05-168-60/+84
| | | | | | | | | | renaming QML element to QML type removing some \fn tags that were making the docs not build some rewording some new signal docs Change-Id: I9b350dad1780276959aef4105e53b91082a6083e Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Fix compilation after qtbase:8f85b84f4eaa85ff5c02ec5e65fd6706a10690b9.Friedemann Kleint2012-04-244-18/+18
| | | | | | | Remove QDeclarative compatibility module code. Change-Id: Ib24c0c027c899e7eb30b3c8550a483d0d8b2b77f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>