summaryrefslogtreecommitdiffstats
path: root/src/multimedia
Commit message (Collapse)AuthorAgeFilesLines
* Add virtual destructors to QMediaObjectPrivate and QMediaServicePrivate.Andrew den Exter2010-02-113-2/+2
| | | | | | | This reverts aec0628295cda95f2169e3007368797ba6585ee3 and fixes the actual problem, which is the destructors for for classes inheriting QMediaObjectPrivate weren't being called resulting in QPointer destructors also not being called.
* Fix crash on exit in player example on Windows.Andrew den Exter2010-02-101-0/+2
| | | | | | Explicitly clear the QPointer to QVideoWidget on destruction, otherwise the destruction of the QVideoWidget will seeminly attempt to clear an invalidated QPointer.
* maemo define spelling incorrect.Kurt Korbatits2010-02-091-1/+1
|
* Don't clear the video output when the video widget is hidden.Andrew den Exter2010-02-082-18/+1
| | | | | | | | Changing the video output is a heavy task and is likely to interrupt playback. Not really worth the cost for knowing the video isn't being decoded while it cant be seen. This also applies to the QGraphicsVideoItem.
* Update QML media element documentation.Andrew den Exter2010-02-082-54/+628
|
* Correct QtMedia::SampleRate property mapping.Andrew den Exter2010-02-081-1/+1
| | | | Was mapped to frequency instead of sampleRate.
* Remove documentation for QGraphicsVideoItem::FillMode.Andrew den Exter2010-02-081-12/+0
| | | | No longer exists.
* Make nativeSizeChanged() signal non-const.Andrew den Exter2010-02-081-1/+1
|
* qmlsound changed to soundeffect element.Kurt Korbatits2010-02-0512-195/+1786
|
* Fix license headers.Andrew den Exter2010-02-051-2/+2
|
* Add an internal function for setting the default media servie provider.Andrew den Exter2010-02-052-0/+27
| | | | This allows auto tests to override the default service provider.
* Remove deprecated enum and member variables from video graphics items.Andrew den Exter2010-02-053-12/+0
|
* Make the paused property of the QML media elements indepent of playing.Andrew den Exter2010-02-054-25/+73
|
* Don't emit the metaDataChanged signal twice on a meta-data write.Andrew den Exter2010-02-051-3/+1
| | | | | | The QMetaDataControl implementation will emeit the changed signal when appropriate, so it's not necessary to emit it in QMetaDataControlMetaObject as well.
* Propagate error signals from QMediaPlayerControl to media QML elements.Andrew den Exter2010-02-056-9/+20
|
* Connect changed signals from QMediaPlayerControl to media QML elements.Andrew den Exter2010-02-051-0/+6
|
* Round off volume when converting from real to int.Andrew den Exter2010-02-051-2/+4
| | | | And return a volume of 0 if there's no player control.
* Added QNetworkRequest constructor to QMediaResource.Nicholas Young2010-02-043-3/+28
|
* Construct the meta-object directly instead of using QMetaObjectBuilder.Andrew den Exter2010-02-032-49/+175
| | | | Removes the dependency on QtDeclarative for this class.
* Clip the paint region of QGraphicsVideoItem to it's bounding rect.Andrew den Exter2010-02-033-42/+64
|
* Add lost QmlMediaBase header file.Andrew den Exter2010-02-021-0/+155
|
* Export QPainterVideoSurface for QtWebKit.Andrew den Exter2010-02-011-1/+1
|
* Merge ../../qt/masterJustin McPherson2010-01-2915-73/+60
|\ | | | | | | | | Conflicts: tests/auto/tests.xml
| * Merge branch 'master' of ../../qt/masterJustin McPherson2010-01-2815-73/+60
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/multimedia/audio/qaudiodeviceinfo.cpp src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp src/multimedia/audio/qaudioformat.cpp
| | * Revert "Frequency to SampleRate and channels to channelCount."Kurt Korbatits2010-01-1412-96/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 80d4a4945d3273a4b2ce91e34597533f661af320. Conflicts: examples/multimedia/audioinput/audioinput.cpp examples/multimedia/audiooutput/audiooutput.cpp src/multimedia/audio/qaudio_mac.cpp src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp src/multimedia/audio/qaudiodeviceinfo_mac_p.cpp src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp src/multimedia/audio/qaudioformat.h src/multimedia/audio/qaudioinput.cpp src/multimedia/audio/qaudiooutput.cpp tests/auto/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp tests/auto/qaudioformat/tst_qaudioformat.cpp tests/auto/qaudioinput/tst_qaudioinput.cpp tests/auto/qaudiooutput/tst_qaudiooutput.cpp
| | * Revert "Added setChannelCount() to QAudioFormat."Kurt Korbatits2010-01-148-34/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f124538ef4840c3d24b4c7e9e7221adb52bdee2c. Conflicts: examples/multimedia/audioinput/audioinput.cpp examples/multimedia/audiooutput/audiooutput.cpp src/multimedia/audio/qaudio_mac.cpp src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp src/multimedia/audio/qaudiodeviceinfo_mac_p.cpp src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp src/multimedia/audio/qaudioformat.h src/multimedia/audio/qaudioinput.cpp src/multimedia/audio/qaudiooutput.cpp tests/auto/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp tests/auto/qaudioformat/tst_qaudioformat.cpp tests/auto/qaudioinput/tst_qaudioinput.cpp tests/auto/qaudiooutput/tst_qaudiooutput.cpp
* | | Add Audio and Video QML elements.Justin McPherson2010-01-288-2/+1737
| | |
* | | Add size, offset and fillMode properties to QGraphicsVideoItem.Justin McPherson2010-01-284-34/+185
| | | | | | | | | | | | From: Andrew den Exter committed 9fb251df to qtmobility/qtm-multimedia
* | | Add an audioAvailable property to QMediaPlayer.Justin McPherson2010-01-284-0/+47
| | | | | | | | | | | | from: Andrew den Exter committed 00373999 to qtmobility/qtm-multimedia
* | | Fixup license headers.Justin McPherson2010-01-282-2/+2
| | |
* | | Multimedia; fixes for linuxJustin McPherson2010-01-182-1/+4
| | |
* | | Move QtMobility multimedia framework into Qt.Justin McPherson2010-01-1565-1/+14570
|/ /
* | Merge branch 'master' of ../../qt/masterJustin McPherson2010-01-1551-411/+531
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: examples/multimedia/audioinput/audioinput.cpp src/multimedia/audio/qaudiodeviceinfo.cpp src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp src/multimedia/audio/qaudioformat.cpp src/multimedia/audio/qaudioinput_win32_p.cpp src/multimedia/audio/qaudiooutput_win32_p.cpp tests/auto/qaudioformat/tst_qaudioformat.cpp
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into ↵Qt Continuous Integration System2010-01-131-1/+1
| |\ | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team: Fix example in QAudioOutput/QAudioInput docs
| | * Fix example in QAudioOutput/QAudioInput docsKurt Korbatits2010-01-132-2/+2
| | | | | | | | | | | | | | | | | | Fixed error in doc comments. Reviewed-by:Justin McPherson
| * | Fix code exampleBernhard Rosenkraenzer2010-01-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | The example given for QAudioOutput doesn't actually compile: QAudioOutput::start takes a pointer to a QIODevice, but it's passed a QFile (not the pointer). Merge-request: 418 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2010-01-0816-69/+131
| |\ \ | | |/ | | | | | | | | | Conflicts: src/multimedia/audio/qaudioformat.cpp
| | * QAudioInput loses data on Maemo5/other linux platforms.Kurt Korbatits2010-01-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The alsa backend was calculating sample timer on resume using buffer_time instead of period_time. Task-number:QTBUG-7044 Reviewed-by:Justin McPherson
| | * Frequency to SampleRate and channels to channelCount.Kurt Korbatits2010-01-0616-60/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Added channelCount(), changed everything to use this instead of channels() in QAudioFormat class. -Added setSampleRate() and sampleRate(), changed everthing to use these instead of setFrequency() and frequency() in QAudioFormat class. -Added supportedSampleRates() and supportedChannelCounts(), changed everything to use these instead of supportedFrequencies() and supportedChannels() in QAudioDeviceInfo class. Reviewed-by:Justin McPherson
| | * Added setChannelCount() to QAudioFormat.Kurt Korbatits2010-01-068-9/+19
| | | | | | | | | | | | | | | | | | | | | Added setChannelCount() and updated docs/examples/tests to use it instead of setChannels(). Reviewed-by:Justin McPherson
| * | Doc: Added the QAudio namespace to the multimedia module documentation.David Boddie2010-01-071-0/+2
| | | | | | | | | | | | | | | | | | Also added it to the multimedia group. Reviewed-by: Trust Me
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2010-01-0750-50/+50
| |\ \
| | * | Update copyright year to 2010Jason McDonald2010-01-0650-50/+50
| | |/ | | | | | | | | | Reviewed-by: Trust Me
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2010-01-063-13/+38
| |\ \ | | |/
| | * The "audioinput" multimedia example locks up the audio input/outputKurt Korbatits2009-12-182-13/+33
| | | | | | | | | | | | | | | Task-number:QTBUG-5633 Reviewed-by:Justin McPherson
| | * no audiodevices found using QAudioDeviceInfo::availableDevices on UbuntuKurt Korbatits2009-12-181-0/+5
| | | | | | | | | | | | | | | Task-number:QTBUG-6866 Reviewed-by:Justin McPherson
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2009-12-184-4/+45
| |\ \ | | |/
| | * Fix up documentation examples for low-level audio.Kurt Korbatits2009-12-092-4/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | QTBUG-6548 QAudioOutput::start() crashes when the QIODevice is destructed Made documentation clearer. Task-number:QTBUG-6548 Reviewed-by:Justin McPherson
| | * Add -audio-backend and -no-audio-backend configure option.Kurt Korbatits2009-12-092-0/+19
| | | | | | | | | | | | | | | | | | Allow better control over audio backend used. Reviewed-by:Justin McPherson
| * | Doc: Made corrections to documentation style and clarified some points.David Boddie2009-12-181-7/+7
| |/ | | | | | | Reviewed-by: Trust Me
generated by cgit v0.12 at 2025-01-28 20:50:10 (GMT)