Commit Graph

566 Commits

Author SHA1 Message Date
bigbearzhu
f2309fa927 Fixed a testing bug on windows platform.
Change-Id: Iaf11864e6929345b105cdd185b4bb01b24961406
Reviewed-by: Ling Hu <ling.hu@nokia.com>
2012-06-29 06:00:21 +02:00
Ling Hu
eb5b216ac4 Refactoring wmf plugin
make mf startup/shutdwon inside plugin instead of player component
make sourceresolver a common component for a wmf related tasks.

Change-Id: I49cdc4fa512a62398a68cd2be2f522f567d11c7c
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-06-29 05:59:46 +02:00
Ling Hu
340f18d4b5 Fixed a WMF seek bug.
Change-Id: I1f077a045dad94127e747dd3f8c8566559aef5a2
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-06-29 03:01:51 +02:00
Michael Goddard
b0809c027c Rename availabilityError to availability.
It's perhaps clearer in the usual case.

Change-Id: Id3cef82ac83f8c9b538b3315281664ce1c6a2b96
Reviewed-by: Ling Hu <ling.hu@nokia.com>
2012-06-29 02:47:41 +02:00
Michael Goddard
bba28afe55 Rename a few controls.
The encoder controls could be confused with actual encoding, so make
clear they are just settings.  Also, the end point selector controls
were not named very well.

Change-Id: I27f8bf9c865c5f295abad97c01ef98752af42613
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Ling Hu <ling.hu@nokia.com>
2012-06-29 02:47:29 +02:00
Friedemann Kleint
b834fe032f Locate qdoc on Windows correctly.
Change-Id: I1a7ac5293f76b62e467208b59948d58032c2a2cf
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-06-28 13:48:12 +02:00
Lev Zelenskiy
dcf79d4998 Read actual period size after initializing a stream.
QTBUG-23833

Change-Id: I2bd352cf34d12e1be22f640c47fc2388dc3a7f8a
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-06-28 09:17:47 +02:00
Michael Goddard
6f7867b5e9 Fix header path for audio engine on Mac.
There's a different prefix here.

Change-Id: Ifda82e19824801b1d903ab6ad40c97428fff236c
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
2012-06-27 09:12:48 +02:00
Lev Zelenskiy
909576da6a Allow frequences up to 96000 in QAudioInput win32 backend.
QTBUG-26102

Change-Id: I1c594f7df4aea2292045e1e96f58926d97bcfd82
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-06-27 08:12:10 +02:00
bigbearzhu
f3f6b2d7db Fixed timeout on waiting for positionChanged event.
Change-Id: I894af066073f601e5838dbd47eb92da516c04544
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-06-27 08:12:04 +02:00
bigbearzhu
9de7ba79ed Fixed plugin dir error on Windows.
Change-Id: I470877d988fb70915607b65c4f17eee1adb8049d
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-06-27 08:12:01 +02:00
Lev Zelenskiy
23a81d62e7 Clean buffers before closing the input device.
Input device handle is invalid after waveInClose()
QTBUG-24119

Change-Id: I8276e56766684efd26b78dc019ff871ebac28408
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-06-27 08:11:59 +02:00
Thiago Macieira
4d64345983 syncX() doesn't do anything anymore. Remove it.
Change-Id: Id15af428e1d04606564bad093847b3dc5a731e85
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
2012-06-26 22:20:26 +02:00
Thomas McGuire
a121e74710 Add blackberry backend
Change-Id: I88be743f0cad94d4beabdae917758be7e4293bfd
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
2012-06-26 14:13:39 +02:00
Lev Zelenskiy
4ebedcd158 Added support for big endian data to QAudioOutput win32 backend.
Convert data from big endian to little endian.
QTBUG-19881

Change-Id: If62a69b79c01d66536010b3326a86df8ca5f83b0
Reviewed-by: Ling Hu <ling.hu@nokia.com>
2012-06-26 09:13:30 +02:00
Toby Tomkins
1cf5f3e729 Remove insignificant flag from tests that are passing.
Change-Id: I246d7cfa79cbbbee3cfc4a354b38c155aa887aa2
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-06-26 08:10:15 +02:00
Toby Tomkins
c717df0005 Add expected fail flags for consistently failing autotests.
Task-number: QTBUG-26320

Change-Id: I58624a8c39c0c247d9073097616a7a78e7e307da
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-06-26 08:10:13 +02:00
Lev Zelenskiy
1c81d25e4f Fix crash in audioinput and audiooutput examples.
Do not call tr while initializing static objects.

