summaryrefslogtreecommitdiffstats
path: root/src/imports
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'origin/5.5' into 5.6Yoann Lopes2015-08-2412-1316/+166
|\| | | | | | | | | | | | | Conflicts: src/imports/multimedia/qdeclarativeaudio.cpp Change-Id: I57c6252b084e4ed796f6f308b2e0c717d0f59b13
| * Doc: Corrected a typo.Venugopal Shivashankar2015-08-112-3/+3
| | | | | | | | | | Change-Id: I53ab7ddf0a8c0416dce19bf2b642e7e294f3c868 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
| * Fix documentation for QML metaData property.Yoann Lopes2015-08-113-1231/+139
| | | | | | | | | | | | | | | | | | For Audio, Video, MediaPlayer and Camera types. Group the sub properties as a \qmlproperty group, which makes the doc much clearer. Change-Id: Id990d7b14a4c3f86768c6b3b4990845f84839944 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
| * Fix qdoc warnings.Yoann Lopes2015-08-112-9/+1
| | | | | | | | | | Change-Id: Ie351f33f88270186b7df0f9cd671fa4e31624231 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| * Doc: update qml module version to 5.5.Yoann Lopes2015-08-1112-57/+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>
| * Improve documentation for mediaObject property.Yoann Lopes2015-08-112-19/+26
| | | | | | | | | | | | | | In Camera and MediaPlayer types. Change-Id: Iaf17dc7e5f7075ce7eeefcf7992b970d1ea99e83 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* | Add audio role API to QMediaPlayer.Jim Hodapp2015-08-104-3/+206
| | | | | | | | | | | | Change-Id: Ia5e3e2fe714f10b6aad62f0a4801c607905c7e0d Task-number: QTBUG-41054 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | Added new playlist QML type.Loïc Molinari2015-08-107-3/+891
| | | | | | | | | | Change-Id: I0788cc9719f427457ad0be9c9a5bfda00451a0c4 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-06-291-2/+2
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ib38fe1e0a4c937068741a9556748a18e35ba59af
| * Define QCamera::FrameRateRange as a struct.Yoann Lopes2015-06-111-2/+2
| | | | | | | | | | | | | | | | Instead of an alias for QPair<qreal, qreal>. Task-number: QTBUG-46563 Change-Id: I7e1ac68242810f7e5f7e161571a11f5de7850e29 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-06-031-1/+4
|\| | | | | | | Change-Id: I7ac7db69c37cc9e5c5241a25b9a874986a23a886
| * Fix documentation for Camera flash mode enum.Yoann Lopes2015-05-181-1/+4
| | | | | | | | | | | | | | | | Added missing documentation for Camera.FlashVideoLight and corrected it for Camera.FlashTorch. Change-Id: Ib1823b6554bd2f9db92e047fd4755ae7fb3e0f96 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.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>
* Update plugins.qmltypesYoann Lopes2015-04-151-5/+74
| | | | | | Change-Id: Iaa05756066c8040fe110707eee6b7d71b2a1aa84 Task-number: QTBUG-44300 Reviewed-by: Alex Blasche <alexander.blasche@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-157-64/+291
|\ | | | | | | | | | | | | | | Conflicts: src/multimedia/playback/playlistfileparser.cpp src/plugins/windowsaudio/qwindowsaudiodeviceinfo.cpp Change-Id: I52950def2b8283ae15797d05d4ead6a1256eba19
| * Fix incorrect signal/slot connection in QDeclarativeTorch.Yoann Lopes2015-04-141-1/+1
| | | | | | | | | | Change-Id: Id8cb716e25a2c08111f99112fbf319fb8331d64d Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
| * Updated plugins.qmltypes.Yoann Lopes2015-04-091-19/+241
| | | | | | | | | | | | | | Task-number: QTBUG-44300 Change-Id: Id6c8dce17e03c79f29581bd49be184a8d3e7f21b Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * Make the QtMultimedia singleton type a QObject.Yoann Lopes2015-04-093-43/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was a QJSValue for the sake of being as lightweight as possible and because we don't actually need any of the QObject features for that type in its current state. However, this implies that type information is not available at runtime. This is a problem for qmlplugindump which currently crashes because it always expects every QML type to have an associated meta object. We can safely make that type a QObject since it doesn't affect source compatibility in any way. This type was bound to become a QObject at some point anyway. Task-number: QTBUG-44299 Change-Id: I2d9b874f15ffc94ed95ef74fadc3b1fd193fe1ef Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * Fix type of Camera's errorCode property.Yoann Lopes2015-04-081-1/+1
| | | | | | | | | | | | | | It's supposed to be of type enumeration (Error) and not QString. Change-Id: Ia3ce112efa3e87614c79b89d05313b0faa557289 Reviewed-by: Andrew Knight <qt@panimo.net>
| * Add missing documentation for AudioSample::source.Yoann Lopes2015-03-241-0/+5
| | | | | | | | | | Change-Id: Iabfb7749bf42413fc19b53b907027caad931092c Reviewed-by: Christian Stromme <christian.stromme@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>
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-02-132-11/+9
|\| | | | | | | Change-Id: I5575a4ba13212c9bfe73a3de3ef17c6528beafc3
| * Fix some typosSergio Ahumada2015-02-114-10/+10
| | | | | | | | | | Change-Id: Iaf8f50741d3103480668b4a654a202d8a363bc45 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
| * Clarify documentation for QImageCapture's 'ready' property.Yoann Lopes2015-02-101-9/+7
| | | | | | | | | | | | | | | | | | | | | | Unlike what was described in the documentation, it's not permissible to call capture() while 'ready' or isReadyForCapture() is false. All backends emit an error in that case. Updated the documentation to reflect that behavior. Change-Id: Icb326e65376b65eadd4c68b67e0ee30beddf1a04 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* | Update copyright headersAntti Kokko2015-02-1257-397/+397
| | | | | | | | | | | | | | | | | | 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>
* | Camera: update viewfinder settings on Loaded status.Yoann Lopes2015-02-041-1/+3
| | | | | | | | | | Change-Id: I9a341c7500b09d39554118689e6e83cd1b798e39 Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
* | Add video filtering support to VideoOutputLaszlo Agocs2015-02-032-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the QAbstractVideoFilter base class and integrate it with VideoOutput. This can be used to perform arbitrary filtering or image processing on the frames of a video stream of a VideoOutput element right before the OpenGL texture is provided to the scenegraph by the video node. This opens up the possibility to integrate computer vision frameworks or accelerated image processing with Qt Quick applications that display video streams using Qt Multimedia. Conceptually it is somewhat similar to QVideoProbe, this approach however allows modifying the frame, in real time with tight integration to the scenegraph node, and targets Qt Quick meaning setting up the filter and processing the results of the computations happen completely in QML. [ChangeLog] Added QAbstractVideoFilter that serves as a base class for QML video filtering elements that integrate compute, vision, and image processing frameworks with VideoOutput. Change-Id: Ice1483f8c2daec5a43536978627a7bbb64549480 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | New camera viewfinder settings API.Yoann Lopes2015-01-135-36/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There already was a control interface for the viewfinder settings but no real public C++ API and a partial QML API. This patch adds a new C++ API and improves the QML API. Supported viewfinder settings are resolution, minimumFrameRate, maximumFrameRate and pixelFormat. The camera can be queried for the supported values for each of these settings. A new control interface was created to match the new API. Change-Id: I289fea038fe46277a5516c956a64280da09ed985 Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
* | 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>
* | Disable warning about QObject::event being hiddenThiago Macieira2014-12-031-0/+6
| | | | | | | | | | | | | | | | | | Found by Clang 3.6: qdeclarativemediametadata_p.h:292:14: warning: 'QDeclarativeMediaMetaData::event' hides overloaded virtual function [-Woverloaded-virtual] qobject.h:116:18: note: hidden overloaded virtual function 'QObject::event' declared here: different number of parameters (1 vs 0) Change-Id: I4324c984649738c9625cc3eb9dddea6e2abf46a9 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | Add additional exposure modes to QCameraExposure.Andrew den Exter2014-11-283-0/+30
| | | | | | | | | | | | | | | | | | [ChangeLog][GStreamer][Android] Camera exposure mode extended to support Action, Landscape, NightPortrait, Theatre, Sunset, SteadyPhoto, Fireworks, Party, Candlelight, and Barcode modes. Change-Id: I13d4bb042d27c0bd2ffcd369882b56bbabc84335 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | Add a color filter property to QCameraImageProcessing.Andrew den Exter2014-11-283-1/+60
|/ | | | | | | [ChangeLog] New color filter property for QCameraImageProcessing. Change-Id: I999e349e3e4f284b533fa62ba50903fbd21cb400 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* Make the multimedia examples less verboseAlex Blasche2014-09-221-0/+3
| | | | | | | | | Important warnings such as missing services are still printed though. Task-number: QTBUG-31080 Change-Id: I96fd3837c4edc58c61b97bf950b7cab05ceed014 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Update license headers and add new license filesAntti Kokko2014-08-2457-1077/+621
| | | | | | | | | - 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>
* Add missing registration of CameraViewfinder QML type.Yoann Lopes2014-07-251-0/+3
| | | | | Change-Id: If4eedd6298731953a3f86c86f0e61b850ee263aa Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
* New camera selection API in QML.Yoann Lopes2014-07-176-34/+553
| | | | | | | | | | | | Also added a new QtMultimedia global object which makes it possible to retrieve the list of available cameras. It can be extended with new utility functions in the future. Includes documentation, example and auto tests. Task-number: QTBUG-23770 Change-Id: Ifea076329c3582ea99246ee1131853344a7b773f Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn2014-07-101-2/+2
|\ | | | | | | Change-Id: I38ebcb3da0e4d2acc9e7108c9579ea98323864e0
| * Fix documentation for QML Camera's cameraStateChanged signal.Yoann Lopes2014-07-081-2/+2
| | | | | | | | | | | | | | | | The signal name is 'cameraStateChanged' but was documented as 'stateChanged'. Change-Id: I80279613b55105a925acafc21f67c4a0917906af Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* | Add QML accessors for camera viewfinder properties.Andrew den Exter2014-07-095-2/+249
| | | | | | | | | | | | | | [ChangeLog] Added QML accessors for camera viewfinder properties. Change-Id: I05a2a6c552aa8606e8dc31a11d1cfdedf66c554f Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* | Add meta-data accessors to the QML Camera type.Andrew den Exter2014-07-074-46/+447
|/ | | | | | | | | | | Add write accessors to the properties of QDeclarativeMediaMetaData as well as additional properties for previously unmapped image keys and add a metaData property exposing this to QDeclarativeCamera. [ChangeLog] New metaData property for the QML Camera type. Change-Id: I4456b7b6120842f7ad9a1b175e42b9fb332adf13 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Make multimedia QML types available for the 5.3 import version.Yoann Lopes2014-06-101-0/+5
| | | | | | | | At least one type needs to be registered with the 5.3 version number to make it known to the QML engine. Change-Id: Iacfe62650b4194fbb89135fef7cb148309227ce2 Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
* Improve documentation for the QMediaPlayer::bufferStatus property.Yoann Lopes2014-05-151-4/+16
| | | | | | | | The corresponding properties in the Audio and MediaPlayer QML elements are also updated. Change-Id: I7104d274d431e7712db2f045c375756e8c2ac03a Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: Clean up references to Qt System InfoSze Howe Koh2014-05-121-0/+4
| | | | | | | | | The module is not released yet; the current documentation is misleading. Change-Id: Ia20ac8e3504942f6f60b94264f3a12497e09da24 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Fix some MediaPlayer properties returning wrong values.Yoann Lopes2014-04-091-22/+22
| | | | | | | | Once the QML component is complete, don't cache any value anymore and always ask the backend for the actual value. Change-Id: I2c3ad55618e0532f713cfcc8258a70a1114fc975 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-13 12:15:09 +0000