summaryrefslogtreecommitdiffstats
path: root/src/multimedia/audio
Commit message (Collapse)AuthorAgeFilesLines
...
| | * Fix playing sound in loop if sample size is smallPasi Petäjäjärvi2016-01-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If sample size is smaller that current periodsize, then playing sample multiple times in loop will fail. Reason is data offset of sample is set out of the bounds actual sample data size. Change-Id: I81f580cbb8dabf89db0d61528f5f1c9489216e0c Task-number: QTBUG-49838 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
| * | Doc: Move all doc artifacts under one projectVenugopal Shivashankar2015-12-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Although the Qt Multimedia module has two submodules, a single project is sufficient to document these submodules, avoiding unnecessary maintenance overhead. Change-Id: I8fab48241b5c9aba35890a8aaa28ce7154f78c45 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | | Audio: replace foreach with range-based forAnton Kudryavtsev2016-01-153-12/+15
| | | | | | | | | | | | | | | Change-Id: I5c9f7554f3ef1c93a0041afcf1331d092e5ec405 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | | QSampleCache: use prefix ++ for iterator in setCapacityAnton Kudryavtsev2015-12-041-2/+3
|/ / | | | | | | | | | | | | because it's useful for non-primitive types Change-Id: I59099d18ad8811601d09f76b6b30a95721e6e82f Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6Simon Hausmann2015-10-061-0/+1
|\ \
| * | Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-10-021-0/+1
| |\| | | | | | | | | | Change-Id: I1373622a6d1fd0e2d35df2da79860a373056387f
| | * Fix crash in QSoundEffect when using it from a non-GUI thread.Yoann Lopes2015-08-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The internal QIODevice used as data source was not set as child of the parent QSoundEffectPrivate. If moveToThread() was called on the QSoundEffect, the QIODevice would still receive events on the main thread, leading to race conditions. Task-number: QTBUG-46359 Change-Id: I180da2fb498108b316fd9b5b5cc84376b360fa3f Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* | | Add missing "We mean it" comments to private headers.Friedemann Kleint2015-10-061-0/+11
|/ / | | | | | | | | | | Task-number: QTBUG-48595 Change-Id: I1370d9229b0606582cbd828de84ee2717dca3daf Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into 5.6Yoann Lopes2015-08-241-2/+0
|\| | | | | | | | | | | | | Conflicts: src/imports/multimedia/qdeclarativeaudio.cpp Change-Id: I57c6252b084e4ed796f6f308b2e0c717d0f59b13
| * Doc: update qml module version to 5.5.Yoann Lopes2015-08-111-2/+0
| | | | | | | | | | | | | | | | | | And remove import statements from snippets. Change-Id: I109beabd445186f96f0750b6f23fb623c125181e Task-number: QTBUG-47620 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Add audio role API to QMediaPlayer.Jim Hodapp2015-08-102-0/+75
|/ | | | | | Change-Id: Ia5e3e2fe714f10b6aad62f0a4801c607905c7e0d Task-number: QTBUG-41054 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* Doc: replace Mac OS X with OS XNico Vertriest2015-07-151-1/+1
| | | | | | | Task-number: QTBUG-40759 Change-Id: I11b3aa74d35064371cbbbeba660114e086b16aea Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Fix debug stream operators.Friedemann Kleint2015-04-072-36/+40
| | | | | | | | | | - Use QDebugStateSaver to restore space setting in stream operators instead of returning dbg.space() which breaks formatting on streams that already have nospace() set. - Fix some single character string constants, streamline code. Change-Id: I18ae7324b172ea801aa9b5fe56ddf6fe527fdde9 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* Remove stray <QtNetwork> includesAndrew Knight2015-03-302-2/+6
| | | | | | | | Module includes slow down the build when PCH is disabled, so don't use them. Change-Id: Ic0bf0d938ef06dea9dba6897df592311230a6529 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* Free d in QAudioBuffer &QAudioBuffer::operator =(const QAudioBuffer &).Friedemann Kleint2015-03-101-0/+2
| | | | | | | Task-number: QTBUG-40571 Change-Id: Idc2dcc7d254873edda653b9c9eb8d88cbb91d4f6 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* Update copyright headersAntti Kokko2015-02-1237-259/+259
| | | | | | | | | 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>
* Remove unused private membersThiago Macieira2014-11-251-7/+0
| | | | | | | | | | | | | One is not used, the others are not even initialized, so don't use the memory. qsoundeffect_pulse_p.h:172:20: warning: private field 'm_resourceStatus' is not used [-Wunused-private-field] qvideowidget_p.h:211:25: warning: private field 'm_aspectRatioMode' is not used [-Wunused-private-field] qalsaaudioinput.h:156:22: warning: private field 'timestamp' is not used [-Wunused-private-field] qalsaaudiooutput.h:135:22: warning: private field 'timestamp' is not used [-Wunused-private-field] Change-Id: I7c9f50d57c4d29ee0dfd7dc086771d721cdb5b05 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.3' into 5.4Sergio Ahumada2014-09-261-3/+0
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Iad73368a22c6d4662188e6f357a265d0c26756d0
| * Remove unused includesChristian Strømme2014-09-111-3/+0
| | | | | | | | | | Change-Id: Ibbce6e9135649d5dce0522320197dbbd0a92b3b9 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* | Add a declaration to QIODeviceThiago Macieira2014-08-251-0/+2
| | | | | | | | | | | | | | | | | | | | It isn't getting #included nor forward-declared at this point. That was only an indirect inclusion. qaudiosystem.h:78:24: error: ‘QIODevice’ has not been declared Change-Id: I5b9121b693bb06414638e8a4664115597da7466f Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* | Update license headers and add new license filesAntti Kokko2014-08-2437-703/+407
| | | | | | | | | | | | | | | | | | - 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>
* | Set volume only if volume was explicitly set.Robin Burchell2014-08-042-3/+17
| | | | | | | | | | | | Change-Id: I0d5abab0ffbf61a74c59ce240fd39e756479026b Done-with: Juho Hämäläinen <juho.hamalainen@tieto.com> Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
* | Resource policy support for QSoundEffect.Robin Burchell2014-08-042-1/+47
|/ | | | | | | | | | | | | | | | | | Since sound effects are something short and mixed with other audio, do not acquire resources explicitly. Follow the resources availability information to determine when it is ok to play the sound effects. When client has registered itself to resource manager, client's streams are classified properly. If no higher priority client has acquired the resources, isAvailable() is true, and sound effects can be played. We do not explicitly acquire the resources, since then other clients with the same resource class would lose the resources, thus not possible to have second client play music with QMediaPlayer class while our client would just want to play simple sound effects. Change-Id: Ib5589349dca6900a8bee616b8ad77e7cb5ec9533 Done-with: Juho Hämäläinen <juho.hamalainen@tieto.com> Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
* Improve default audio plugin selection.Yoann Lopes2014-06-051-6/+21
| | | | | | | | | When no audio plugin is marked as default, use the first plugin available. Change-Id: Ide8db0fe55f43c4881c24505c1e2821b0fc176f6 Reviewed-by: Dyami Caliri <dyami@dragonframe.com> Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Use Q_CONSTRUCTOR_FUNCTION macro to register multimedia meta types.Yoann Lopes2014-05-305-53/+25
| | | | | | Task-number: QTBUG-39131 Change-Id: I2493c9e3e6f0065d0441a74ff240d7d91fbe059c Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Add support for running on big-endian systemsDmitry Shachnev2014-04-032-7/+15
| | | | | | | | Now qtmultimedia test suite passes on powerpc. Change-Id: I540dff93195115ad1dc5725af7293e3b8540403f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* QSoundEffect: fix changing the loop count while playing.v5.3.0-alpha1Yoann Lopes2014-02-253-10/+23
| | | | | | | | | | | | The running count was not updated with the new value. Auto-test added and documentation updated to be more clear about this behavior. Task-number: QTBUG-36643 Change-Id: I29e98ca4679f950a75133b21873738bcb72d23d4 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-02-121-5/+1
|\ | | | | | | Change-Id: Ie93615076177662e75d46f3d13beeb88d424b4a6
| * QSoundEffect: Don't try guess a media role if one has not been provided.Robin Burchell2014-02-071-5/+1
| | | | | | | | | | | | | | | | | | Trying to heuristically guess this kind of thing is almost always a bad idea. Expect the creator of the output to explicitly tell us the category instead of guessing. Change-Id: I5f2988e2456685f3622e0ab136951b1742215f71 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* | Move win32 and Alsa audio backends into plugins.Christian Strømme2014-01-3014-5233/+1
| | | | | | | | | | Change-Id: I9835cf5ee97900569f26421a19543b485e933051 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* | Alsa: fix crash when detecting devices.Yoann Lopes2014-01-301-52/+57
| | | | | | | | | | | | | | | | | | Some old versions of Alsa crash when snd_device_name_hint(-1, ...) is called. This patch works around the problem by iterating manually over all the available sound cards. Change-Id: Ic380a371acc15013d137553ff30d68bed5af664e Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* | whitespace fixesOswald Buddenhagen2014-01-305-38/+38
|/ | | | | | | | remove trailing spaces & expand tabs. Change-Id: I05ef110abed90f13b47752760ffb4567a11a6a5e Reviewed-by: Yoann Lopes <yoann.lopes@digia.com> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
* Fix some typos in documentation.Jeff Tranter2014-01-071-1/+1
| | | | | | | | Fix some spelling and grammatical errors in comments that show up in Qt documentation. No changes to code. Change-Id: Ieb7be17bd1d50751f00620f7ac28d09355856ac0 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com> Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
* PulseAudio: fix crash when failing to create a context.Yoann Lopes2014-01-061-2/+3
| | | | | | | | | | Don't try to call a function on a null PulseAudio context. If pa_context_new() fails, we now try again to connect to the pulse audio daemon later. Task-number: QTBUG-35456 Change-Id: I0b848d3f25f57651ab31b9eca7ceb1bc9df2f682 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Correct QSoundEffect::supportedMimeTypes() documentation.Mitch Curtis2014-01-021-1/+1
| | | | | Change-Id: I154b124949ee4f07ea413d8cdb419fcc08cb8324 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Don't use integers to describe volume internally in QSoundEffect.Christian Strømme2013-11-285-22/+22
| | | | | | | | | The public api takes floating point values and so does most of the back- ends. Conversion should be done in the back-ends that expect other value types to avoid unnecessary float -> int -> float conversions. Change-Id: I0ee1bfbe350f985294c20f897ffa3bd55288b4c9 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* use private linkage where possibleOswald Buddenhagen2013-10-311-2/+2
| | | | | | Task-number: QTBUG-34463 Change-Id: Iffbeed2f1a27fd38b5960afa9715815ac11b722a Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* QSoundEffect: Set playing to true before starting the audio-device.Christian Strømme2013-10-301-2/+1
| | | | | | | | | | When the audio-device starts playing it should be able to read from the source immediately. The OpenSL plugin would fail because the source was blocking the audio-device from reading, as the state still was in its initial state (stopped). Change-Id: Ia26fa2eb442e239f5209947e6c9cd464b7d976a4 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Doc: Removing version number from the QDoc comments.Jerome Pasion2013-10-021-20/+20
| | | | | | | | | | The version is not needed anymore and QDoc handles them as a different module, causing errors. Task-number: QTBUG-32172 Change-Id: I55054a6c7bce9e001ef03cce944b03375c851d15 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: Updated usage of \qmlmodule and \inqmlmodule.Jerome Pasion2013-10-021-1/+1
| | | | | | | | | | -\qmlmodule denotes the import statement "QtMultimedia 5.0" -\inqmlmodule shouldn't have the version number and this commits removes it because it is confusing. Task-number: QTBUG-32172 Change-Id: I76f58ddd5ea2d5ae51eaae83a8408fd67611838a Reviewed-by: Martin Smith <martin.smith@digia.com>
* CoreAudio: Create an audio plugin supporting iOS and OS XAndy Nichols2013-09-1910-2904/+6
| | | | | | | | | | This removes the Mac audio backend that was hardcoded into QtMultimedia and adds a new audio plugin using the CoreAudio API. Change-Id: Ib15291825f9452a3763e0eeb281d952deb0bad3d Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com> Reviewed-by: Christian Stromme <christian.stromme@digia.com> Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2013-09-061-1/+1
|\ | | | | | | Change-Id: I2cba36426d8af40f94712f7f05f4e0dd4efce6e7
| * Fix QAudioOutput::setVolume() limited 50% on 32-bit Windowsold/5.1Bill Somerville2013-09-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | A signed 16 bit integer was being used to pack a normalised double into half of a DWORD. It needed to be unsigned 16-bit to get the full range of the Windows volume control. Task-number: QTBUG-33160 Change-Id: Ic17f572a188401ee686c6e6af3984d52328ccda6 Reviewed-by: Alex Blasche <alexander.blasche@digia.com> Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-08-271-1/+1
|\| | | | | | | Change-Id: I469f258c4838f87edaedc8620d925a3c537d1619
| * Enable QSoundEffect with loopCount of Infinite to playAndy Nichols2013-08-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Previously if the loopCount property of a QSoundEffect was set to QSoundEffect::Infinite then no sound would be played at all. This is because QSoundEffect::Infinite == -2 and playback was only continued on values above 0. Task-number: QTBUG-32882 Change-Id: I739919a3e538128fc16f26ede5eb6cc4f2eb29fb Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-08-121-14/+11
|\| | | | | | | | | | | | | Conflicts: src/plugins/plugins.pro Change-Id: Ieec8b5984b0fba97872bf96c38410369dc0e20cf
| * Fixed bug in QWaveDecoder.Yoann Lopes2013-08-051-14/+11
| | | | | | | | | | | | | | | | | | When looking for a specific chunk, it was entering an infinite loop if not finding it in the next two chunks available. It now correctly tries to find the chunk until it reaches the end of the IO device. Change-Id: I29252318566fe3a47f267410c91dacaf302d9618 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* | Merge branch 'stable' into devSergio Ahumada2013-08-052-8/+47
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Id3427cb1a80956ba61373313c21b4b9aa007ea54
| * Make PulseAudio implementation of QSoundEffect more robust.Yoann Lopes2013-07-252-8/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | It was crashing when the PulseAudio daemon was not running or was killed. When the connection to the daemon fails (or is terminated), it now tries to reconnect every 30 seconds. Sounds created before a connection loss will be recreated after reconnection. Task-number: QTBUG-32487 Change-Id: Ia63707aa5c70434b834b3079a9950a9b35057b26 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-271-10/+12
|\| | | | | | | Change-Id: I48a140d1bbe82ab65e54683d77aea8c97c06ec80
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-22 17:50:05 +0000