summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Changed plugin loader to try unloading plugin if unusedJonas Rabbe2012-02-061-1/+1
| | | | | | | | Deleting the root component can delete plugins already used elsewhere in the application or library. Change-Id: Ibd0afb61cf0e118eb13f9782252c1fec554ea901 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Removed QFlags from declarative camera properties.Dmytro Poplavskiy2012-02-064-18/+16
| | | | | | | | | It doesn't work, while even without QFlags camera.captureMode = Camera.CaptureVideo + Camera.CaptureStillImage works correctly. Change-Id: I00727ad37cbf33e0c6d557a9da08160d6ea4bdc9 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Added metaDataChanged(key,value) signal to metadata controls.Dmytro Poplavskiy2012-02-0615-40/+145
| | | | | | | | | | | | | | It may be more efficient and convenient for application to use this signal instead of metaDataChanged(). metaDataChanged() signal is emitted for compatibility, backends should emit both signals. Signal added QMetadataReader/WritterControl, QMediaObject and QMediaRecorder. Change-Id: I5ca34a40e64b22034e6fde8cd7f9735cc3f72c68 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Made camera unit tests more stableDmytro Poplavskiy2012-02-062-21/+18
| | | | | | | Replaced qWait() with QTRY_COMPARE() Change-Id: I951bd8ca1eaaf8d0fd7308a90f82afcdb0475819 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Remove QMediaImageViewer (SC break).Michael Goddard2012-02-0328-3074/+3
| | | | | | | This class has turned out to be not very useful at this point in time. Change-Id: Ic07132bdcd01a912a6dd1160c867979fd1307b6a Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Fix up various doc issues.Peter Yard2012-02-0211-74/+221
| | | | | Change-Id: I43a8b1b982c4af093bd0bb14573f2299ae28ae94 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Changed QCameraFocus::focusMode type to QFlags based FocusModesDmytro Poplavskiy2012-02-026-24/+24
| | | | | | | It was intended to be QFlags based from the start. Change-Id: I0919b3440eb18e84fc596fb894f18a53e5ff1da0 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* QCameraImageProcessingControl API fixesDmytro Poplavskiy2012-02-027-234/+198
| | | | | | | | | | | | | | | | Moved white balance preset from the separate methods to QCameraImageProcessingControl::ProcessingParameter; Separated absolute contrast/saturation/sharpening/denoising settings with adjustments to backend decided values, with QCameraImageProcessing using adjustments versions. Changed type of parameters from int to qreal with [0..1] range for absolute values and [-1..1] for adjustments. Change-Id: I85c8781c046be6dd45bcf626c25908e1ce5f6bcb Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Add a file documenting what has changed from previous versions of MM.Michael Goddard2012-02-013-0/+164
| | | | | Change-Id: Ia178ba9f159de29f358ad0a62789d8d73a55c0d1 Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Rename multimediaoverview.qdoc to multimedia.qdoc.Michael Goddard2012-02-012-1/+1
| | | | | | | For more consistency across projects. Change-Id: I686c8af01b0b7c574d3c680167ee6a98a0a4efad Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Added QMediaRecorder::actualLocation propertyDmytro Poplavskiy2012-02-017-1/+76
| | | | | | | To report the actual location file was written. Change-Id: Ibb56a720a258a1e5cedceaf0f9bcea73fb93bc96 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Added more encoding settings to declarative camera recorder.Dmytro Poplavskiy2012-02-012-1/+96
| | | | | | Change-Id: If2ec0297a2db5fedaf27c009fb8d55ccf4254c21 Reviewed-by: Ling Hu <ling.hu@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Split QMediaRecorder::setEncodingSettings to separate setters.Dmytro Poplavskiy2012-02-0119-80/+231
| | | | | | | | | | It's easier to change only the necessary part of encoding settings. The settings are applied during the next event loop or before recording starts. Change-Id: Ia2b5c93826a302212aa7f79a0c75e4cbaaf1dd7a Reviewed-by: Ling Hu <ling.hu@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Added antennaConnected property to QRadioTuner and radio qml elementJonas Rabbe2012-01-306-0/+52
| | | | | | Change-Id: I5af8487277e0444629c710c6a0a4e890a8d35c6f Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-30834-841/+841
| | | | | | | | | | As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: I20e5215108c6ebd5f8474fed5c3665118e4791e6 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Moved zoom related properties out of QCameraFocusControlDmytro Poplavskiy2012-01-2711-177/+529
| | | | | Change-Id: I16f9b80ebbacc0b325530e81c291dc030763b65e Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Add a viewfinder resolution control for camera.Michael Goddard2012-01-273-0/+187
| | | | | | | For attempting to set the resolution. Change-Id: I9f3b189b90fee95bf6430e9a74a6599ebcc38697 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Fix some surface assignment errors.Michael Goddard2012-01-272-5/+30
| | | | | | | | On destruction and changing sources, make sure we don't clobber the surface property if it's been changed. Change-Id: I3080b98a547911543a391c8bc040792d260782fd Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Add a rendered and content rectangle properties to VideoOutput QML.Michael Goddard2012-01-276-24/+1039
| | | | | | | | | | | | | So you can align controls with an edge of the rendered area. There's also some convenience functions for mapping source to and from destination coordinates. Also tweaked the updateGeometry function to bail out if no input parameters have changed, rather than doing some more boring maths. Added a unit test for a lot of the class, too. Change-Id: I943bb45e4e56356247d5d6deb5d446222edcb7ca Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Add a volume (gain) property to QAudioInput.Michael Goddard2012-01-258-0/+181
| | | | | | | | Only implemented for PulseAudio so far, but the API does explain that it's optional. Change-Id: I4543a1c81d810fe92bb08f1ed13f3a3534a371e4 Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Update in line with recent QWindow API changeAlan Alpert2012-01-252-3/+2
| | | | | Change-Id: Id495215c7861f05849ffbfd1a0e66af9990a1365 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* QCameraExposure API refactoringDmytro Poplavskiy2012-01-257-270/+285
| | | | | | | | | | | | | QCameraExposureControl: Separated requested from actual exposure values. Removed ParameterFlags, it's confusing and seldom used. Moved ExposureMode and MeteringMode to parameters. QCameraExposure: Added requestedAperture/ShutterSpeed/Iso getters Change-Id: I408586d85e6c9de0c8a711c32b3c90ea46052270 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fix some static analysis defects.Michael Goddard2012-01-256-11/+21
| | | | | | | | | A few silly errors, a few unlikely errors, a few changes that should not have resulted in a problem but makes the code clearer. Change-Id: Id2c82e9317d53822e4da13c94dec9595ea33b07a Reviewed-by: Ling Hu <ling.hu@nokia.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Add a feedback control for Camera.Michael Goddard2012-01-253-0/+287
| | | | | | | To control capture sounds etc. Change-Id: I4db63587be9c74f78c93081d9d46477e34f4a042 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Fix header changes for wmfLing Hu2012-01-243-3/+3
| | | | | Change-Id: I9d06dd9a39f26851589b1c1f259db8de2ee992a0 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Removed QMediaServiceProvider parameter from media objects constructors.Dmytro Poplavskiy2012-01-2426-369/+307
| | | | | | | | | | | | | QMediaServiceProvider should be removed from the public API, to provide media objects with a custom media service. A protected QMediaPlayer/QCamera/QRadioTuner/etc constructor with QMediaService* parameter is a cleaner and more flexible solution. Change-Id: I335cce4bbebe0e548c3df338f206e7be7c93c3dd Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Disable wmf for nowLing Hu2012-01-241-1/+1
| | | | | Change-Id: I4d28741a6546dfafc5c60c7ccdc34d814276b518 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Disabled CameraBin2 based camera backend.Dmytro Poplavskiy2012-01-231-3/+4
| | | | | | | It's not currently tested enough to be enabled. Change-Id: I3c8eb7a81af982b6c98b733755d19c78f2f1c5ed Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Implement QAudioDeviceInfo operator==/!=Michael Goddard2012-01-233-108/+118
| | | | | | | | | | | | | Compares some of the useful parts, but perhaps should be made more tolerant. Also refactored the auto test to properly skip if there are no (output) devices, rather than manually skip. Task-number: QTBUG-13723 Change-Id: I3b83f87a440a83f4237fa119a23009bc99e7626a Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Removed camera simulator backend.Dmytro Poplavskiy2012-01-2325-2963/+0
| | | | | | | It's not used on any Qt5 platform. Change-Id: Ia5a97523c84fe273a265355cc51a1cfa68701085 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Update obsolete contact address.Jason McDonald2012-01-23850-851/+851
| | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: Ie8cd560b6d9a2c6e552b6be1ad8bc96c80a6535c Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update documentation.Michael Goddard2012-01-2313-897/+815
| | | | | | | | | | | | Rewrite the module overview, add video and audio overviews, and update the camera overview. Tweak the radiooverview slightly. Still missing some links for examples and some fleshing out but hopefully a lot better. Change-Id: Id6486e20ba4a09c36d7739e327d4f9910ad083a5 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Fixed compile.Rohan McGovern2012-01-231-2/+2
| | | | | | | Removed usage of QBool. Change-Id: I5e1db9cd3e833a196d73a3493967daa573200c77 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Fixed mapping video frames in SG nodesDmytro Poplavskiy2012-01-202-36/+32
| | | | | | | | Since it's possible to map video frame in R/O mode multiple times it's always necessary to map it before accessing frame data. Change-Id: I13f58085a0b19dba772e0b75c64d9f07d1ac2a58 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Document two VideoOutput properties.Michael Goddard2012-01-201-0/+17
| | | | | | | Still needs polish. Change-Id: Ida24f1ecd0c8a41e9fd6e34ed68cfe1ed8181c00 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Changed metadata keys type from enum to QString.Dmytro Poplavskiy2012-01-2054-1058/+744
| | | | | | | | This allows to combine metaData and extendedMetaData and simplify metadata handling on both backend and application sides. Change-Id: I136eedc86c215be3485db101c43069ca7c82101b Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fixed compile of doc snippets on Windows.Rohan McGovern2012-01-201-1/+1
| | | | | | | Make sure we link against QtWidgets. Change-Id: Ie09e9855f8dfe9c66e1ce311de0ad6f2ca040767 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Fixed unreliable enabling of doc snippetsRohan McGovern2012-01-202-5/+5
| | | | | | | | | | | | | | Testing for QT.widgets.name in qtmultimedia.pro causes the behavior of that .pro file to depend on whether or not qtbase.pro has been processed. Due to QTBUG-23376, and because these are sibling .pro files, this is not safe - nothing guarantees that qtmultimedia.pro is processed after qtbase.pro. Work around the issue by pushing the QT.widgets.name test down one level. Change-Id: I3e155b3f18ad5fa8c527cf5a806313db4b6aabeb Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Use US spelling for organization.Michael Goddard2012-01-198-12/+12
| | | | | | | | Since it seems it was never implemented, don't keep the legacy spelling. Change-Id: Idc918548a4ed643ba7da35e97ce08f401e74303f Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Enable building the documentation snippets.Michael Goddard2012-01-195-33/+34
| | | | | Change-Id: Ib7ef5a564408092ecd72be5d855b2defaddf9c4e Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* QAudioRecorder: fixed handling the missing inputs control.Dmytro Poplavskiy2012-01-192-19/+24
| | | | | | | | Added check for null audioEndpointSelector control in QAudioRecorder::audioInputs() Change-Id: I506dcea9e8d3a468319acf2489cd4d803a5c187d Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Replaced QAudioCaptureSource with QAudioRecorder.Dmytro Poplavskiy2012-01-1916-448/+461
| | | | | | | | | | QAudioCaptureSource name is confusing, it's essentially an audio recording service but it's not evident from API. QAudioRecorder replaces QAudioCaptureSource+QMediaRecorder combination. Change-Id: I0082d766fc0d1b8d5ecbfc527f13e715add730c8 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Add a simple Torch class that wraps the camera flash.Michael Goddard2012-01-194-2/+283
| | | | | | | | Since nearly all programmable torch hardware doubles as camera flash hardware, offer this class here that wraps the QCameraFlashControl. Change-Id: Ib2c061c21c14221d67477d8a3fd89a76fc26ed71 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Set the volume for our automatic integration tests.Michael Goddard2012-01-182-0/+12
| | | | | | | | | These aren't manual test, so we don't care if you can't hear it. QSound does not have a volume property (yet). Change-Id: I6ef90262decf4630de84478215bfe8d259db4751 Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Fixed compile of quicktime pluginRohan McGovern2012-01-1817-56/+42
| | | | | | | | | | | | | This code was including the qmacdefines_mac.h header from QtWidgets, which has recently been removed. Using the header is no longer necessary. Note that the qmacdefines_mac.h contained a workaround for some mac system headers declaring variables named `slots'. Replace that workaround with the standard no_keywords method. Change-Id: Icd47a562d64953692e50a9fea8bb4a9c8424375c Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Use relative instead of absolute SUBDIRS, as usual.Rohan McGovern2012-01-181-4/+4
| | | | | | | | | | There doesn't seem to be any reason for using the full path to subdirs here. Using the full path is unconventional, and it causes the makefile targets to be named after the full path to the subdir, which is unnecessarily long and also unpredictable. Change-Id: I88361b50a4814b5b063f6d84bc68ff6955af1960 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fixed wrong type for autoLoad property in Video element.Jonas Rabbe2012-01-171-1/+1
| | | | | | Change-Id: I803fc3950fd652cb1c2d547636111cdc23b42939 Reviewed-by: Ling Hu <ling.hu@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Added documentation for the convenience Video elementJonas Rabbe2012-01-174-1164/+763
| | | | | | Change-Id: I1963e312c65ec4cc91a54410e86f0606a285086c Reviewed-by: Angus Cummings <angus.cummings@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* More minor doc fixes.Michael Goddard2012-01-1713-25/+138
| | | | | | | | | | - Missing enums - Misspelt \fn etc - Missing QSoundEffect C++ docs - A few typos etc Change-Id: I3418e79b5d50a7ab86e54d79676c33d06954bef5 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Fix up a few doc issuesMichael Goddard2012-01-1789-372/+238
| | | | | | | | | | | | | * lingering references to Mobility * missing group tags on some classes meant they went missing * put classes into functional groups as well (e.g. audio, camera) * added some of the qdoc files to OTHER_FILES so they show up in Creator There are still a lot of warnings since it seems like qdoc is not processing the controls directory. Change-Id: I036f8826ae63f8273b3e649cb32c091d964ce830 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-07 07:18:20 +0000