summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* fix bogus conditionalOswald Buddenhagen2012-06-251-1/+1
| | | | | | | | | | | 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>
* switch to new-style configure testsOswald Buddenhagen2012-06-258-17/+17
| | | | | Change-Id: Ib56d0cb24065c1f990aee5d7f41bfedfe75332a1 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* auto-generate module prisOswald Buddenhagen2012-06-252-4/+3
| | | | | Change-Id: I19285dfef7294e813ec241a8f6f00a804d56df49 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Add default initialisation to various multimedia classesMithra Pattison2012-06-254-12/+27
| | | | | Change-Id: I902de05984fdae152e2678e4cf2d401a0b670703 Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
* Fixed some crash with WMF backendLing Hu2012-06-256-25/+51
| | | | | Change-Id: I721ba049e2ecafff53ee70d5b930fb52c15fbe09 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fix namespace compilation.Toby Tomkins2012-06-2511-12/+25
| | | | | | Change-Id: Id8d71a48df20da16647834e8f9732012f26f928f Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Add the QtBase/lib directory as a library path, not just frameworks.Michael Goddard2012-06-251-1/+1
| | | | | | | | 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>
* Fix QAudioOutput volume on OSX.Michael Goddard2012-06-202-0/+29
| | | | | | Change-Id: I142ca638d3dc0839f7c5b103f03edac6715a0bb6 Reviewed-by: Ling Hu <ling.hu@nokia.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Remove the USE_COCOA #ifdef, it's always defined now.Michael Goddard2012-06-201-2/+0
| | | | | Change-Id: If3528cdfda647fa3cfba3c310bc9816b8b1e0344 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Enabled wmf plugin on Windows againLing Hu2012-06-206-12/+13
| | | | | Change-Id: Ia1fe3ef6ec8f70888c7beb390678935ad9995a90 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* fix volume handling on WindowsMaurice Kalinowski2012-06-202-0/+25
| | | | | | | | | | | 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>
* QIODevice* is used, but QIODevice was never declaredThiago Macieira2012-06-191-1/+1
| | | | | | | | 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>
* Fix a number of other qdoc issues.Michael Goddard2012-06-1531-421/+565
| | | | | | | | | | | | | | * 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>
* Tweak the controls documentation.Michael Goddard2012-06-1538-37/+37
| | | | | | | | 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>
* Replace a writable position() property with a seek() method.Michael Goddard2012-06-142-23/+50
| | | | | | | | 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>
* Updating brief layout of QML typesAngus Cummings2012-06-1419-21/+21
| | | | | | Change-Id: I1dcd7bf7427f25bb9e19cbe3c7e17808b0fc9708 Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Peter Yard <peter.yard@nokia.com>
* Fix build on Windows with new qdatetime.h that doesn't redefine min/maxSimon Hausmann2012-06-133-1/+5
| | | | | | | | | | 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>
* Reduce the usage of QAbstractVideoBufferPrivate.Michael Goddard2012-06-133-13/+6
| | | | | | | | 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>
* Clarify documentation about QAudioDecoder::read and blocking.Michael Goddard2012-06-132-9/+13
| | | | | | | | | 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>
* Renaming StopppedState to StoppedStateAngus Cummings2012-06-135-10/+10
| | | | | Change-Id: Ib23e9795960f40b46c0b2441ec03e8b1812033e5 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Enable auto resume of playback for gstreamer mediaplayerLing Hu2012-06-122-31/+44
| | | | | | | | | 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>
* Adding qdoc workaround to all control classesAngus Cummings2012-06-1227-3/+61
| | | | | Change-Id: Ic8d8aa6f9824954a7745ddaa2639054dea8bf1ba Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Remove the legacy QML API.Michael Goddard2012-06-0811-2189/+322
| | | | | | | | 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>
* Fixing some doc errors for overviewAngus Cummings2012-06-083-2/+11
| | | | | Change-Id: Ic502abf295d402678bb28e68bfacc76ae05ee8ec Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fix compilation without QtWidgets and QtOpenGL on MacKent Hansen2012-06-074-6/+13
| | | | | Change-Id: I3cff7e41d27955e37bc8207e4820fdc21ce75f7b Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Added QAbstractVideoBuffer::release virtual methodDmytro Poplavskiy2012-06-073-1/+16
| | | | | | | | | | | | | | It's useful when the buffer pool stores QAbstractVideoBuffer instances instead of underlying system buffers and allows to avoid reallocation of QAbstractVideoBuffer instances. The default implementation deletes the buffer, so this change is source compatible. Change-Id: I7dadd7dac529748b5eb33e5aa7c2d0578b8b1634 Reviewed-by: Lev Zelenskiy <lev.zelenskiy@nokia.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Removed encoding options from Audio/Video encoding controlsDmytro Poplavskiy2012-06-0710-116/+0
| | | | | | | | | | | They are replaced with encoding options from QAudio/Video/ImageEncoderSettings. This also allows to specify options without requesting controls. Change-Id: I507e68cdb8cb46325689804d27c6d0561cada50b Reviewed-by: Lev Zelenskiy <lev.zelenskiy@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* A number of documentation fixes.Michael Goddard2012-06-079-29/+36
| | | | | | | | | | | | | | * Remove references to private QMediaServiceProvider class and point new backend writers to irc/mailing lists * Wrong or missing parameter names * Fix a few links * Correct a few property data types * Various other things to keep qdoc happier Change-Id: I5c8800d65c00f0783541afef35990bd3918acab7 Reviewed-by: Angus Cummings <angus.cummings@nokia.com> Reviewed-by: Ling Hu <ling.hu@nokia.com> Reviewed-by: Daniel Kovacic <daniel.kovacic@nokia.com>
* Clarify the metadata functionality of QMediaPlayer.Michael Goddard2012-06-072-11/+24
| | | | | | | | | | | By linking to QMediaObject functions. Also clean that up a bit so it's a bit more useful for people looking for higher level functionality. Change-Id: Ie452122c4d55f88326a7b71c5882dfe38f489791 Reviewed-by: Angus Cummings <angus.cummings@nokia.com> Reviewed-by: Ling Hu <ling.hu@nokia.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> Reviewed-by: Daniel Kovacic <daniel.kovacic@nokia.com>
* QVideoWindowControl moved to QtMultimedia, fix docs.Michael Goddard2012-06-071-2/+3
| | | | | Change-Id: I870e5997822b60d8fba07e28ff907cbb3fef6036 Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
* Use QPointer instead of QWeakPointer to track QObjects.Stephen Kelly2012-06-075-13/+17
| | | | | | | The latter is to be deprecated. Change-Id: I01998be880feba0819a9bc51f9bec48fd4601789 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Remove the last remainders of the old plugin systemLars Knoll2012-06-057-27/+18
| | | | | | | | | | | 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>
* Call the base QQuickItem geometryChanged function in our override.Michael Goddard2012-06-051-0/+2
| | | | | | | | Otherwise you get strange errors like the width/height of a VideoOutput element are 0. Change-Id: Ib123112b513f5ed2f0ce24da6dbfe00e20551d74 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Avoid string-based, dynamic lookup of signalsKent Hansen2012-06-052-24/+24
| | | | | | | | | | | | | | Qt5 has a new function QMetaMethod::fromSignal() for obtaining the meta-method that corresponds to a particular signal (member function). This also avoids calling the virtual metaObject() function to resolve the meta-method every time the signal is emitted; it is known at compile-time which class the signals are defined in, so it's safe to retain the meta-methods across calls. Change-Id: I47328ec2dfc335c570fb18bcd304a2ee405bfd6e Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* add multimediawidgets before gsttools to SUBDIRSOswald Buddenhagen2012-06-011-7/+7
| | | | | | | | the build dependency does not override the qmake processing order, but this will become important soon. Change-Id: I8ef88285f9c12829080e6f5e1cc0349dd59f83b8 Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
* ensure important docs are built by the automated publisherAngus Cummings2012-06-014-1/+9
| | | | | | | | this workaround makes sure that qdoc can find the \class and \namespace declarations. Change-Id: I950e6fbc10064f438d7f282ff20783acdf20de27 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fixing doc errors in MediaPlayer and CameraFlashAngus Cummings2012-06-012-77/+678
| | | | | | | | | properties were not showing up for either type. There were namespace errors in flash, and mediaplayer docs needed to be copied from audio. Change-Id: I53fa721ec9e0cfa1aee3586c7e3eb608b9a1b465 Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
* Add gstreamer.json to OTHER_FILESJohannes Zellner2012-06-011-0/+2
| | | | | Change-Id: Ic063a2bd96c9445b6d1af049df6cf3e33572d547 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Fixed not initialized QVideoFrame mappedCount memberDmytro Poplavskiy2012-05-301-0/+1
| | | | | Change-Id: Ic0b915df120222b0bb440698c010f0e83ccce8c3 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Release string after gst_cap_to_string is called.bigbearzhu2012-05-281-1/+4
| | | | | Change-Id: I4bf8086e4413b4acb851d67919ac1014705bab03 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Made pulsedevices high priority than oss for recordingLing Hu2012-05-251-1/+1
| | | | | | Change-Id: Iae607d3ee0bcaa21142e264edb32ed0e631a4a03 Reviewed-by: Mithra Pattison <mithra.pattison@nokia.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Replaced camera viewfinder resolution control with settings controlDmytro Poplavskiy2012-05-224-122/+158
| | | | | | | | | | | It allows to specify a number of camera fiewfinder parameters including frame rate, resolution and pixel format. It also allows to extend the list of parameters without breaking source or binary compatibility. Change-Id: Ibea85a968ab7ee7b8d1ae34c7fcbac8f5586f53f Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
* Fix compilation when appsrc is not available.Johannes Zellner2012-05-211-0/+4
| | | | | Change-Id: I96c9aad94b5eb0734854bc7cf0126cad6841c0cd Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
* Added custom parameters to Audio/Video/ImageEncodingSettingsDmytro Poplavskiy2012-05-182-6/+185
| | | | | | | This allows to specify more advanced and system/codec specific settings Change-Id: Ia0a2e94eaf56df285a219018e0beab895a2e7c2a Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Added missing QDeclarativeCamera::CaptureViewfinder enum valueDmytro Poplavskiy2012-05-182-0/+4
| | | | | Change-Id: I75844e3a943a76649d1b51f0c845a4bf8b200a8e Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Fixed typo in QCamera::Status documentationDmytro Poplavskiy2012-05-181-1/+1
| | | | | Change-Id: I8ee9db0e91eceaa20a46713370a9cbd03ead6444 Reviewed-by: Ling Hu <ling.hu@nokia.com>
* QML VideoOutput: don't keep video frames for more than necessaryDmytro Poplavskiy2012-05-162-17/+31
| | | | | | | | The frame can be released as soon as it pushed to video node. Change-Id: Ib2621cc2a001629e722bf15b6e1ca09323170870 Reviewed-by: Mithra Pattison <mithra.pattison@nokia.com> Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Expose camera status to QML Camera elementDmytro Poplavskiy2012-05-162-0/+75
| | | | | | | | It's exposed as Camera.cameraStatus property. Change-Id: Id3b477266d3a666b7a2a61cd4579f0e3f873d3b8 Reviewed-by: Mithra Pattison <mithra.pattison@nokia.com> Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Very minor C++ doc changesAngus Cummings2012-05-167-18/+18
| | | | | | | | | Reordering some enum's so values are listed ascending Replace 'The' with 'the' in some briefs Change-Id: Ibc5042389687598ddaaf11e72acaa688b85fd4cf Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Minor doc fixes for QMLAngus Cummings2012-05-1623-213/+285
| | | | | | | | | | renaming QML element to QML type removing some \fn tags that were making the docs not build some rewording some new signal docs Change-Id: I9b350dad1780276959aef4105e53b91082a6083e Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-27 16:34:17 +0000