summaryrefslogtreecommitdiffstats
path: root/src/multimedia
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Blackberry: Add a page with platform-specific documentationThomas McGuire2012-11-072-0/+83
| | | | | | | | | | | | | | | | | | | | | Change-Id: Ic03c59523648ee25c419ec5d80122da9a717aa2d Reviewed-by: Bernd Weimer <bweimer@rim.com> Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | | Enable the "#include <QMultimedia>" camel-case headerSze Howe Koh2012-11-0626-30/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename qtmedianamespace.h/cpp -> qmultimedia.h/cpp, and have sync.profile generate the camel-case header during compilation. Part of the Header Consistency Project (http://lists.qt-project.org/pipermail/development/2012-October/007570.html) Change-Id: Iade9ee6538970b4b9935f169eb2d9a0ea6949a95 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | | Rename namespace QtMultimedia -> QMultimediaSze Howe Koh2012-11-0628-124/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Main code, examples, tests and docs updated. Method: 1. Mass find+replace "QtMultimedia::" -> "QMultimedia::" 2. Hand-modified declaration in qtmedianamespace.h/cpp For consistency (with minimal disruption), namespaces with a "Qt" prefix will be renamed. Part of the Header Consistency Project (http://lists.qt-project.org/pipermail/development/2012-October/007570.html) Change-Id: I1fbc43a1aa91d996aa61869fcd8d05186bf7cf6d Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | | Enable the "#include <QMediaMetaData>" camel-case headerSze Howe Koh2012-11-065-538/+634
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the QMediaMetaData namespace into new files, and have sync.profile generate the camel-case header during compilation. For now, the new header (qmediametadata.h) is included whereever the old one appears (qtmedianamespace.h), but an audit will be done later to make explicit #includes only where necessary. NOTE: Git may think that a rename has occurred. Part of the Header Consistency Project (http://lists.qt-project.org/pipermail/development/2012-October/007570.html) Change-Id: I63705722a5e175628d56128888a94ae4c20879f2 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | | Rename namespace QtMultimedia::MetaData -> QMediaMetaDataSze Howe Koh2012-11-069-20/+20
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Main code, examples, tests and docs updated. Method: 1. Remove unused forward-declarations, "class QMediaMetaData" 2. Mass find+replace "QtMultimedia::MetaData" -> "QMediaMetaData" 3. Un-nest from the QtMultimedia namespace in qtmedianamespace.h For consistency (with minimal disruption), namespaces with a "Qt" prefix will be renamed. Also, Qt guidelines don't include nested namespaces (http://lists.qt-project.org/pipermail/development/2012-October/006756.html) Part of the Header Consistency Project (http://lists.qt-project.org/pipermail/development/2012-October/007570.html) Change-Id: I40e59c1cf58c1792725e735e9285c51bc5f226b1 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | Remove stale QT_MODULE() usage casesSergio Ahumada2012-10-25110-220/+0
| | | | | | | | | | | | | | As of Qt5, this macro is defined to be empty; simply get rid of these leftovers. Change-Id: Id24056c0afd013904b1e098dc49e502038fd77a4 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Doc: Removed dependency on qtmultimedia.cssVenugopal Shivashankar2012-10-191-5/+0
| | | | | | | | | | | | | | | | All module documentation must use the global HTML template and style sheet in qtbase\doc\global. Change-Id: Ia7db9373f2291052924f433223a128ef4c2c3df8 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | QtMultimedia: Fix compiler warnings.Friedemann Kleint2012-10-172-2/+3
| | | | | | | | | | | | Change-Id: I5783b1f6dce645fb473e7d3da0911dbb40e3951b Reviewed-by: Jonathan Liu <net147@gmail.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Fix compilation with stock MinGW.Friedemann Kleint2012-10-173-8/+27
|/ | | | | | | | | | Use qt_windows.h, provide interfaces and UIDs missing in stock MinGW. Task-number: QTBUG-23829 Change-Id: I79ed902bb7636c751df7607f6059a7de237acb31 Reviewed-by: Jonathan Liu <net147@gmail.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Update docs after modularization of docsTor Arne Vestbø2012-10-113-48/+5
| | | | | | | | | | | The global files now live in qtbase only, and are made available to the other modules via the $QT_INSTALL_DOCS variable. We now use QMAKE_DOCS to trigger doc generation instead of rolling our own rules for qdoc. Change-Id: I900029d71c305a1f269cddeeb0e05c524d933834 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Export QAudioHelperInternal symbolsKevin Ottens2012-10-081-1/+1
| | | | | | | They can be useful to some of the audio plugins. Change-Id: I10856c104770ed57c72b674829e3922b5067a822 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* Don't add the beginning of the file to the end of the last periodKevin Ottens2012-10-081-2/+3
| | | | | | | | | | If we're in the last loop, it is not necessary to provide a full period on read. Just provide the remaining of the data and hit the end of the stream by returning less than requested, otherwise we potentially generate some garbage noise. Change-Id: I9d3a632ddc0c3289957c9f876d5dbe2999b50ebd Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* Doc: Added Qt Multimedia to 'qmlmodules' groupJerome Pasion2012-10-031-1/+2
| | | | | | | | | -'qmlmodules' contains Qt's QML API -made brief description consistent with other QML API Change-Id: I30473048b06e2a4e13deb57c394a12c51a11693b Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: Organized related information in subsectionsVenugopal Shivashankar2012-09-281-46/+40
| | | | | Change-Id: Iabe4a032d998003b659e298c3d602d68d83de8b1 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Add missing QT_{BEGIN,END}_NAMESPACESergio Ahumada2012-09-272-0/+4
| | | | | Change-Id: I85bbd4f711191c14d6f58f098fced7336c66308f Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* Doc: Moved example documentation and imagesVenugopal Shivashankar2012-09-2629-1062/+0
| | | | | | | | | Changed to adhere to the new documentation structure outlined here: http://qt-project.org/wiki/Qt_Documentation_Structure Change-Id: I634e086c7d55abfac3680144cbbe97059fcbea4f Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-24271-6196/+6196
| | | | | | | | | 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>
* Doc: Updated landing page to be consistent with other module landing pagesVenugopal Shivashankar2012-09-133-29/+70
| | | | | Change-Id: Ib230a7c01f2573b08f0a505fb0ada80d01757ba7 Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
* Doc: Removed the unnecessary \annotatedlist command to avoid duplicationVenugopal Shivashankar2012-09-121-3/+7
| | | | | | Change-Id: I5b1b42ed2b94735ff758e0e93e8df8eb5ab73a0f Reviewed-by: Martin Smith <martin.smith@nokia.com> Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
* remove usage of QT_MAKEDLL from QtMultimediaJoerg Bornemann2012-09-121-18/+2
| | | | | Change-Id: Ie427497c999c6d8d666b21cc5cc079036c505cc6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* centralize load(qt_build_config)s in .qmake.confOswald Buddenhagen2012-09-121-2/+0
| | | | | Change-Id: Ie07a32729ec8679f799613f8f6ccdd9c1b6bf7c9 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Doc: Added an index page and separated \qmlproperty and \property documentationVenugopal Shivashankar2012-08-295-8/+104
| | | | | | Change-Id: I29bcfd0a31c781deb4cce2d6bcb2afca32191ae6 Reviewed-by: Geir Vattekar <geir.vattekar@nokia.com> Reviewed-by: Martin Smith <martin.smith@nokia.com>
* follow rename of qt_module_config.prf to qt_module.prfOswald Buddenhagen2012-08-111-1/+1
| | | | | Change-Id: I6fd02095b9c75952c689b2c55aec9c71b39aadd3 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Fix some failing QAudioInput integration tests on OSX.Michael Goddard2012-08-034-14/+73
| | | | | | | | | | | | This also meant implementing software volume support, and since this is the last backend to do so, make that interface pure virtual again. In some cases the test needed tweaks. Change-Id: Ie429863f187b43802cdd4f16d841929e0cb0e729 Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Added check to qsound and qsoundeffect unit tests for audio supportKurt Korbatits2012-08-031-0/+5
| | | | | | | | - skip tests if QSoundEffect::supportedMimeTypes() returns empty list Change-Id: I0f8d6f854c46b74f8518c4d969bd31ea167d20b2 Reviewed-by: Ling Hu <ling.hu@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Add a missing include for Q_MULTIMEDIA_EXPORTThiago Macieira2012-08-022-0/+2
| | | | | | | The macro is gone from qglobal.h. Change-Id: I41c66f61f47ec9e824c3637c7748796df2309d66 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Fix a few header style violations.Michael Goddard2012-07-305-3/+7
| | | | | | | | Missing Q_MODULE or using moc keywords. Change-Id: I3cb21799488c6f57c45d8e32862a49fadd083b99 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Doc: Changed \qmlclass to \qmltype and added \instantiatesJerome Pasion2012-07-271-1/+2
| | | | | | | | | -New qdoc command \qmltype replaces \qmlclass -\instantiates <C++ class> for determining if the QML type has a C++ implementation Change-Id: I83d1e2c3f376f96ea51afedadf88c3cf478e33d8 Reviewed-by: Martin Smith <martin.smith@nokia.com>
* Replace QSoundEffect backend using qmedia with qaudiooutput implementationKurt Korbatits2012-07-265-293/+494
| | | | | | | | | - Use backend built on QAudioOutput - Fixed unit test so backend will pass Change-Id: I2f2a7d8bf382127c5a5c333d6e36c79169754b4e Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com>
* Fixed QDoc errors related to snippets and quotefromfile commandsVenugopal Shivashankar2012-07-266-10/+11
| | | | | Change-Id: I9dd6381eb95dcbd9aa5cc8f596d87cf55eee7427 Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
* Volume control for QAudioInput windows backend.Lev Zelenskiy2012-07-262-0/+115
| | | | | Change-Id: I1245a38c68254fc48373a856dc44e8ad8142636e Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Added check to alsa backend for QAudioOutputKurt Korbatits2012-07-261-0/+5
| | | | | | | | - Was asserting when stop() called when in IdleState Change-Id: Ib8a5bd149c0b9c700c709520cf8ffdd237e08694 Reviewed-by: Ling Hu <ling.hu@nokia.com> Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com>
* Moved doc under src to fall in-line with the new modular structureVenugopal Shivashankar2012-07-2563-0/+4564
| | | | | Change-Id: Ia2933baa1f0eaf82b5c2a626cb3661ee087049e3 Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
* Replaced endpoint control with audio input and output controlsDmytro Poplavskiy2012-07-248-185/+406
| | | | | Change-Id: I981aabe39d106ced4ee1240db9e5b653c6fa5e91 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fixed docs for QAudioInput::bufferSize and setBufferSizeAli Akhtarzada2012-07-241-2/+2
| | | | | | | | | | Change milliseconds to bytes Task-number: QTBUG-26600 Change-Id: I861ae9c35ddc52d58ed95a2148f72d6476f35522 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Added volume property to QMediaRecorderDmytro Poplavskiy2012-07-194-0/+50
| | | | | Change-Id: I19f727107651c9f640ca1c010a3764f05aef8820 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Added volume control for QAudioOutput & QAudioInput (alsa)Kurt Korbatits2012-07-1710-10/+252
| | | | | | | | | | | | QTBUG-25454 - Added update to docs on volume control. - Added internal volume adjustment for alsa implementation. - Enabled float sample option in QAudioDeviceInfo (alsa). Change-Id: I6b89fc8beb457d71be9ad71b538c86a008570f07 Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com>
* Fix some QAudioInput errors on OSX.Michael Goddard2012-07-161-10/+36
| | | | | | | | Default buffer size wasn't always calculated correctly, and the timer used in push mode was sometimes incorrect. Change-Id: Ic31b9d16e16e4c25a5ebfc302590829e179a96bf Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Fixed error in qaudioinput alsa backend for invalid format.Kurt Korbatits2012-07-161-2/+2
| | | | | | | | QTBUG-26523 - Was QAudioOutput. Changed to QAudioInput. Change-Id: I04f7d38af5cb67c420adef188b81b237b6e06b97 Reviewed-by: Daniel Kovacic <daniel.kovacic@nokia.com>
* Update the export macros in qtmultimedia.gitThiago Macieira2012-07-111-18/+2
| | | | | | | Use the new, simpler QT_STATIC macro. Change-Id: Ia3271a437ed76f54971444f6e73e54dbc416d483 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Clarify API/docs by introducing the audio "frame", and add helpers.Michael Goddard2012-07-115-71/+206
| | | | | | | | | | | The frame is the interleaved set of one sample for each channel. Add some docs and some methods that make working with samples a bit more convenient. Adjusted QAudioBuffer to use these helper functions and terminology. Change-Id: I96db48e659561972d6de2aa19893d29f9a828cd3 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Update ALSA device enumeration to return all devicesMithra Pattison2012-07-101-12/+5
| | | | | | | | | | Previously, if a device was marked as "Default Audio Device" then only this device would be returned during device enumeration. Now it returns all devices, with the default device placed first. Task-number: QTBUG-22103 Change-Id: I1705415bf6b58ff046c4d2812107b46b76500001 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Delete obsolete class methods and update related codeMithra Pattison2012-07-1017-175/+108
| | | | | | | | Delete obsolete methods from QAudioFormat and QAudioDeviceInfo and update code that relied on the obsolete methods. Change-Id: I007e36375a45399b1d5a289341bc5d5a05dc68cc Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fix internal compiler error of MSVC2012.Friedemann Kleint2012-07-041-5/+6
| | | | | | | Default to QLatin1String. Change-Id: I20b74f77ee0828a1c2b1337a3ab2e0012c8df06e Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Rename availabilityError to availability.Michael Goddard2012-06-2919-67/+72
| | | | | | | It's perhaps clearer in the usual case. Change-Id: Id3cef82ac83f8c9b538b3315281664ce1c6a2b96 Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Rename a few controls.Michael Goddard2012-06-2919-155/+155
| | | | | | | | | | 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>
* Allow frequences up to 96000 in QAudioInput win32 backend.Lev Zelenskiy2012-06-271-1/+1
| | | | | | | QTBUG-26102 Change-Id: I1c594f7df4aea2292045e1e96f58926d97bcfd82 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Clean buffers before closing the input device.Lev Zelenskiy2012-06-271-6/+7
| | | | | | | | | Input device handle is invalid after waveInClose() QTBUG-24119 Change-Id: I8276e56766684efd26b78dc019ff871ebac28408 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Added support for big endian data to QAudioOutput win32 backend.Lev Zelenskiy2012-06-261-0/+25
| | | | | | | | Convert data from big endian to little endian. QTBUG-19881 Change-Id: If62a69b79c01d66536010b3326a86df8ca5f83b0 Reviewed-by: Ling Hu <ling.hu@nokia.com>
* build system cleanupsOswald Buddenhagen2012-06-251-10/+1
| | | | | | | | | | | | | | | | | - 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-19 13:49:56 +0000