summaryrefslogtreecommitdiffstats
path: root/src/multimedia
Commit message (Collapse)AuthorAgeFilesLines
* doc: Fixed several qdoc errors.Martin Smith2010-03-091-2/+0
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-0810-467/+200
|\ | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Remove duration property from QSoundEffect. Fix effects.pri. Refactor QSoundEffect.
| * Remove duration property from QSoundEffect.Justin McPherson2010-03-088-44/+0
| | | | | | | | Reviewed-by: Dmytro Poplavskiy
| * Fix effects.pri.Justin McPherson2010-03-081-2/+2
| | | | | | | | Reviewed-by: Dmytro Poplavskiy
| * Refactor QSoundEffect.Justin McPherson2010-03-089-440/+217
| | | | | | | | Reviewed-by: Dmytro Poplavskiy
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Rohan McGovern2010-03-065-15/+59
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe examples/multimedia/audioinput/audioinput.cpp src/corelib/io/qfsfileengine.cpp src/gui/egl/qegl_wince.cpp src/gui/egl/qeglproperties.cpp src/gui/egl/qeglproperties_p.h src/gui/embedded/directfb.pri src/gui/kernel/qapplication_win.cpp src/gui/painting/qdrawutil.cpp src/opengl/qgl_p.h src/sql/drivers/odbc/qsql_odbc.cpp src/sql/drivers/odbc/qsql_odbc.h tests/auto/auto.pro tests/auto/qgl/tst_qgl.cpp translations/assistant_adp_ru.ts
| * Linux QAudioOutput playback stutteringKurt Korbatits2010-03-041-1/+43
| | | | | | | | | | | | | | | | Adjust buffer and period sizes if system cannot work with defaults (alsa). Task-number:QTBUG-8339 Reviewed-by:Derick Hawcroft
| * Fix namespace issues.Justin McPherson2010-03-024-13/+13
| | | | | | | | Reviewed-by: Kurt Korbatits
| * Fix Audio input on OSX 10.6.Justin McPherson2010-03-021-1/+3
| | | | | | | | | | Task-number: QTBUG-5741 Reviewed-by: Kurt Korbatits
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-053-4/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Fix spelling in enumeration. Fixed compiler warning QuickTime movie view output: emit the natural size changes
| * | Fix spelling in enumeration.Justin McPherson2010-03-053-4/+4
| | | | | | | | | | | | Reviewed-by: Dmytro Poplavskiy
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-052-8/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (72 commits) Doc: Enabled the context menu in the spreadsheet demo. Updated URLs. Doc: Applied suggestion for an improvement to the foreach documentation. Doc: Added a note about the lack of standard file copy/paste on X11. Doc: Fixed the row number for a widget in two parts of the tutorial. Doc: Fixed typos. Reduce compiling time of QScriptValue autotest suite on Windows. Optimize QScriptValue autotest generator. Set database write behavior to synchronous=OFF and increase page cache. doc: Fixed some qdoc errors. Setting ImhHiddenText for NoEcho line edits is not 100% correct, but still way better than fully visible text. Allow building documentation without all of Qt Added a documentation for the new enum value in gesture api. Remove the OBJECTS_DIR variable assignment from some projets in Qt. Fix compile qmake/MinGw: Link statically for Qt Creator to be able to detect it. Enable two fast path for blend_tiled_rgb565 Avoid QString reallocation for smallcaps fonts in Itemizer::generate() Make QLabel::text a reloadable property remove non wifi interfaces from being handled. ...
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-042-8/+8
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (63 commits) doc: Fixed some qdoc errors. Setting ImhHiddenText for NoEcho line edits is not 100% correct, but still way better than fully visible text. Allow building documentation without all of Qt Added a documentation for the new enum value in gesture api. Remove the OBJECTS_DIR variable assignment from some projets in Qt. Fix compile qmake/MinGw: Link statically for Qt Creator to be able to detect it. Enable two fast path for blend_tiled_rgb565 Avoid QString reallocation for smallcaps fonts in Itemizer::generate() Make QLabel::text a reloadable property remove non wifi interfaces from being handled. Disable auto-uppercasing and predictive text for password line edits. Avoid QString reallocation in QTextEngine::itemize() Remove the Qt 4.7 #if guards that were needed for 4.6 Always redraw the complete control when an input event comes in. Make sure not to crash if createStandardContextMenu() returns 0 (e.g. on Maemo5) Fix compilation: include QString in order to use QString. Fix compile Block the Maemo5 window attribute values from being assigned to something else on other platforms. be more verbose when warning about incompatible libraries ...
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-042-8/+8
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (53 commits) remove non wifi interfaces from being handled. Disable auto-uppercasing and predictive text for password line edits. Avoid QString reallocation in QTextEngine::itemize() Remove the Qt 4.7 #if guards that were needed for 4.6 Always redraw the complete control when an input event comes in. Make sure not to crash if createStandardContextMenu() returns 0 (e.g. on Maemo5) Fix compilation: include QString in order to use QString. Fix compile Block the Maemo5 window attribute values from being assigned to something else on other platforms. be more verbose when warning about incompatible libraries Introduce a setAttribute_internal helper Do not reset state too early on RMB click Fix for QRadioButtons and QCheckBoxes drawn incorrectly when a style sheet is set. Speed up creation of the pixmap cache key Optimize QGtkStyle fix qmake -project mode test qlist some more fix include Don't print a warning when passing an empty string to QColor Stabilize QWidget ...
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-032-8/+8
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (28 commits) Mac: Select Carbon when using the 10.4u SDK. fix connecting to an ID. make the value of QMAKE_QMAKE somewhat less magic Assistant: Don't warn for non-existing English to English translations. Assistant: Un-watch files at shutdown. Help system: Build search index with low priority. Fixed a regression in the syntax highlighter Add a template specialisation for QArgument when T is a reference. Always run syncqt if using a Git checkout. Added comment about usage of strncpy_s function in VC++ > 14.00 Compile. OS X 10.4 compile error; required casting int to GLint. QtDeclarative: Fix compiler warnings Implement alien widgets on Mac/Cocoa. QDeclarativeView: Add a Designer plugin. QDeclarativeView: Make usable in Designer minor optimization: don't mark contents as dirty if nothing was changed minor optimization: ignore invalid preeditAreaPosition/preeditAreaText remove unused code minor clean-ups and styling fixes ...
| | | | * \ \ Merge remote branch 'berlin/4.7' into 4.7Oswald Buddenhagen2010-03-021-4/+4
| | | | |\ \ \
| | | | | * | | compileHarald Fernengel2010-03-011-4/+4
| | | | | | | |
| | | | * | | | OS X 10.4 compile error; required casting int to GLint.Martin Smith2010-03-021-4/+4
| | | | | | | |
* | | | | | | | MouseRegion is dead. Long live MouseArea.Martin Jones2010-03-041-1/+1
|/ / / / / / /
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-041-10/+11
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Build fix for Sun Studio Finish to resolve merge conflict. Fixes QMenu to only have static POD members QScript: Test against QMetaType::QVariant instead of against the string Fixes tst_QScriptExtQObject::connectAndDisconnect Fix source compatibility of qRegisterMetaType Fix warnings on MSVC Updating documentation for how to build QWS with tslib sizeHint of checkbox/radiobutton without text is not correct Some cleanup of outdated src/3rdparty stuff Revert "Fixes crash when destroying a QGraphicsItem." Add config.test for multimedia/qml Fix QVariant autotest Fix compilation of Q_DECLARE_METATYPE(QVariant) by introducing QMetaType::QVariant fixed a memory leak when restoring a state in QMainWindow Make the sub-menu accessible via its shortcut even if it is the current remove a warning on windows and simplify a bit the code Add and use QGLContextPrivate::eglSurfaceForDevice() QMetaType: Now we can register typedefs.
| * | | | | | Finish to resolve merge conflict.Olivier Goffart2010-03-041-10/+11
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Move the change that were made in commit 9957e85e37345e946ecc67196d65fbca867a2001 from src/multimedia/qml/qml.pri to src/multimedia/effects/effects.pri
* | | | | | WaveDecoder; be more permissive in handling of wave file formats.Justin McPherson2010-03-042-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Dmytro Poplavskiy
* | | | | | Debug media player status and media state changes.Dmytro Poplavskiy2010-03-041-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disabled by default. Reviewed-by: Justin McPherson
* | | | | | Added QMediaPlayer::StreamPlayback flag to query/select backend capableDmytro Poplavskiy2010-03-044-14/+53
|/ / / / / | | | | | | | | | | | | | | | of playing from QIODevice based stream.
* | | | | Remove dependency on declarative from multimedia.Justin McPherson2010-03-0323-2856/+26
|/ / / / | | | | | | | | | | | | | | | | | | | | Move all declarative related classes into the multimedia declarative module. Reviewed-by: Andrew den Exter
* | | | Fixed compiler warnings when compiling multimedia module.Kurt Korbatits2010-03-033-7/+11
|/ / / | | | | | | | | | Reviewed-by:Andrew den Exter
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵Qt Continuous Integration System2010-02-274-0/+19
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Rebuild configure.exe Make the Direct Show media service compile with a Qt namespace. Make the Direct Show media service compile with mingw. QT7; Fix warnings. Qt namespace fixes. Fixed QTMoview object leak. QMediaContent: Add a convenience method to retrieve the QNetworkRequest. Use the monitor color space for video output. Test for the existance of the Windows Media SDK in configure. Try to start media playback on all load state changes. Remove all uses of __uuidof from the Direct Show media service. QT7; Add support for setting cookies when loading a movie.
| * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵Qt Continuous Integration System2010-02-264-0/+19
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Rebuild configure.exe Make the Direct Show media service compile with a Qt namespace. Make the Direct Show media service compile with mingw. QT7; Fix warnings. Qt namespace fixes. Fixed QTMoview object leak. QMediaContent: Add a convenience method to retrieve the QNetworkRequest. Use the monitor color space for video output. Test for the existance of the Windows Media SDK in configure. Try to start media playback on all load state changes. Remove all uses of __uuidof from the Direct Show media service. QT7; Add support for setting cookies when loading a movie.
| | * | Merge branch 'master' of git:qt/qt-multimedia-staging into qmlThiago Macieira2010-02-264-0/+19
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe
| | | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵Qt Continuous Integration System2010-02-264-0/+19
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Rebuild configure.exe Make the Direct Show media service compile with a Qt namespace. Make the Direct Show media service compile with mingw. QT7; Fix warnings. Qt namespace fixes. Fixed QTMoview object leak. QMediaContent: Add a convenience method to retrieve the QNetworkRequest. Use the monitor color space for video output. Test for the existance of the Windows Media SDK in configure. Try to start media playback on all load state changes. Remove all uses of __uuidof from the Direct Show media service. QT7; Add support for setting cookies when loading a movie.
| | | | * \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-stagingJustin McPherson2010-02-252-0/+10
| | | | |\ \
| | | | | * | QMediaContent: Add a convenience method to retrieve the QNetworkRequest.Justin McPherson2010-02-252-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Andrew den Exter
| | | | * | | Qt namespace fixes.Justin McPherson2010-02-252-0/+9
| | | | |/ / | | | | | | | | | | | | | | | | | | Reviewed-by: Dmytro Poplavskiy
* | | | | | Merge remote branch 'origin/master' into 4.7Thiago Macieira2010-02-2716-349/+332
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qmetatype.cpp src/declarative/graphicsitems/qdeclarativeevents.cpp src/declarative/graphicsitems/qdeclarativeflickable.cpp src/declarative/graphicsitems/qdeclarativegridview.cpp src/declarative/qml/qdeclarativescript.cpp src/declarative/util/qdeclarativeanimation.cpp src/declarative/util/qdeclarativebehavior.cpp src/declarative/util/qdeclarativeeasefollow.cpp src/declarative/util/qdeclarativefontloader.cpp src/declarative/util/qdeclarativelistmodel.cpp src/declarative/util/qdeclarativespringfollow.cpp src/declarative/util/qdeclarativestategroup.cpp src/declarative/util/qdeclarativesystempalette.cpp src/declarative/util/qdeclarativetimer.cpp src/declarative/util/qmlstateoperations.cpp src/multimedia/qml/qdeclarativeaudio.cpp src/multimedia/qml/qdeclarativevideo.cpp
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-266-230/+211
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public: (81 commits) Added addMMPRules for adding conditional MMP_RULES Allow overriding TARGET.EPOCHEAPSIZE with MMP_RULES Build break fix for commit d8465414e6fd543cfc20e732030dedd8d2bc685f. Fix for cetest. Speed up compilation of this test with MSVC. New benchmark for QDirIterator Backporting auto-test utility header from master. Fix a signed/unsigned comparison compiler warning Removed an export that shouldn't be exported. Reduced the code and memory footprint of the keymap. Enabled Qt key events to work also when native key code is missing. Cleaning of the patch to QTBUG-3168 Patch to QTBUG-3168 Crash in QGraphicsScenePrivate::setFocusItemHelper Pass the right arguments to QApplication in GraphicsView benchmark. Improvements to itemview keypad navigation in S60. Revert changes made in scroll_sys(). Fix SymbianMakefileGenerator::absolutizePath for clean builds Set the roleNames of proxy models to the roleNames of the source model. Add benchmarks for accessing meta-object properties via QScriptValue ...
| | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60axis2010-02-266-230/+211
| | |\ \ \ \ | | | |/ / / | | |/| | / | | | | |/ | | | |/| | | | | | Conflicts: qmake/generators/symbian/initprojectdeploy_symbian.cpp qmake/generators/symbian/symmake_abld.h
| | | * | win32 backend for low-level audio doesn't pass new unit testsKurt Korbatits2010-02-232-26/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New unit tests have identified issues with awin32 backend. These issues need to be resolved before new unit tests are added. * stateChanged() signal should only be emitted on change of state currently signals can be emitted multiple times. * for output data is being lost when input can be read from QIODevice but cannot be written to audio sub system. Task-number:QTBUG-8441 Reviewed-by:Dmytro Poplavskiy
| | | * | alsa backend for low-level audio doesn't pass new unit testsKurt Korbatits2010-02-232-118/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New unit tests have identified issues with alsa backend. These issues need to be resolved before new unit tests are added. * stateChanged() signal should only be emitted on change of state currently signals can be emitted multiple times. * elapsedUSecs() currently uses alsa to provide this value but this is not reliable enough and this time is reset when suspend/resuming. This is not correct operation. * for output data is being lost when input cant be read from QIODevice but cannot be written to audio sub system. Task-number:QTBUG-8440 Reviewed-by:Dmytro Poplavskiy
| | | * | Updates to low-level audio documentation.Kurt Korbatits2010-02-232-86/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Detail state changes and error states in QAudioInput and QAudioOutput documentation. Reviewed-by: Derick Hawcroft
| * | | | Merge remote branch 'qt/master' into qml-masterQt Continuous Integration System2010-02-2622-8/+31
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/cppcodeparser.cpp tools/qdoc3/htmlgenerator.cpp tools/qdoc3/htmlgenerator.h tools/qdoc3/node.cpp
| * | | | Introduced QDeclarativeExtensionPlugin::registerTypes(uri).Roberto Raggi2010-02-252-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now, you have to reimplement registerTypes(uri) to expose native QML types, and initializeEngine(engine,uri) to add instances to the QML engine's root context.
| * | | | Fix up some rename confusion.Justin McPherson2010-02-253-133/+1
| | | | |
| * | | | Make QML_REGISTER...TYPE functions unnecessary (still exist for now).Warwick Allison2010-02-251-4/+4
| | | | | | | | | | | | | | | | | | | | Fix multimedia plugin.
| * | | | Fix include of renamed headerJustin McPherson2010-02-252-2/+2
| | | | |
| * | | | Change Multimedia declarative module in line with recent commits.Justin McPherson2010-02-252-7/+12
| | | | |
| * | | | Merge branch 'master' of ../../qt/masterJustin McPherson2010-02-2411-6/+201
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/multimedia/qml/qml.pri src/multimedia/qml/qmlaudio_p.h src/multimedia/qml/qmlgraphicsvideo_p.h src/multimedia/qml/qmlmediabase_p.h src/plugins/qmlmodules/multimedia/multimedia.cpp
| * | | | Change class prefix to from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX to ↵Warwick Allison2010-02-2410-119/+119
| | | | | | | | | | | | | | | | | | | | QDeclarativeXXX.
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtMartin Jones2010-02-2412-26/+39
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/advtutorial1.qdoc src/declarative/qml/qmlmoduleplugin.cpp src/declarative/util/qmlxmllistmodel.cpp
| * | | | | Get rid of QmlModulePlugin.Roberto Raggi2010-02-232-5/+9
| | | | | |
* | | | | | doc: Added \since 4.7 to several \qmlclass elements.Martin Smith2010-02-263-0/+3
| |_|_|/ / |/| | | |