Change-Id: Ia75ddd53ae22b0e4179f174da7d933156744e261
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
2012-06-26 05:26:42 +02:00
bigbearzhu
4af40afe46 Fixed a testing bug.
Change-Id: Iff7fb6d4de2f38fde37019ea7e8b034707f8bbe1
Reviewed-by: Ling Hu <ling.hu@nokia.com>
2012-06-26 04:08:00 +02:00
Oswald Buddenhagen
b1a4d7f9fc build system cleanups
- load(qt_module) => load(qt_build_config)
- remove:
  - CONFIG+=module (obsolete)
  - code relating to module version headers (automated now)
  - %mastercontent assignment (automated now)
  - QT_BUILD_*_LIB defines (automated now)
  - pointless QPRO_PWD assignments
  - pointless DEFINES+=QT_MAKEDLL
  - pointless and commented out include and depend paths
  - qmake -project boilerplate

Change-Id: I8f4586403848fe8f2dff4e889b389956ffcdea59
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-06-25 11:44:40 +02:00
Oswald Buddenhagen
631f3ab025 fix bogus conditional
this code meant (alsa && linux) || openbsd || freebsd, which is
presumably not what was meant.
but the os test seems rather pointless in the first place, so just
remove it.

Change-Id: I2591c9307ab9d6e821625b24797259ed60e9a082
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
2012-06-25 10:40:03 +02:00
Oswald Buddenhagen
82ade38b11 switch to new-style configure tests
Change-Id: Ib56d0cb24065c1f990aee5d7f41bfedfe75332a1
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-06-25 10:40:03 +02:00
Oswald Buddenhagen
c495dfe142 auto-generate module pris
Change-Id: I19285dfef7294e813ec241a8f6f00a804d56df49
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-06-25 09:50:37 +02:00
Mithra Pattison
5705f70da1 Add default initialisation to various multimedia classes
Change-Id: I902de05984fdae152e2678e4cf2d401a0b670703
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
2012-06-25 06:39:11 +02:00
Ling Hu
1b7da9e0ad Fixed some crash with WMF backend
Change-Id: I721ba049e2ecafff53ee70d5b930fb52c15fbe09
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-06-25 06:39:08 +02:00
Toby Tomkins
6d301388e1 Fix namespace compilation.
Change-Id: Id8d71a48df20da16647834e8f9732012f26f928f
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-06-25 06:39:04 +02:00
Michael Goddard
d006d874ba Add a few things to the .gitignore file.
A few Mac specific things, plus .o files.

Change-Id: I7273977666a07cdf39cf0916bc5c2dbede30af05
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
2012-06-25 06:39:00 +02:00
Michael Goddard
89898e4499 Add the QtBase/lib directory as a library path, not just frameworks.
This meant that any non-framework libraries there weren't found (like
the multimedia helper libraries).

Change-Id: Iacd99f82763d39fc47c779c9498dfd5e1cc0e743
Reviewed-by: Ling Hu <ling.hu@nokia.com>
2012-06-25 06:38:56 +02:00
Michael Goddard
eb92be7ede Fix QAudioOutput volume on OSX.
Change-Id: I142ca638d3dc0839f7c5b103f03edac6715a0bb6
Reviewed-by: Ling Hu <ling.hu@nokia.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
2012-06-20 09:11:28 +02:00
Mithra Pattison
84ca713760 Fix target executable name in audiooutput example
Change-Id: I4481879366f136370f4bd549bb2ef2f8764cf821
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-06-20 09:11:28 +02:00
Michael Goddard
be14e367fd Remove the USE_COCOA #ifdef, it's always defined now.
Change-Id: If3528cdfda647fa3cfba3c310bc9816b8b1e0344
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
2012-06-20 07:59:05 +02:00
Ling Hu
bd071a3853 Enabled wmf plugin on Windows again
Change-Id: Ia1fe3ef6ec8f70888c7beb390678935ad9995a90
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-06-20 06:41:49 +02:00
Maurice Kalinowski
6d2883e7ed fix volume handling on Windows
volume handling for QAudioOutput is broken currently as it fallbacks to
the default implementation.
Need to cache the volume, as hWaveOut is invalid while the output is not
in active state.

Task-number: QTBUG-25454
Change-Id: I2adb28a5e6719a5d3c360553abd70af46b646080
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-06-20 00:30:57 +02:00
Thiago Macieira
4bbbffeebc QIODevice* is used, but QIODevice was never declared
After I made qpair.h no longer include qdatastream.h, which included
qiodevice.h.

Change-Id: Icae2b466e022d3394ce5cafceeb4ea6601f6d33f
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2012-06-19 21:58:02 +02:00
Michael Goddard
6931cbb35a Fix a number of other qdoc issues.
* Several places needed the forward class declaration hack
* Missing/wrong minor version numbers on imports
* A few typos
* Any number of attempts to work around qdoc
* A few missing docs
* Tweaked soundeffect docs

