slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
260 Commits 1 Branch 0 Tags
f050d8fe2ba6b23654e7df6d51e052ec588b00a3
Commit Graph

17 Commits

Author SHA1 Message Date
Michael Goddard
f050d8fe2b Use US spelling for organization. 
Since it seems it was never implemented, don't keep the
legacy spelling.

Change-Id: Idc918548a4ed643ba7da35e97ce08f401e74303f
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
 2012-01-19 05:37:51 +01:00
Dmytro Poplavskiy
53d71baed3 Changed QCamera::captureMode property to QFlags 
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>
 2012-01-17 00:58:30 +01:00
Alexis Menard
0c88091bfc Fix build for the camera support of QtMultimedia GStreamer plugin. 
Include the correct header file (it was renamed) and also remove
duplicate declaration.

Change-Id: I2683851e9fd0978427273c4739f47b54e1af743b
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
 2012-01-14 09:14:54 +01:00
Jason McDonald
0dca769d5a Update year in Nokia copyright headers. 
Update headers from before 2011 that were missed in the previous commit.

Change-Id: Ib0fd91a39ffc57117fe01280e34519c3f914fac0
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2012-01-12 01:08:31 +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
Jonas Rabbe
4f3294930a Fix X11 and QPA compilation problems 
The X11 buffer pool was using outdated APIs, and as the 'qpa'
configuration value is being removed, it caused the X11 code
to be pulled in, and therefore cause compilation failures.

Change-Id: I5fdaed854c6525716fccca44b5fbd0b850880cb9
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
 2011-12-13 01:22:28 +01:00
Jonas Rabbe
48d95f0baa Moved general gstreamer helper classes into separate library. 
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>
 2011-10-12 08:58:30 +02: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
Michael Goddard
247dcc770b Move resource policy usage to a config test. 
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>
 2011-09-26 02:16:25 +02:00
Dmytro Poplavskiy
aef6b5a38a Camerabin backend: fixed compilation without X11 
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>
 2011-09-17 07:32:37 +02:00
Dmytro Poplavskiy
da9b436cd1 Ported gstreamer camera backend from camerabin to camerabin2. 
Change-Id: Ieb08df492e7b9cbfe35e93a056685cfdac6e704e
Reviewed-on: http://codereview.qt.nokia.com/2994
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
 2011-08-24 07:07:45 +02:00
Dmytro Poplavskiy
e70ebfd2ed Gstreamer media backend cleanup. 
Moved controls specific bus/sync messages handling from
player/camera/capture session to corresponding controls.

Reviewed-by: Michael Goddard
Change-Id: Ieb67976ed335b0ef1cde87dc60e8ad8da3409526
Reviewed-on: http://codereview.qt.nokia.com/2535
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
 2011-08-05 07:50:59 +02:00
Michael Goddard
fdac892bbc Remove most of the "mobility" references. 
Docs still need some fixing, but there are some legitimate usages of
it there.

Change-Id: I94c7b68788ce97829711a4384884d7e52fe84162
Reviewed-on: http://codereview.qt.nokia.com/1736
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
 2011-07-19 08:40:59 +02:00
Michael Goddard
1403a1c7be Remove some obsolete bits. 
They can be updated again later when things are more stable, if needed.

Change-Id: I73bdacdd3d1fd43a60cd3a0c14b925fa9c32ee27
Reviewed-on: http://codereview.qt.nokia.com/1724
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
 2011-07-18 05:56:15 +02:00
Jyri Tahtela
a925bb4a9e Update licenseheader text in source files for qtmultimediakit Qt module 
Replace old license header with correct one.

Change-Id: Ibff8fbea6595bb80f1122d55db2194accd319308
Reviewed-on: http://codereview.qt.nokia.com/1318
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
 2011-07-08 07:59:00 +02:00
Michael Goddard
2a34e88c1e Initial copy of QtMultimediaKit. 
Comes from original repo, with SHA1:
2c82d5611655e5967f5c5095af50c0991c4378b2
 2011-06-29 13:38:46 +10:00