projects / platform / upstream / qtmultimedia.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 66b86ba) | patch
API changes to QML element MediaPlayer aka Audio
authorAngus Cummings <angus.cummings@nokia.com>
Fri, 3 Feb 2012 01:49:47 +0000 (11:49 +1000)
committerQt by Nokia <qt-info@nokia.com>
Wed, 8 Feb 2012 02:48:51 +0000 (03:48 +0100)
commita94c8a1ac26f4a5a79d63672d21538d016bc09f4
treeaaadf76db98dbf9d1ba228c7e0c68868242f0355tree | snapshot
parent66b86ba5812ba15c177f7c6b2916bca4376749cecommit | diff
API changes to QML element MediaPlayer aka Audio

Changed Video.qml for new API
Removed lowercase enum copies, replaced with calling
parent (VideoOutput, MediaPlayer) enums
Removed properties playing, paused
Removed signals started, resumed
Added readonly property playbackState
Added signal playing
Added autoPlay property
Fixed unit tests for new API

Added backwards compatibility for QtMultimedia 4

Change-Id: I27c91cd46d91402b8c4c42bb7d4961ad67909aeb
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
17 files changed:
src/imports/multimedia/Video.qml diff | blob | history
src/imports/multimedia/Video_4.qml [new file with mode: 0644] blob
src/imports/multimedia/multimedia.cpp diff | blob | history
src/imports/multimedia/multimedia.pro diff | blob | history
src/imports/multimedia/qdeclarativeaudio.cpp diff | blob | history
src/imports/multimedia/qdeclarativeaudio_4.cpp [new file with mode: 0644] blob
src/imports/multimedia/qdeclarativeaudio_p.h diff | blob | history
src/imports/multimedia/qdeclarativeaudio_p_4.h [new file with mode: 0644] blob
src/imports/multimedia/qdeclarativemediabase.cpp diff | blob | history
src/imports/multimedia/qdeclarativemediabase_4.cpp [new file with mode: 0644] blob
src/imports/multimedia/qdeclarativemediabase_p.h diff | blob | history
src/imports/multimedia/qdeclarativemediabase_p_4.h [new file with mode: 0644] blob
src/imports/multimedia/qmldir diff | blob | history
tests/auto/unit/multimedia.pro diff | blob | history
tests/auto/unit/qdeclarativeaudio/tst_qdeclarativeaudio.cpp diff | blob | history
tests/auto/unit/qdeclarativeaudio_4/qdeclarativeaudio_4.pro [new file with mode: 0644] blob
tests/auto/unit/qdeclarativeaudio_4/tst_qdeclarativeaudio_4.cpp [new file with mode: 0644] blob
Domain: UI Framework / Qt;