Commit Graph

736 Commits

Author SHA1 Message Date
Friedemann Kleint
cc24af773b Fix syncqt-warnings.
Use include with module name for the multimedia-classes.

Change-Id: I8da1a4015a162959b604cd859aee139e246e3f6c
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
2012-11-19 19:37:40 +01:00
Yoann Lopes
d64e246f33 WMF: Fixed color adjustment when using the EVR window control.
Change-Id: I007937b358f062cd9d3d3c02e3a0780d6b2539be
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
2012-11-19 16:58:15 +01:00
Friedemann Kleint
6826f684e2 Fix compilation with -no-rtti.
Availability of dynamic_cast should be checked.

Task-number: QTBUG-27939
Change-Id: I24c0bca7859a45c6be89c507dadd91e7175939e0
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
2012-11-19 13:53:23 +01:00
Robin Burchell
a73dfa7c63 Fix a possible crash in QSoundEffect.
pa_stream_cork may fail, and pa_operation_unref won't handle that gracefully, so
check the return value before unreffing.

Done-with: Vesa-Matti Hartikainen
Change-Id: If789e37a13f85487c79dd8a03a7ca3624b1412d2
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
2012-11-09 11:46:04 +01:00
Holger Ihrig
c042e61a77 Adding 3rdparty library libfftreal to install step
Adding libfftreal to install step in this directory, otherwise
it will not be deployed for the installers

Task-Number: QTBUG-27876
Change-Id: I090b61def94eee9c63d732067036b3ca5398cc52
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
2012-11-08 14:00:57 +01:00
Shawn Rutledge
d175f79d53 All QWindow properties that have "window" in them have been renamed.
Depends on patch Ie4424ec15fbdef6b29b137f90a2ae33f173edd21 in qtbase.

Change-Id: I2903a7404a738ae651ba07d4bdc003520473bd80
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-11-08 13:21:22 +01:00
Sze Howe Koh
cb6a5bfda5 Doc: Put QMediaMetaData in the Qt Multimedia module
This should have been done in 13fd00199a

Change-Id: I3ce6e3ccde5f29cce3c24ee539dee6fcdff7b653
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2012-11-08 10:37:31 +01:00
Thomas McGuire
e567e098d9 Blackberry: Add a page with platform-specific documentation
Change-Id: Ic03c59523648ee25c419ec5d80122da9a717aa2d
Reviewed-by: Bernd Weimer <bweimer@rim.com>
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
2012-11-07 23:20:45 +01:00
Thomas McGuire
80a6b173b3 Blackberry: Enable support for audioengine if available
BB10 ships OpenAL, so the audio engine works there.

Change-Id: I49ba6201788cb41cabb1670522dc97a36fd5f2c2
Reviewed-by: Kevin Ottens <kevin.ottens.qnx@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
2012-11-07 22:38:34 +01:00
Andras Becsi
7319c194cd Fix the bufferProgress property of QDeclarativeAudio
The bufferProgress property of QDeclarativeAudio is documented to hold
how much of the data buffer is currently filled, from 0.0 (empty) to
1.0 (full) and should be declared to be of type qreal instead of int.
The implementation was correctly normalizing the buffer status
percentage to the [0, 1] range but the returned value was truncated
to int in QML because of the faulty property declaration.

Change-Id: I494c9cd14f4b3ec511759ae66a50e9f96bcb1452
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
2012-11-07 16:20:22 +01:00
Sze Howe Koh
74e44a6ef6 Enable the "#include <QAudio>" camel-case header (regression)
The header was available in Qt 4, but somehow went missing.

Change-Id: I5e54921afd6e196d67db797331a0b0093f41ce34
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
2012-11-06 18:20:11 +01:00
Sze Howe Koh
47fe5f9b39 Enable the "#include <QMultimedia>" camel-case header
Rename qtmedianamespace.h/cpp -> qmultimedia.h/cpp, and have
sync.profile generate the camel-case header during compilation.