Change-Id: I3c2ab998a11cbb0956712e0423e01fdb70f5bfff
Reviewed-by: Peter Yard <peter.yard@nokia.com>
Reviewed-by: Angus Cummings <angus.cummings@nokia.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
2012-06-15 08:49:29 +02:00
Michael Goddard
e975897ad7 Tweak the controls documentation.
Also move the qaudioendpointselector control into controls.

Change-Id: Ia21f98a683eb38a9c11c42f6e7901d7d841aae90
Reviewed-by: Peter Yard <peter.yard@nokia.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
2012-06-15 08:49:26 +02:00
Michael Goddard
c88abd0177 Replace a writable position() property with a seek() method.
Seeking is sometimes asynchronous, and more importantly nearly every
one using a slider for seeking ends up with a binding loop.

Change-Id: I45d92e19b0276c8b97c51c073754d1c9d3dc611e
Reviewed-by: Ling Hu <ling.hu@nokia.com>
2012-06-14 05:42:49 +02:00
Angus Cummings
940ef93c30 Updating brief layout of QML types
Change-Id: I1dcd7bf7427f25bb9e19cbe3c7e17808b0fc9708
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Peter Yard <peter.yard@nokia.com>
2012-06-14 05:42:49 +02:00
Angus Cummings
a34ff2d3e0 More doc things
Changing case in some titles
Other misc wording changes

Change-Id: Ie56a390de0c5ee8f80876555d3d9139819fc5a73
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-06-14 05:42:49 +02:00
Alan Alpert
f5644b3648 Update folderlistmodel import to version 2
To help distinguish the QtQuick 1 and QtQuick 2 versions of
folderlistmodel, the QtQuick 2 version is now version 2 of
folderlistmodel.

Depends on e824fa97e4a9fbaa0c850274b448568953692240 in qtdeclarative

Change-Id: Ic30c255ecb4c7b12dcf624b4b1d51cbc82b779df
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-06-14 04:47:58 +02:00
Simon Hausmann
40a95ed42c Fix build on Windows with new qdatetime.h that doesn't redefine min/max
Windows system header files redefine min/max, unless NOMINMAX is defined.
In some cases we can simply include qt_windows.h, which does the trick,
in other cases including qt_windows.h produces different compilation
errors and it's simpler to just do the NOMINMAX trick.

Change-Id: I3cf81bab7c239363adfa274f158bdf999d1d3ecd
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2012-06-13 12:19:17 +02:00
Michael Goddard
d1b0862ad4 Reduce the usage of QAbstractVideoBufferPrivate.
Move the handle type to the base class (since it's always needed) and
don't allocate the private class in the default paths.

Change-Id: I870a315310ce740f07b1d43cedecfce21feae505
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
2012-06-13 05:53:53 +02:00
Michael Goddard
f5e3fdc4a7 Clarify documentation about QAudioDecoder::read and blocking.
It doesn't block - not safe to implement in all cases.  Applications
can implement blocking semantics based on their usage of event loops
or threads.

Change-Id: If9a6b1ae7014df63a43989c4940524bc5eaae383
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
2012-06-13 05:53:50 +02:00
Angus Cummings
80f37d2d80 Renaming StopppedState to StoppedState
Change-Id: Ib23e9795960f40b46c0b2441ec03e8b1812033e5
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-06-13 05:53:47 +02:00
Ling Hu
931c2d3ffe Enable auto resume of playback for gstreamer mediaplayer
The resource policy now supports implicit auto-resume,
so it is better to cooperate with that in mediaplayer
to enable auto resume playback after resource lost.

Change-Id: Iba0d28e64fa864dd6332a62e915316d48a12a533
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
2012-06-12 06:33:09 +02:00
Angus Cummings
28605b8f74 Adding qdoc workaround to all control classes
Change-Id: Ic8d8aa6f9824954a7745ddaa2639054dea8bf1ba
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-06-12 05:09:00 +02:00
Michael Goddard
342b8b9be5 Remove the legacy QML API.
This means no version 4.0 (which was never released) and no
Qt.multimediakit alternative import.

Change-Id: Iaacf047b0d72381a4a8cd975e036135ed11ea383
Reviewed-by: Ling Hu <ling.hu@nokia.com>
2012-06-08 07:53:23 +02:00
Angus Cummings
4000a180dd Fixing some doc errors for overview
Change-Id: Ic502abf295d402678bb28e68bfacc76ae05ee8ec
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-06-08 06:02:32 +02:00
Kent Hansen
2d8f81b857 Fix compilation without QtWidgets and QtOpenGL on Mac
Change-Id: I3cff7e41d27955e37bc8207e4820fdc21ce75f7b
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-06-07 09:37:07 +02:00
Kent Hansen
d91d3b9b18 Don't use QtWidgets/QApplication in autotests
These tests don't link against QtWidgets; including QGuiApplication
is sufficient.

Change-Id: I96812af7ac5ef79a9602acf4b51498350e8e50e1
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-06-07 08:28:08 +02:00