summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* Updated declarative components to use the QML moduleJonas Rabbe2012-03-141-1/+4
| | | | | Change-Id: I4b49466ba5248683c2285f98ce17bc2c24bba515 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Use small-screen layout in qmlvideo, qmlvideofx examples on HarmattanGareth Stockwell2012-03-121-0/+5
| | | | | Change-Id: Ieaaca763630acfb81a1b5b5cfef2d08367a9e265 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Updated qmlvideofx to use MediaPlayer.autoPlay instead of playingGareth Stockwell2012-03-121-1/+1
| | | | | Change-Id: Iee9066a6c7fcddbe6054e9c505b24e478f63cb4d Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Expose availability from the backend to C++ and QML.Michael Goddard2012-03-021-1/+1
| | | | | | | | | | | | | | The availabilityError property was static based on the service, but it can change at run time, so add the plumbing to allow the backend to report it itself. Also make sure that both QML and C++ expose the availability. The radio tuner and data controls previously had properties (but no signals) for availability - these have been removed. Change-Id: I9240cf93e2a51b14cd38642f9312ae3c75f05361 Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Audio decoder example.Lev Zelenskiy2012-02-276-0/+647
| | | | | Change-Id: I0f9fb755ef8bc6f66696a06996ac7a9f13de69cc Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Audio recorder example updated to display level using QAudioProbe.Lev Zelenskiy2012-02-246-4/+251
| | | | | Change-Id: I7d5aea306aeb3cd9109615f9ed4905c53125233a Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Video player example updated to display histogram using QVideoProbe.Lev Zelenskiy2012-02-245-3/+219
| | | | | Change-Id: Iaeba751280133bd405fe90a0d5d07be446c95738 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* clean up qmake-generated projectsOswald Buddenhagen2012-02-221-6/+0
| | | | | | | | remove assignmets which are defaults or bogus Change-Id: I7130f22a66b294f92b0ed03749895136d0890a64 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fix some compiler warnings.Michael Goddard2012-02-145-5/+6
| | | | | | | | | As it turns out, we had an overloaded virtual from an earlier era, with the extra parameter never used. So cleaning that up was a bonus to remove the compiler warning. Change-Id: I780287f8a5d2b0a1ec84ec62c88ba50e051f372b Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Fix shader file loading in qmlvideofx exampleGareth Stockwell2012-02-131-1/+23
| | | | | | | | | | | | | | Each effect is implemented as a QML element, whose fragment/vertexShaderFilename properties specify paths from which shader programs are loaded. These paths are relative to the application installation directory, e.g. "shaders/billboard.fsh". If the current directory from which the application is launched does not match the installation directory, shader program loading fails. This patch converts the relative filename provided by the QML element into an absolute path before attempting to open the file. Change-Id: I8ed39d271c4f1f59180588843e500ed73a93a543 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Disable flicking of qmlvideofx example parameter panelGareth Stockwell2012-02-131-0/+1
| | | | | Change-Id: I4cf563c288aaf37fe60ba1ec56ffc9fd72060b99 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Improve usability of qmlvideofx example on small touchscreensGareth Stockwell2012-02-135-50/+60
| | | | | | | | | | | * Add tolerance to mouse press detection on divider and slider grips, so that clicks just outside of the grip radius are treated as if the click was inside the grip. * When slider bar outside of grip radius is clicked, increment slider position by a fixed amount, towards the click position. Change-Id: Iefb0b274ee5a97ed5cb789596bf6b3c07a7fc8b8 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Add some recent things to the overview docs.Michael Goddard2012-02-091-0/+3
| | | | | | | Also clean up a few other doc related bits and pieces. Change-Id: I56714e1811e38a7225131c1d141430b49f5f509c Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Fixed 'magnify' shader in qmlvideofx exampleGareth Stockwell2012-02-091-5/+8
| | | | | | | | Previous shader caused untransformed pixels (those outside of the lens) radius to be offset slightly from their original positions. Change-Id: I4df847fdc40073a55da8777981c3fdd373937658 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Enable qmlvideofx window to be resized, when large screen layout usedGareth Stockwell2012-02-085-6/+43
| | | | | Change-Id: I3010b9fd5f68e922ff94edd4d08d8114c689c037 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Tidy up frame rate display in video examplesGareth Stockwell2012-02-087-52/+110
| | | | | | | | | | | | | | | * Use a Column element to position QML and video frame rate counters. * When using small-screen layouts, hide frame rate counters when dialogs or menus are displayed. * Do not display instantaneous frame rate. If changes in this rate trigger a repaint, then the rate itself is changed. If the repaint occurs in less time than the QElapsedTimer resolution, the displayed instantaneous rate is always zero. * Add a label, so it is clear which is the QML repaint rate, and which is the video frame rate. Change-Id: Ie58ab162ab44bd7f1c4b297eed929b9baa73552c Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Tidy up file browsing in video examplesGareth Stockwell2012-02-087-632/+672
| | | | | | | | | * Use QStandardPaths to determine the initial folder displayed when the file browser is launched * Persist folder between file browser invocations Change-Id: I5b86dd3d304c3f33802f3189716e1d360774198d Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Add AudioEngine with new implementationLing Hu2012-02-065-0/+348
| | | | | Change-Id: I5eebe662ecbce9814ed3e763db56df9be737d11f Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Remove QMediaImageViewer (SC break).Michael Goddard2012-02-035-375/+0
| | | | | | | 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>
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-30212-212/+212
| | | | | | | | | | 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>
* Add a volume (gain) property to QAudioInput.Michael Goddard2012-01-252-0/+16
| | | | | | | | 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>
* Update obsolete contact address.Jason McDonald2012-01-23214-214/+214
| | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: Ie8cd560b6d9a2c6e552b6be1ad8bc96c80a6535c Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Changed metadata keys type from enum to QString.Dmytro Poplavskiy2012-01-202-5/+4
| | | | | | | | 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>
* Replaced QAudioCaptureSource with QAudioRecorder.Dmytro Poplavskiy2012-01-192-30/+27
| | | | | | | | | | 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>
* Changed QCamera::captureMode property to QFlagsDmytro Poplavskiy2012-01-171-1/+1
| | | | | | | | | This enables the expression of extra camera modes like viewfinder only or capture during video recording. Change-Id: Ie02fdeef5eb7fd6fc2f133c1afb0141e37c22b06 Reviewed-by: Mithra Pattison <mithra.pattison@nokia.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Update year in Nokia copyright headers.Jason McDonald2012-01-1257-57/+57
| | | | | | | Update headers from before 2011 that were missed in the previous commit. Change-Id: Ib0fd91a39ffc57117fe01280e34519c3f914fac0 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Updated QtMultimedia declarative module to version 5.0Jonas Rabbe2012-01-1116-22/+22
| | | | | | | | | | | | The QtMultimedia module should have version 5.0 to align with Qt 5 in general. This change updates the version, but keeps 4.0 versions of the elements for compatability purposes. Documentation and examples has also been updated to reflect this version change. Change-Id: Ica10c1a5ecc2c7233192a65e04ff77eb33a77e30 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Remove widgets config test.Michael Goddard2012-01-111-1/+1
| | | | | | | | | Since it's not guaranteed that other Qt modules will be built by the time qmake is run (and config.tests are created) we can't rely on compilation. Just check the module.pri variable for widgets instead. Change-Id: I352cf6427b748b89b69ec17588ce0dd83065090f Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Properly handle the case where QtWidgets is not available.Michael Goddard2012-01-062-30/+23
| | | | | | | | | | | | | | | It does use a config test for now, just to make it clearer. The Mac backend currently requires widgets, but most of the others should work without it (just not supporting QVideoWidget/WindowControl). The QVideoDeviceControl interface was modified to remove the QIcon usage - it was never implemented. Unfortunately even the QML examples need widgets for the wrapper application, and will need to be ported to QtGui based wrapper. Change-Id: I8a55ad5cf09ab51749510bf16f49de0bd3f0bcdb Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Update copyright year in license headers.Jason McDonald2012-01-06157-157/+157
| | | | | Change-Id: Ib82c1be5548443ef1f5e97b3d5641a2f55d212af Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix namespace compilation.Michael Goddard2011-12-225-8/+4
| | | | | | | By removing unnamespaced forward decls. Change-Id: Icccb34092ef7451d29f52db08811a2152c50e4b8 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Fix some of the effects in qmlvideofxMichael Goddard2011-12-224-7/+8
| | | | | | | | | | | * TiltShift was sometimes applying the effect in the wrong place. * Blur had some QML properties duplicated * Blur kernel wasn't quite summing to 1, and was applying opacity twice * The target width for the second pass was incorrect, so it was blending darkness, resulting in a dreary image. Change-Id: Ib8ba93d979c597cf4d225b3d24d26a22d0cdffc2 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Disable some build time messages.Michael Goddard2011-12-224-7/+0
| | | | | Change-Id: I5a46b36c72f4307471cfe77f055706539a77049c Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Enable the new examples.Michael Goddard2011-12-221-0/+1
| | | | | Change-Id: I6078090d706c633cf0e85c74495d092f2d653127 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Express qmlvideofx effect parameters declarativelyGareth Stockwell2011-12-2229-222/+225
| | | | | | | | | | Each effect item now exposes a ListModel property which describes the set of user-controllable parameters. This model is used by the ParameterPanel component to generate a ListView whose delegate displays the parameter name and a slider. Change-Id: Ib26877fe434d8b746ef621e0b4adbcbe1ed9aaa8 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Add qmlvideo and qmlvideofx examplesGareth Stockwell2011-12-22154-0/+11467
| | | | | | | | | | Based on code imported from master branch of QtMobility repo, ported to Qt Quick 2. Task-number: QTBUG-23118 Change-Id: Ifd297de0e595c675ff1a8e3218d91b03629295b9 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* QtMultimedia: Fix warnings about declarative/quick.Friedemann Kleint2011-12-052-2/+2
| | | | | Change-Id: Ic9323b222641e41dae05cb4b0dccb6531e845676 Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Declare more metatypes and debug operators.Michael Goddard2011-11-021-12/+0
| | | | | | | | | | | Nearly all of the multimedia metatypes used in the auto tests are now declared properly, and a large number of the types have debug operators as well. Removed the superfluous decls as well. Change-Id: I42cfe37562db0c71d9811b4577fc326a3326ccc9 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Adapt to QtDeclarative api renaming (QSG --> QQuick)Kent Hansen2011-10-241-2/+2
| | | | | Change-Id: Iefee24c6262679263caef1976d0d9af541834ea0 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Rename QtMultimediaKit to QtMultimedia.Michael Goddard2011-10-0740-80/+80
| | | | | | | | | | 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>
* Update audiooutput example with volume sliderhawcroft2011-09-282-0/+26
| | | | | | | | | Update example for new volume API Change-Id: I1b9ccbccc62930549e667f0063b3d76feb23a2ea Reviewed-on: http://codereview.qt-project.org/5662 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: derick hawcroft <derick.hawcroft@nokia.com>
* Fix widget dependencies for multimediawidget tests and examples.Gunnar Sletta2011-09-221-2/+2
| | | | | | | Change-Id: I9c7600ce2cf7980f923ba038ef122b49add24c37 Reviewed-on: http://codereview.qt-project.org/5286 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Compile with refactorGunnar Sletta2011-09-1750-41/+55
| | | | | | | 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>
* Added tune up and down methods, and changed name of scan methods.Jonas Rabbe2011-09-011-12/+4
| | | | | | | | | | | | | | | 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-316-2/+277
|\ | | | | | | Change-Id: I86243b496b9fb42f828a67343dc576baa2c21ca0
| * Added QML API for getting the limits for a specific radio band.Jonas Rabbe2011-08-301-3/+27
| | | | | | | | | | | | | | | | | | | | | | | | 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-261-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * Added first implementation of declarative radio elementJonas Rabbe2011-08-175-0/+250
| | | | | | | | | | | | | | | | | | | | | | | | Simply uses and mirrors radio tuner API directly. Also added an example which uses the new Radio element, the example should be functional, but cannot be tested on current setup (lack of actual radio tuner). Change-Id: I0f724ef239f65aef9c0640d4a3a9fa0d2e7242ed Reviewed-on: http://codereview.qt.nokia.com/2890 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* | Merge branch 'camera' of git://scm.dev.nokia.troll.no/qt/qtmultimediakitMichael Goddard2011-08-301-2/+2
|\ \ | | | | | | | | | Change-Id: Iec6f96e3713257d25f7b1e06c6da9c153b23800b