Part of the Header Consistency Project
(http://lists.qt-project.org/pipermail/development/2012-October/007570.html)

Change-Id: Iade9ee6538970b4b9935f169eb2d9a0ea6949a95
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
2012-11-06 18:20:09 +01:00
Sze Howe Koh
832c3929f2 Rename namespace QtMultimedia -> QMultimedia
Main code, examples, tests and docs updated. Method:
1. Mass find+replace "QtMultimedia::" -> "QMultimedia::"
2. Hand-modified declaration in qtmedianamespace.h/cpp

For consistency (with minimal disruption), namespaces with a "Qt" prefix
will be renamed.

Part of the Header Consistency Project
(http://lists.qt-project.org/pipermail/development/2012-October/007570.html)

Change-Id: I1fbc43a1aa91d996aa61869fcd8d05186bf7cf6d
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
2012-11-06 18:20:06 +01:00
Sze Howe Koh
13fd00199a Enable the "#include <QMediaMetaData>" camel-case header
Move the QMediaMetaData namespace into new files, and have sync.profile
generate the camel-case header during compilation.

For now, the new header (qmediametadata.h) is included whereever the old
one appears (qtmedianamespace.h), but an audit will be done later to
make explicit #includes only where necessary.

NOTE: Git may think that a rename has occurred.

Part of the Header Consistency Project
(http://lists.qt-project.org/pipermail/development/2012-October/007570.html)

Change-Id: I63705722a5e175628d56128888a94ae4c20879f2
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
2012-11-06 18:20:02 +01:00
Sze Howe Koh
00d7092163 Rename namespace QtMultimedia::MetaData -> QMediaMetaData
Main code, examples, tests and docs updated. Method:
1. Remove unused forward-declarations, "class QMediaMetaData"
2. Mass find+replace "QtMultimedia::MetaData" -> "QMediaMetaData"
3. Un-nest from the QtMultimedia namespace in qtmedianamespace.h

For consistency (with minimal disruption), namespaces with a "Qt" prefix
will be renamed. Also, Qt guidelines don't include nested namespaces
(http://lists.qt-project.org/pipermail/development/2012-October/006756.html)

Part of the Header Consistency Project
(http://lists.qt-project.org/pipermail/development/2012-October/007570.html)

Change-Id: I40e59c1cf58c1792725e735e9285c51bc5f226b1
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
2012-11-06 18:19:57 +01:00
Oswald Buddenhagen
0affd9023f adjust to qt_plugin.prf changes
DESTDIR and INSTALLS+=target are set up automatically now. note that in
the qmediaserviceprovider test we must override that.
also, TARGET munging is done automatically.

Change-Id: Ida5d5601e22b099134d1ec07ace713e0d0986bd6
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2012-11-05 14:01:31 +01:00
Oswald Buddenhagen
9dbcbc0b2f fix VPATH
the code relied on the now removed qmake misfeature of adding DEPENDPATH
to VPATH.

Change-Id: I3bea30a25776eb945fbd65f9e9811c91d882893f
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2012-11-05 14:01:27 +01:00
Sergio Ahumada
79f585b9e9 test: Mark tst_QSoundEffect as insignificant
Task-number: QTBUG-26509
Task-number: QTBUG-26748
Change-Id: Id8952c2ed3e2a261907eed1e160fc187af6983ce
Reviewed-by: Rohan McGovern <rohan@mcgovern.id.au>
2012-11-01 03:02:24 +01:00
Stephen Kelly
4acdccba05 CMake: Remove obsolete test_modules test
The generated module_includes test is a super-set of this test.

Change-Id: I33d665a38d664c049028519d73dfad912fc22a1f
Reviewed-by: Rohan McGovern [inactive] <rohan.mcgovern@nokia.com>
2012-11-01 02:04:30 +01:00
Stephen Kelly
f844c8d90c CMake: Test module includes
Change-Id: I1676efff8071fa0fae13bb484a5e18928e35f663
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-10-31 12:45:25 +01:00
Sergio Ahumada
441ce7e6d6 Remove stale QT_MODULE() usage cases
As of Qt5, this macro is defined to be empty; simply get rid of these leftovers.

Change-Id: Id24056c0afd013904b1e098dc49e502038fd77a4
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2012-10-25 20:15:38 +02:00
Friedemann Kleint
31d3de9a9c Fix the QML list interface
The QML list interface was changed, so that there is now a read only
constructor and the default properties are removed. This is because the
original interface was very runtime centric, like other parts in QML.
The new interface was changed for the needs of the QML designer and
debugger.

Task-number: QTBUG-9390

Change-Id: Ia61a2457432b4fc5c0cf440eeebd9d3a6c4c6463
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-10-24 10:53:07 +02:00
Maurice Kalinowski
371292f288 add install path to rule
fix installation into prefix directory.

Change-Id: I6838589e2e186d4f23d240e0e7c2772a46af3a9d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
2012-10-22 08:55:39 +02:00
Caroline Chao
8907cecc0d Fix for QuickTime 7 media player backend
Fix build on Mac 10.6 (32bits)

Task-number: QTBUG-27179

Change-Id: If0b83605650966bf801b5fbb06d02c113d0b4214
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
2012-10-19 15:45:36 +02:00
Andy Nichols
700b4cdf42 Add MediaPlayer support to AVFoundation plugin
This plugin would be used on Mac 10.7+ where without the QuickTime C API
our QT7 media player performance was crippled.

Change-Id: Iaadb1990a8f63393c4cd02d096624e0fed42b40f
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Jason Barron <jason.barron@digia.com>
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
2012-10-19 14:54:27 +02:00
Venugopal Shivashankar
7f25187774 Doc: Removed dependency on qtmultimedia.css
All module documentation must use the global HTML template and style
sheet in qtbase\doc\global.

Change-Id: Ia7db9373f2291052924f433223a128ef4c2c3df8
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2012-10-19 11:40:43 +02:00
Yoann Lopes
abcc107731 Make QGstreamerPlayerSession 'VAAPI-aware'.
At the moment the GStreamer player pipeline is not setup properly when
the VAAPI plugin is available, resulting in no video being shown.

Added 'video/x-surface' as one of the default raw formats for the
decodebin.
Don't use vaapidecode when the video sink is not compatible.

This is a preliminary patch to support VAAPI. In the current state
vaapidecode will never be used as none of our video sinks support the
video/x-surface format.

Change-Id: I39f339b483d4052dd1e29c2b0ef06343d5670224
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
2012-10-17 15:28:16 +02:00
Friedemann Kleint
bce5525cbb QtMultimedia: Fix compiler warnings.
Change-Id: I5783b1f6dce645fb473e7d3da0911dbb40e3951b
Reviewed-by: Jonathan Liu <net147@gmail.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2012-10-17 13:40:18 +02:00
Friedemann Kleint
40fe658dce Fix compilation with stock MinGW.
Use qt_windows.h, provide interfaces and UIDs missing
in stock MinGW.

Task-number: QTBUG-23829
Change-Id: I79ed902bb7636c751df7607f6059a7de237acb31
Reviewed-by: Jonathan Liu <net147@gmail.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2012-10-17 13:40:13 +02:00
Friedemann Kleint
a410276d0d Compile after removal of compatibility code in QtQuick.
qtdeclarative: f21e9ba6efa2b1c8169491db271f79b87b5b0ce4
removed QQuickCanvas.

Change-Id: Ica8ae4d816d1ca08f08d299cec741837a1a77c50
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2012-10-16 16:08:20 +02:00
Caroline Chao
89ba86d7bc Remove unused value in qvideowidget.cpp
Following change: 439d5b0e53

Change-Id: I111a87578844bb3c18819285ae9509e0f2c408d9
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
2012-10-13 02:31:12 +02:00
Andy Nichols
2a8ae1c361 Don't run the Linux configure tests on OS X
This can create weird senarios where they pass due to MacPorts actually
having the dependencies.  We don't support this, so dont allow it to
happen.

Task-number: QTBUG-27352
Change-Id: I2be104549b5d1e9a61a734d05b3c21afcd2f6828
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
2012-10-12 13:51:00 +02:00
Andy Nichols
d9d910711d Enable the auto test script to run on OS X
Only a few test could be run on OS X because they were not stored in an
application bundle.  Now on OS X we check for the application bundle for
a test in the runautotests.py script.

Change-Id: If9e3f343f5005ecfe4a83d8282564d1309b4379e
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Reviewed-by: Jason Barron <jason.barron@digia.com>
2012-10-12 10:05:02 +02:00
Tor Arne Vestbø
c64d7ce2a2 Update docs after modularization of docs
The global files now live in qtbase only, and are made available to the
other modules via the $QT_INSTALL_DOCS variable.

We now use QMAKE_DOCS to trigger doc generation instead of rolling our
own rules for qdoc.

Change-Id: I900029d71c305a1f269cddeeb0e05c524d933834
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2012-10-11 15:47:53 +02:00
Jędrzej Nowacki
cb010ebf5c Build fix after a QVariant change
QVariant(Qt::GlobalColor) ctor was removed in Qt5.

Change-Id: If272ff26003cdc58eb3decf5030e927134d126b0
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
2012-10-10 19:00:42 +02:00
Andy Nichols
bc7e9fe7c7 Fix issue sharing OpenGL context from render thread on OS X
On OS X when running in QtQuick 2 examples in debug mode we fail an
assert because we try to set a dynamic property using
QObject::setProperty from the render thread, while the object exists in
the main thread.  Now we call setProperty from the correct thread.

Change-Id: I3f26ead0f68fadcded472bf5c9014a4025f0a03e
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
Reviewed-by: Jason Barron <jason.barron@digia.com>
2012-10-09 13:46:31 +02:00
Andy Nichols
13ce3d921a Added config test for AVFoundation framework
Change-Id: Ifd152513074e6b7802a3ed6d4722ba78762ec79c
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-10-09 10:50:43 +02:00
Dmytro Poplavskiy
ce135bff83 Fixed AVF camera backend build with namespaced Qt
Objective-C declarations may only appear in global
scope, moved them out of Qt namespace

Change-Id: Icb136be75f544e5929ac28f0ba0681211b81a983
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-10-09 10:50:32 +02:00
Kevin Ottens
9cc977668f Export QAudioHelperInternal symbols
They can be useful to some of the audio plugins.

Change-Id: I10856c104770ed57c72b674829e3922b5067a822
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
2012-10-08 08:37:49 +02:00
Kevin Ottens
2f2b317318 Don't add the beginning of the file to the end of the last period
If we're in the last loop, it is not necessary to provide a full period
on read. Just provide the remaining of the data and hit the end of the
stream by returning less than requested, otherwise we potentially
generate some garbage noise.

Change-Id: I9d3a632ddc0c3289957c9f876d5dbe2999b50ebd
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
2012-10-08 08:37:35 +02:00
Kevin Ottens
690b4c4978 Blackberry: Move the mediaservice plugin in a subdirectory
Move the current platform plugin content in a subdir in order to make
room for several plugins (at least an extra one will be needed for the
audio type).

Change-Id: If17d6a464e36014fbefda52ddb0e8f8a58697f48
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
2012-10-08 08:37:22 +02:00
Jerome Pasion
8005b89c65 Doc: Added Qt Multimedia to 'qmlmodules' group
-'qmlmodules' contains Qt's QML API
-made brief description consistent with other QML API

Change-Id: I30473048b06e2a4e13deb57c394a12c51a11693b
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2012-10-03 16:52:46 +02:00
Yoann Lopes
b616dd5165 Use QVideoGraphicsItem in the videographicsitem example.
The videographicsitem example now uses QVideoGraphicsItem instead of a
custom QAbstractVideoSurface.
The old code has been moved to a new example:
"customvideosurface/customvideoitem".

Change-Id: I83212f36168ef94d670b447eb1a742a39753939d
Reviewed-by: Jason Barron <jason.barron@digia.com>
2012-10-02 14:13:46 +02:00
Yoann Lopes
439d5b0e53 QVideoWidget: fixed setFullScreen(false) on the Xcb platform.
Fixed exiting fullscreen when a QVideoWidget is embedded in another QWidget.
Requires change I3616dc0f in qtbase to work.
Because of a bug in some X window managers, the order in which
setWindowFlags() and showNormal() are called has been changed.

Change-Id: I335d47a3a1d9ce517978cad35597d72312150db1
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-10-01 09:31:28 +02:00
Venugopal Shivashankar
06827f5d6e Doc: Organized related information in subsections
Change-Id: Iabe4a032d998003b659e298c3d602d68d83de8b1
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2012-09-28 15:00:32 +02:00
Sergio Ahumada
1b80c9971f Add missing QT_{BEGIN,END}_NAMESPACE
Change-Id: I85bbd4f711191c14d6f58f098fced7336c66308f
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
2012-09-27 19:04:03 +02:00
Venugopal Shivashankar
43a00f366f Doc: Moved example documentation and images
Changed to adhere to the new documentation structure
outlined here:
http://qt-project.org/wiki/Qt_Documentation_Structure

Change-Id: I634e086c7d55abfac3680144cbbe97059fcbea4f
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2012-09-26 17:47:43 +02:00
Yoann Lopes
28c053ccad Use QVideoWidget in the videowidget example.
The videowidget example now uses QVideoWidget instead of a custom
QAbstractVideoSurface, the former being the most straightforward and
fastest way of showing a video in a QWidget.

The old code has been moved to a new example: "customvideosurface".

Change-Id: I15fb4482d0e77bafd24d4cb03316fc8f4ef13c35
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Jason Barron <jason.barron@digia.com>
2012-09-26 12:18:30 +02:00
Jerome Pasion
b5fb793b9a Doc: Adding documentation templates from qtbase
Task-number: QTBUG-27293
Change-Id: I86ca7bbb5bb2899617f3a2afb56183110666f71a
Reviewed-by: Martin Smith <martin.smith@digia.com>
2012-09-25 14:00:09 +02:00
Iikka Eklund
dcbbad869e Change copyrights from Nokia to Digia
Change copyrights and license headers from Nokia to Digia

Change-Id: Id77334cfb15de096941c88e32d04ca07b4eb4709
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-09-24 09:05:51 +02:00