summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Don't ignore debug plugins on Mac when release plugins aren't availableRohan McGovern2011-10-251-5/+26
| | | | | | | | | | Previously, we unconditionally ignored any plugins whose names ended with _debug.dylib. This makes the mediaservice plugins unusable on Mac if Qt is configured to build plugins as debug-only (which is incidentally the default). Change-Id: I5a8981b2251e803fa233b74c968f6eaa452d367c Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* We already have a mock backend.Michael Goddard2011-10-2510-1185/+0
| | | | | | Change-Id: Ic4f9277c4c4bff225ac6cd70d28b495a42435e35 Reviewed-by: Sergey Dubitskiy <sergey.dubitskiy@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Declare these metatypes.Michael Goddard2011-10-251-0/+6
| | | | | Change-Id: I5b10669f2b17f67d95469dc28e99822d7f08280c Reviewed-by: derick hawcroft <derick.hawcroft@nokia.com>
* Adapt to QtDeclarative api renaming (QSG --> QQuick)Kent Hansen2011-10-242-6/+6
| | | | | Change-Id: Iefee24c6262679263caef1976d0d9af541834ea0 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fixed compile; QDesktopServices -> QStandardPathsRohan McGovern2011-10-241-2/+2
| | | | | | | Broken by qtbase dfa24768a3243eda68d91f573050bf23f96da2dd. Change-Id: Ie0d79eaee5c6fedfaacae69800f6aec9190f83db Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Added RDS functionality to the QRadioTuner/QDeclarativeRadioSami Nurmenniemi2011-10-2123-9/+1580
| | | | | | Change-Id: I865e3caba82977002cf1f01f1d64ee0a42de77c6 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Limit the sequential bytes skipping to a max 16kB at a time.Michael Goddard2011-10-211-1/+1
| | | | | | | | | Otherwise QIODevice::read will try and allocate whatever junk is passed in, so a corrupt chunk can result in 1GB+ allocations which are never actually used. Change-Id: I1ea4a5c1a5d21b1ee6f7e428105c52c0ee6ca7f7 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Fixed build problems with QuicktimeJonas Rabbe2011-10-204-5/+5
| | | | | | | | | | Because the Q_WS_* defines were removed, the Quicktime backend stopped working. Replacing them with Q_OS_* works. Additionally, the Quicktimer Player Service has to depend on QtWidgets. Change-Id: I687b352191c38a91edaaf2a687ac13ed118fcf88 Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Init mediaobject at classBegin rather than componentCompleteLing Hu2011-10-171-7/+9
| | | | | | | | | | | | Since we use an explicit backgroundaudio class, there is no need to wait for other property to determine the mediaobject type. So it is better to init the mediaobject at classBegin to prevent being accessed before mediaobject initialized. Change-Id: Ia55b8b4c1ab70cc0acbf6f49bcb3e20bdb813a88 Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Make the C++ API of QSoundEffect public.Michael Goddard2011-10-177-21/+11
| | | | | | | | | The QML API already was. The C++ API still needs good documentation, though. Change-Id: I669f5ec7dd17d616788d71d77dc906acc0c0279f Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com> Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Declarative VideoOutput: added support for more rgb formats.Dmytro Poplavskiy2011-10-145-163/+294
| | | | | | | | | | RGB 565, RGB 32 and BGR 32 formats added, all of them supported with OpenGL ES. Change-Id: I026628611c59575af5934bac0a5f95dfbc6770cb Reviewed-on: http://codereview.qt-project.org/6644 Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Copied ALSA config test into QtMultimedia moduleJonas Rabbe2011-10-141-1/+1
| | | | | | | | | | The config test which still exists in QtBase should be removed at a later date, together with pulseaudio and gstreamer config tests. Change-Id: I4bea45ab69d1bac10814fc60ecf24dbc859b0f20 Reviewed-on: http://codereview.qt-project.org/6643 Reviewed-by: Ling Hu <ling.hu@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Make sure this library gets installed.Michael Goddard2011-10-141-0/+2
| | | | | | Change-Id: I6b556b3b22deae002d2d2cf47680f23e207b5d00 Reviewed-on: http://codereview.qt-project.org/6639 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Multimedia: Compile on Windows.Friedemann Kleint2011-10-1225-58/+60
| | | | | | | | | | | MSVC is more strict about #include <> and #include "". Reviewed-by: Ling Hu <ling.hu@nokia.com> Change-Id: I8973d7b2717d892407ad93785f92a64b05bdb6b5 Reviewed-on: http://codereview.qt-project.org/6134 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Moved general gstreamer helper classes into separate library.Jonas Rabbe2011-10-1234-75/+208
| | | | | | | | | | Cleaned up configuration of gstreamer with a separate config test. Change-Id: I1ec9ee466233687fbcfdc544a12d9fce578e4379 Reviewed-on: http://codereview.qt-project.org/6459 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Rename the parsing error signal to parsingError.Michael Goddard2011-10-113-15/+21
| | | | | | | | | Refactor the error handling code a little. Change-Id: I717b3aaacb24660b3f26769f19ac718b73106473 Reviewed-on: http://codereview.qt-project.org/6401 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: derick hawcroft <derick.hawcroft@nokia.com>
* Fix the wavedecoder a little.Michael Goddard2011-10-112-30/+102
| | | | | | | | | | | Handle RIFX and corrupted files better. Update the autotest so that it is run properly (and copies files properly in shadow build). Fix the gendata script to properly create testdata. Change-Id: I47b705507bebaef54df2835ec767c6b220c64678 Reviewed-on: http://codereview.qt-project.org/6380 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: derick hawcroft <derick.hawcroft@nokia.com>
* bail out in case of missing descriptorshawcroft2011-10-101-3/+4
| | | | | | | | Change-Id: I7c231367a4b5ef2d15fd1a7af2c2a6c1d51c9460 Reviewed-on: http://codereview.qt-project.org/6279 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Improve video test coverage and debugging output.Michael Goddard2011-10-076-114/+137
| | | | | | | | | | | Added a few debug operators for some useful enums, and added tests for them. One or two other features not really tested. Change-Id: Idffec6ade1d4e05dbf72f3dc47dfc0d01ddddf8b Reviewed-on: http://codereview.qt-project.org/6201 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Rename QtMultimediaKit to QtMultimedia.Michael Goddard2011-10-07267-2650/+952
| | | | | | | | | | There are a few legacy bits left in place so it passes CI, and then qt5.git etc can be updated. Change-Id: I6b082e50e6958c72fdabc2974992e16d90dafa3a Reviewed-on: http://codereview.qt-project.org/5368 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Add a new servicename for background mediaplayerLing Hu2011-09-301-0/+7
| | | | | | | | Change-Id: I40b3670462f0b865a9e64bd2abd6d6a01db01e80 Reviewed-on: http://codereview.qt-project.org/4492 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: derick hawcroft <derick.hawcroft@nokia.com>
* Update background audio element to use new service nameLing Hu2011-09-303-4/+6
| | | | | | | | Change-Id: I8f0480e4fb40b034f75dcd900f2d440fd0e7610d Reviewed-on: http://codereview.qt-project.org/4493 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: derick hawcroft <derick.hawcroft@nokia.com>
* Add QAudioOutput volume API and pulseaudio backend implementation.hawcroft2011-09-286-1/+93
| | | | | | | Change-Id: I70784e8d17522a23f6467713d58384b30557694b Reviewed-on: http://codereview.qt-project.org/5663 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: derick hawcroft <derick.hawcroft@nokia.com>
* Fakeradio: emit signal when scanning abortedJonas Rabbe2011-09-271-1/+4
| | | | | | | | | | | | | Patch from Sami Nurmenniemi. Emits searchingChanged(false) when scanning is aborted because it was initiated too close to the limits of the frequency range. Change-Id: I15a1334c8a7058dd8eb413c2742f8f12aed7bed5 Reviewed-on: http://codereview.qt-project.org/5570 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Gst player backend: don't show the first frame when resuming playback.Dmytro Poplavskiy2011-09-274-3/+55
| | | | | | | | | | | | | | | It's necessary to temporarily disable show-preroll-frame of video sink, load pipeline to paused state, seek to requested position, and after seeking is finished (position updated) playback is started with show-preroll-frame restored. Task-number: MOBILITY-3030 Reviewed-by: Jonas Rabbe Change-Id: Ide1e6d909dd53f670229c293bc6be496a54e8626 (cherry picked from commit 625cce87e28fc7b5ec8785824affb3129fd3607b) Reviewed-on: http://codereview.qt-project.org/5500 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Needs widgets module to build.hawcroft2011-09-271-1/+1
| | | | | | | Change-Id: I95ba0c64843bfcdfc9797c4d818ac17606e4a1d3 Reviewed-on: http://codereview.qt-project.org/5563 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: derick hawcroft <derick.hawcroft@nokia.com>
* Fix a few QT_BEGIN/END_HEADER pairs.Michael Goddard2011-09-274-2/+12
| | | | | | | Change-Id: Ie723af34680222b939aeb0179df21d63cec3cf3b Reviewed-on: http://codereview.qt-project.org/5514 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Remove QApplication usage - it's in QCoreApplication.Michael Goddard2011-09-261-2/+1
| | | | | | | Change-Id: I0c1fab0c0eea56f1ecb141d6238acdf2778c82d8 Reviewed-on: http://codereview.qt-project.org/5513 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Sergey Dubitskiy <sergey.dubitskiy@nokia.com>
* Move the backend specific documentation into a nicer place.Michael Goddard2011-09-2628-29/+29
| | | | | | | | | | | | | We really don't need to bore the 99.9% of people who won't care. And it's certainly not more important than camera. Reviewed-by: Derick Hawcroft (cherry picked from commit 51e3a1bc45ffc2688fcd3949216aedda4c41bf81) Change-Id: I8add47e42c2c06bf5e16f406604a19531af6901e Reviewed-on: http://codereview.qt-project.org/5501 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fix a playback bug for mediaplayer windows media foundation backendLing Hu2011-09-263-5/+14
| | | | | | | | | | | | Task-number:QTMOBILITY-1606 Reviewed-by:Jonas Rabbe (cherry picked from commit d5426bf52e19c9c6a52837b423f48024979ea076) Change-Id: Ie7c1c90a8f5a64e77c435ffc1917d8f9638dfff3 Reviewed-on: http://codereview.qt-project.org/5499 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fixed a typo in the WMF backend which caused a compilation failureGareth Stockwell2011-09-261-2/+1
| | | | | | | | | | Reviewed-by: trustme (cherry picked from commit 7eab979c41513321518d5e3cea6d142bbf4e58d9) Change-Id: I9cd5de907867ea6561c568d10c88e3bf5a701509 Reviewed-on: http://codereview.qt-project.org/5496 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* fix a spelling errorLing Hu2011-09-261-1/+1
| | | | | | | | | Change-Id: Ic593f342055a4ff65503bd92236ff2904012d4f4 Reviewed-by:Michael Goddard (cherry picked from commit d9cd5386f6d9aa1c702424d272d70a0b45a6b9db) Reviewed-on: http://codereview.qt-project.org/5495 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Merge branch 'camera' of ↵Michael Goddard2011-09-2616-963/+2322
|\ | | | | | | | | | | | | | | | | | | ssh://codereview.qt-project.org:29418/qt/qtmultimediakit Conflicts: src/imports/multimedia/multimedia.cpp src/imports/multimedia/multimedia.pro Change-Id: I9d4bc1aa65f89ac24dd12c1e2c21a02f49913e13
| * QML Camera element redesign.Dmytro Poplavskiy2011-09-1216-960/+2320
| | | | | | | | | | | | | | | | | | | | Grouped camera properties in a similar way to C++ QCamera API. Added support for video recording. Change-Id: I8667dc90878b3e20eda5523ba562f5687bd0932b Reviewed-on: http://codereview.qt-project.org/3552 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: derick hawcroft <derick.hawcroft@nokia.com>
* | Move resource policy usage to a config test.Michael Goddard2011-09-263-9/+6
| | | | | | | | | | | | | | | | | | MeeGo uses this too. Change-Id: I0b7ec00538289d4a3beea62da08233c0d1eb45a2 Reviewed-on: http://codereview.qt-project.org/5447 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* | Clean some doc warnings.Michael Goddard2011-09-2211-57/+1
| | | | | | | | | | | | | | Change-Id: I9cadc589a02bbc4804d2d21ab30752af375ef89c Reviewed-on: http://codereview.qt-project.org/5348 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Ling Hu <ling.hu@nokia.com>
* | Add QT_BEGIN/END_HEADER things, plus QT_MODULE thing.Michael Goddard2011-09-22101-2/+672
| | | | | | | | | | | | | | Change-Id: I1a5f51a659175cadadcdaf0c4e5e9048f98e64e0 Reviewed-on: http://codereview.qt-project.org/5346 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* | Remove older QGLContext calls in favour of new QOpenGLContext.Michael Goddard2011-09-222-2/+5
| | | | | | | | | | | | | | Change-Id: I2669f48ebac5c14f5aaf85135f3d0adbf541d877 Reviewed-on: http://codereview.qt-project.org/5339 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* | Don't re-set default properties in MediaBase::componentCompleteLing Hu2011-09-201-3/+6
| | | | | | | | | | | | | | | | | | This is to avoid conflicting with state restore from background playback. Change-Id: Idc5440b55a27bb5c5109717f405591e934bbedbc Reviewed-on: http://codereview.qt-project.org/4397 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* | Camerabin backend: fixed compilation without X11Dmytro Poplavskiy2011-09-171-0/+3
| | | | | | | | | | | | | | | | | | Disable video widget and overlay controls on systems without X11 Change-Id: I0163fa83018b35ba6f0f8221ad3c465506b52d00 Reviewed-on: http://codereview.qt-project.org/4850 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: derick hawcroft <derick.hawcroft@nokia.com>
* | Compile with refactorGunnar Sletta2011-09-1724-27/+26
| | | | | | | | | | | | | | Change-Id: I248f811a13ca00ccbf5d342a556d389bca625856 Reviewed-on: http://codereview.qt-project.org/4940 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* | Build fix after refactorLasse Holmstedt2011-09-1313-14/+15
| | | | | | | | Change-Id: I2de40846fc7402ddf32259d42a486a74330ff626
* | Silly defs file error.Michael Goddard2011-09-061-1/+1
| | | | | | | | | | | | | | Change-Id: Ic4c128b6c410701092848048982a8e82a5c58b88 Reviewed-on: http://codereview.qt.nokia.com/4224 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* | Fix some compiler warnings.Michael Goddard2011-09-0512-15/+32
| | | | | | | | | | | | | | | | | | Mostly about deprecated ASCII casts. Change-Id: I70428913799c15f20a1a5f80be57848e1072e058 Reviewed-on: http://codereview.qt.nokia.com/4158 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* | Add background audio element.Ling Hu2011-09-026-5/+244
| | | | | | | | | | | | | | Change-Id: I64c91beb7219cc148efc606e87e5f6e57b4b55ce Reviewed-on: http://codereview.qt.nokia.com/3574 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* | Add QMediaBackgroundPlaybackControl interfaceLing Hu2011-09-025-3/+233
| | | | | | | | | | | | | | | | | | Allows some media service backend to provide the ability to can play media in the background while the application is terminated. Change-Id: Ia5e751367f6d6ea6847c3c873b45df5f971557e2 Reviewed-on: http://codereview.qt.nokia.com/3561 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* | Added tune up and down methods, and changed name of scan methods.Jonas Rabbe2011-09-012-6/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of requiring developers using the radio API to read the frequency step, adding it to the current frequency and setting the new frequency, there has been added tuneUp and tuneDown methods. Also, the searchBackward and searchForward methods have been renamed to scanDown and scanUp which seem more logical. And cancelSearch has become cancelScan. Change-Id: Ib9ff61c0f58163039f41f045037cb9a11b37a59e Reviewed-on: http://codereview.qt.nokia.com/4013 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: derick hawcroft <derick.hawcroft@nokia.com>
* | Merge branch 'radio' into 'master'Jonas Rabbe2011-08-3113-3/+1148
|\ \ | | | | | | | | | Change-Id: I86243b496b9fb42f828a67343dc576baa2c21ca0
| * | Added QML API for getting the limits for a specific radio band.Jonas Rabbe2011-08-302-5/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using properties for the frequency step, minimum and maximum frequency of the currently selected band. Also updated the declarative-radio example to use the minimum and maximum frequencies to show a tuner band for the radio. Change-Id: I9f28f10e98e008c14b10bdc12b0727086cd45f0b Reviewed-on: http://codereview.qt.nokia.com/3829 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
| * | Introduction of fake radio backend to enable testing the radio APIsJonas Rabbe2011-08-269-2/+773
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Includes some behavior for all standard methods. Also fixes a typo in qradiotunercontrol.h and a couple of minor bugs in the radio example that came to light using this new backend. Change-Id: I65b8b8715a46f0fd702f9630ea81f7d5df527055 Reviewed-on: http://codereview.qt.nokia.com/3619 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>