Commit Graph

30 Commits

Author SHA1 Message Date
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
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
Oswald Buddenhagen
83b79659b6 centralize load(qt_build_config)s in .qmake.conf
Change-Id: Ie07a32729ec8679f799613f8f6ccdd9c1b6bf7c9
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-09-12 12:37:43 +02:00
Jason Barron
bc2bce3629 WMF Backend: Fix crash in MFPlayerService::releaseControl.
When releasing a video render control or a video window control, we
were deleting the object pointed to by the 'control' pointer, but
were not setting this pointer to 0 which left it dangling. Shortly
after we tried to cast this dangling pointer to another type which
crashed. The solution is just to return after deleting the control.

Change-Id: I9ab672c8b86a13af889d87c76141e6b8db5b74a7
Reviewed-by: Andy Nichols <andy.nichols@nokia.com>
2012-09-04 11:31:16 +02:00
Dmytro Poplavskiy
ae728a4b1e Replaced endpoint control with audio input and output controls
Change-Id: I981aabe39d106ced4ee1240db9e5b653c6fa5e91
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-07-24 09:49:47 +02:00
Lev Zelenskiy
b7f4b2decb Videoprobe implementation for wmf backend.
Change-Id: Ia597af428764229a76c0059ae7a57eb302aee63d
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-07-19 09:08:45 +02:00
Lev Zelenskiy
afe12ea4de Audioprobe implementation for wmf backend.
Change-Id: I63af91af870cb92c838c1ab5d4752815aa60a03f
Reviewed-by: Ling Hu <ling.hu@nokia.com>
2012-07-11 08:01:45 +02:00
Ling Hu
48c945bac3 Added wmf implementation for QAudioDecoderControl
Change-Id: Ib6d5c93577bd55995a9ae51e757156149890f15d
Reviewed-by: Jun Zhu <jun.5.zhu@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-07-11 06:56:18 +02:00
Ling Hu
7fb95fe3e2 Fix a potential leak in wmf
Change-Id: I4fc039aeaf00a02122d5e11867c73223cc2ebbc1
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-07-05 06:55:22 +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
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
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
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
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
Lars Knoll
487010e579 Remove the last remainders of the old plugin system
Port the last two currently unused plugins (v4l and wmf) over to the new plugin
format.

Fix documentation that still mentioned Q_EXPORT_PLUGIN.

Change-Id: I18200dd792e8973687e92180fc41d11395b35132
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2012-06-05 12:44:29 +02:00
Jason McDonald
5e801e2793 Remove "All rights reserved" line from license headers.
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>
2012-01-30 07:08:05 +01:00
Ling Hu
ebeea66e82 Fix header changes for wmf
Change-Id: I9d06dd9a39f26851589b1c1f259db8de2ee992a0
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-01-24 09:13:11 +01:00
Jason McDonald
6390157fd7 Update obsolete contact address.
Replace Nokia contact email address with Qt Project website.

Change-Id: Ie8cd560b6d9a2c6e552b6be1ad8bc96c80a6535c
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-01-23 04:21:51 +01:00
Dmytro Poplavskiy
8ff5b88b27 Changed metadata keys type from enum to QString.
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>
2012-01-20 06:30:37 +01:00
Michael Goddard
f7bfcdfa28 Remove widgets config test.
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>
2012-01-11 01:00:42 +01:00
Michael Goddard
c97f5f8c2e Properly handle the case where QtWidgets is not available.
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>
2012-01-06 05:26:01 +01:00
Jason McDonald
bc7d964a05 Update copyright year in license headers.
Change-Id: Ib82c1be5548443ef1f5e97b3d5641a2f55d212af
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-01-06 01:43:40 +01:00
Michael Goddard
03f22bcdaf Rename QtMultimediaKit to QtMultimedia.
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>
2011-10-07 06:16:34 +02:00
Ling Hu
589b2e3adf Fix a playback bug for mediaplayer windows media foundation backend
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>
2011-09-26 07:22:52 +02:00
Gareth Stockwell
8c29d67e67 Fixed a typo in the WMF backend which caused a compilation failure
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>
2011-09-26 07:21:35 +02:00
Ling Hu
ea4c32602d fix a spelling error
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>
2011-09-26 07:21:12 +02:00
Michael Goddard
0344fd84c2 Try to move widget/gvitem code into new QtMultimediaKitWidgets lib.
Change-Id: I522b3e6d4465c6c5cce2483676e09320176837d6
Reviewed-on: http://codereview.qt.nokia.com/2665
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
2011-08-25 04:47:33 +02:00
Jason McDonald
74feb5d34e Replace outdated license headers.
Change-Id: Icbdd1bdae223192465b8c84faeb99b01be154275
Reviewed-on: http://codereview.qt.nokia.com/2605
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2011-08-05 03:03:02 +02:00
Michael Goddard
1e4dda9710 Add Windows Media Foundation backend for QMediaPlayer
Task-number:QTMOBILITY-1606
Reviewed-by: Michael Goddard
(cherry picked from commit bdf3a9b39661cfb836245139d02e95e854646a7e)
(cherry picked from commit 8d2370953eb32bf44a037244e0d9f9b484875f7a)

Change-Id: I07790b8c540a04e4e19a3d018a4884a773e980bf
Reviewed-on: http://codereview.qt.nokia.com/2086
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Ling Hu <ling.hu@nokia.com>
2011-07-25 14:31:41 +02:00