summaryrefslogtreecommitdiffstats
path: root/src/multimedia
Commit message (Collapse)AuthorAgeFilesLines
* Replace AspectRatioMode enum from QVideoWidget with Qt::AspectRatioMode.Andrew den Exter2010-03-187-65/+79
| | | | | Task-number: QTBUG-9118 Reviewed-by: Dmytro Poplavskiy
* Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-173-30/+52
|\ | | | | | | | | | | Conflicts: src/s60installs/bwins/QtCoreu.def src/s60installs/eabi/QtCoreu.def
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-163-30/+52
| |\ | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Use AudioConverter when not preferred format. Handle values passed to setNotifyInterval more robustly. Make sure to check for a valid audioformat before open.
| | * Use AudioConverter when not preferred format.Justin McPherson2010-03-162-26/+34
| | | | | | | | | | | | Reviewed-by:Dmytro Poplavskiy
| | * Handle values passed to setNotifyInterval more robustly.Justin McPherson2010-03-162-2/+16
| | | | | | | | | | | | Reviewed-by:Dmytro Poplavskiy
| | * Make sure to check for a valid audioformat before open.Justin McPherson2010-03-162-2/+2
| | | | | | | | | | | | Reviewed-by:Dmytro Poplavskiy
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-151-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix a crash in QSortFilterProxyModel when deleting a row small cleanup regarding delayed layout in itemviews Fixed wasted space in the texture cache. Get debug code compiling since function signature changes --warn; That file was forgotten when adding SSE support under mingw
| * | | That file was forgotten when adding SSE support under mingwThierry Bastian2010-03-151-1/+1
| | | |
* | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-1515-9/+2603
|\ \ \ \ | |/ / / |/| / / | |/ / | | | Conflicts: src/gui/styles/qs60style_s60.cpp
| * | Moved Symbian audio backend into QtMultimedia.dllGareth Stockwell2010-03-1210-6/+2571
| |/ | | | | | | | | | | | | | | | | Changed backend from being a plugin, to being statically compiled into QtMultimedia.dll. This is to achieve consistency with the backends for other plugins, and to allow the plugin API to be modified. Task-number: QTBUG-8994 Reviewed-by: trustme
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6Kurt Korbatits2010-03-112-1/+2
| |\
| | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵Justin McPherson2010-03-111-1/+5
| | |\ | | | | | | | | | | | | into 4.6
| | * | Ensure audio converter member is initialized.Justin McPherson2010-03-111-0/+1
| | | | | | | | | | | | | | | | Reviewed-by:Dmytro Poplavskiy
| | * | Documentation fix.Justin McPherson2010-03-111-1/+1
| | | | | | | | | | | | | | | | Reviewed-by:Dmytro Poplavskiy
| * | | QAudioInput sometimes not writing to QIODeviceKurt Korbatits2010-03-111-0/+20
| | |/ | |/| | | | | | | | | | | | | | | | Handle error recovery better. Task-number:QTBUG-8893 Reviewed-by:Derick Hawcroft
| * | QAudioInput::processedUSecs() incorrectKurt Korbatits2010-03-111-1/+5
| |/ | | | | | | | | | | | | | | Bug introduced by change 04532ba052559b265b1bc85dc143d8aeeb02149f Was calculating time assuming totalTimeValue was in frames but it is stored as bytes in alsa input case. Reviewed-by:Dmytro Poplavskiy
| * SIGSEGV after QAudioOutput closed.Kurt Korbatits2010-03-101-0/+3
| | | | | | | | | | Task-number:QTBUG-8755 Reviewed-by:Derick Hawcroft
| * Fixed deadlock introduced by changeKurt Korbatits2010-03-101-1/+2
| | | | | | | | | | | | | | 83e73a69d5a1c6b94c5c83f91141f35d65d27f36. alsa callback was deadlocking with QEventDispatcherGlib. Reviewed-by:Dmytro Poplavskiy
| * Fixed invokeMethod in alsa implementation.Kurt Korbatits2010-03-101-1/+1
| | | | | | | | Reviewed-by:Dmytro Poplavskiy
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-121-4/+10
|\ \ | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: QPainterVideoSurface: assume yuv 420p and YV12 lines are 4 byte aligned. Delayed initialization of gstreamer video widget.
| * | QPainterVideoSurface: assume yuv 420p and YV12 lines are 4 byte aligned.Dmytro Poplavskiy2010-03-121-4/+10
| | | | | | | | | | | | Reviewed-by: Andrew den Exter
* | | make it possible to use sse2 with mingwThierry Bastian2010-03-113-3/+3
| | | | | | | | | | | | | | | | | | | | | All the windows callback functions need an attribute to force the alignment of the arg pointer. Reviewed-by: Benjamin Poulain
* | | Merge branch '4.7-cutoff' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-101-2/+0
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7-cutoff' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (83 commits) Don't wait forever when scanning for wifi networks on win32 fails. Revert 12b6987031be9faee3886d7623888feb4e1762af Changed TEST_COMPILER from CC to CXX in configure script. doc: Fixed several qdoc errors. Carbon: Native filedialog does not apply filters on app-bundles Cocoa: Native filedialog does not apply filters on app-bundles Improve performance of QTimer::singleShot Add a benchmark comparing single shot timer with invokeMethod use Qt's private mac functions, reduce code redundancy Assistant: Fix compile warning for empty header. Doc: mark QEasingCurve support functions as new in 4.7. Modify the XML test suite not to use non-characters. Autotest: Fix failing QTextCodec tests Doc: mark methods as internal (as they were in previous releases) Doc: add image for Qt Quick to "What's New" page. qdoc: Clear a static multimap after each qdocconf file. qdoc: Added some debug output to track down a crash Fixed mouse wheel handling in scrollareas. Added two missing keys for X11 Carbon: usage of menu bars can cause exceptions to be thrown ...
| * | doc: Fixed several qdoc errors.Martin Smith2010-03-091-2/+0
| | |
* | | Updates to qsoundeffect backends.Kurt Korbatits2010-03-094-34/+61
|/ / | | | | | | | | | | | | | | | | | | | | - pulseaudio backend: moved write code out of callback to reduce upload failure (30%->10%) - pulseaudio backend: add recovery code to retry on failed upload - changed delete to deleteLater, unit test was craching on cleanup - qmedia backend: removed connect to mutedChanged and volumeChanged signals, not needed, emitted by main class. Reviewed-by:Derick Hawcroft
* | 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
generated by cgit v0.12 at 2024-10-24 11:33:16 (GMT)