summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/phonon
Commit message (Collapse)AuthorAgeFilesLines
* Phonon; Integrate changes to .desktop fileJustin McPherson2009-11-121-0/+42
| | | | Reviewed-by: TrustMe
* Phonon; Integrate changes to cmake files.Justin McPherson2009-11-124-20/+38
| | | | Reviewed-by: TrustMe
* Gstreamer: Do not assume that the list index is the same as the deviceJustin McPherson2009-11-121-2/+10
| | | | | | | | | | | | | id. This fix is similar to KDE change 1027568 by cguthrie. This commit fixes a bug that was highlighted when devices had been added/removed or the backend was reloaded. The AudioDevice used to use a static counter to allocate itself a device id that was propigated through the Phonon API. Code in the Backend invalidly assumed that the index in the list was the same as this id.
* Gstreamer: Added DVD supportJustin McPherson2009-11-121-15/+19
| | | | | | | | | Intergrated KDE change 1040729 by nlecureuil This bug was already fixed in Qt phonon repo in exactly the same way, but KDE change is applyed to keep phonon sources in sync. Reviewed-by: Dmytro Poplavskiy
* Gstreamer: Do not assume that the list index is the same as the device id.Justin McPherson2009-11-121-4/+7
| | | | | | | | Integrated KDE change 1027568 by cguthrie. This commit fixes a bug that was highlighted when devices had been added/removed or the backend was reloaded. The AudioDevice used to use a static counter to allocate itself a device id that was propigated through the Phonon API. Code in the Backend invalidly assumed that the index in the list was the same as this id.
* gstreamer: Set the glib app name only once and do it in the backend.Justin McPherson2009-11-122-1/+7
| | | | | | | | Integrated KDE change 1027567 by cguthrie. Glib issues a warning if this is called more than once so we ensure that's what we do. Reviewed-by: Dmytro Poplavskiy
* Gstreamer: Detect more mimetypesJustin McPherson2009-11-121-2/+9
| | | | | | Integrated KDE change 1029491 by nlecureuil Reviewed-by: Dmytro Poplavskiy
* reduce the speed of CD drive to 2X while playing CD audio to limit CDJustin McPherson2009-11-121-3/+15
| | | | | | | | drive noise Integrated KDE changes 1029492, 1030905 by nlecureuil Reviewed-by: Dmytro Poplavskiy
* gstreamer: Do not call gst_deinit() but do free the device and effect ↵Justin McPherson2009-11-121-1/+0
| | | | | | | | | | | | | manager objects on backend destruction. Integrated KDE change 1027566 by cguthrie. Normally the backend is only destroyed once when the app exists, but calling gst_deinit() means that the whole gstreamer system becomes unrecoverable. This means that if you switch backends away from gstreamer and then back again it will not work. Gstreamer devs recommend that you do not call gst_deinit() at all except in test cases. Reviewed-by: Dmytro Poplavskiy
* Remove rogue \refs from documentation.Justin McPherson2009-11-122-2/+2
| | | | Reviewed-By: TrustMe
* Import change 924855 from phonon-svn.Justin McPherson2009-11-121-2/+6
| | | | | | | | r924855 | mkretz | 2009-02-12 05:49:12 +1000 (Thu, 12 Feb 2009) | 1 line forwardport: two more adaptor accesses where adaptor might be 0 Reviewed-by: Justin McPherson
* Import change 932546 from phonon-svn.Justin McPherson2009-11-1291-91/+91
| | | | | | | | r932546 | thiago | 2009-02-27 07:33:54 +1000 (Fri, 27 Feb 2009) | 1 line Update copyrights: Trolltech ASA -> Nokia Corporation Reviewed-by: Justin McPherson
* Import change 950964 from phonon-svn.Justin McPherson2009-11-121-2/+2
| | | | | | | | r950964 | dfaure | 2009-04-08 19:26:40 +1000 (Wed, 08 Apr 2009) | 2 lines fix compilation with -DQT_STRICT_ITERATORS Reviewed-by: Justin McPherson
* Import change 953828 from phonon-svnJustin McPherson2009-11-121-1/+1
| | | | | | | | | r953828 | tkrotoff | 2009-04-15 01:25:00 +1000 (Wed, 15 Apr 2009) | 1 line Fix qmath.h include: should be written <QtCore/qmath.h> instead of <qmath.h> in order to be consistent with the rest of the code that use <QtCore/...> Reviewed-by: Justin McPherson
* Merge branch '4.6-api-review' into 4.6Marius Storm-Olsen2009-11-091-1/+1
|\
| * API review: Rename numRects() -> rectCount()Marius Storm-Olsen2009-11-091-1/+1
| | | | | | | | | | | | | | QRegion::numRects() is marked obsolete. Removed all usage of the old function inside Qt and test-cases. Reviewed-by: Andreas Aardal Hanssen
* | Merge commit 'origin/4.6' into 4.6Olivier Goffart2009-11-0619-64/+458
|\ \ | | | | | | | | | | | | Conflicts: dist/changes-4.6.0
| * \ Merge commit 's60/4.6' into mmfphononFrans Englich2009-11-042-3/+3
| |\ \ | | |/
| * | Implemented metadata handling in Phonon MMF backendGareth Stockwell2009-11-048-2/+71
| | | | | | | | | | | | | | | Task-number: QTBUG-4662 Reviewed-by: Frans Englich
| * | Removed some logging from MMF Phonon backendGareth Stockwell2009-11-041-2/+2
| | | | | | | | | | | | Reviewed-by: trustme
| * | Fixed crash opening audio clip when video clip currently openGareth Stockwell2009-11-031-0/+3
| | | | | | | | | | | | | | | Task-number: QTBUG-5302 Reviewed-by: trustme
| * | Merge branch '4.6' into mmfphononGareth Stockwell2009-11-0325-33/+125
| |\ \
| * | | Fixed volume calculation in Phonon MMF backendGareth Stockwell2009-11-031-1/+2
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-4777 Reviewed-by: trustme
| * | | Fixed state bug in Phonon MMF backendGareth Stockwell2009-11-031-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug introduced by 58efa8aa, which meant that, when a new clip was opened: 1. Playback did not start automatically 2. The current volume setting in the app UI was not applied to the MMF client API Task-number: QTBUG-4999 Reviewed-by: trustme
| * | | Improve error handling.Frans Englich2009-10-237-51/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Errors reported via: * the DummyPlayer didn't work due to it not doing the usual state transitions/emission * MediaObject::setSource() due to errors being emitted before connections being set up. * A general state bug. Task-number: QTBUG-4752 Reviewed-by: Gareth Stockwell
| * | | Video screen region is updated in response to ancestors of video widgetGareth Stockwell2009-10-238-11/+326
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | being moved. Because QWidget::moveEvent is only called when a widget moves relative to its parent, a widget's absolute screen position may change without it receiving a moveEvent (for example, as a result of its parent being moved). The MMF video playback API on Symbian v9.4 requires, in addition to a window handle, an absolute screen rectangle. Changes in the video widget's absolute screen position therefore need to be propagated into the MMF. This change introduces a new object, AncestorMoveMonitor, which installs an event filter on the QCoreApplication instance. A VideoOutput object registers with the AncestorMoveMonitor, which listens on its behalf for MoveEvents and ParentChangeEvents directed at any of the ancestors of the VideoOutput. MoveEvents trigger a callback to the VideoOutput instance, which then notifies the MMF of the new screen rectangle. ParentChangeEvents cause the AncestorMoveMonitor to update the ancestor list associated with the target VideoOutput instance. The video position now tracks that of the associated widget, but there are two problems which require further investigation: 1. The video window lags behind. This may be an unavoidable consequence of the fact that setting a new screen rectangle causes the MMF to tear down its DSA session and start a new one; this is known to block the window server and take some time to complete. 2. Artifacts are visible around the edges of the moving video widget. Task-number: QTBUG-4787 Reviewed-by: Frans Englich
* | | | Fix Phonon's video renderer on windows with openglThierry Bastian2009-11-061-1/+6
| |_|/ |/| | | | | | | | | | | | | | Now we use opengl 2. Reviewed-by: Samuel
* | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.6David Boddie2009-11-032-3/+3
|\ \ \ | |_|/ |/| | | | | | | | | | | Conflicts: src/gui/kernel/qevent.cpp src/network/ssl/qsslerror.cpp
| * | Doc/i18n: Fixed source strings for translation.David Boddie2009-11-032-3/+3
| |/ | | | | | | Reviewed-by: Oswald Buddenhagen
* | Merge commit 'origin/4.6' into featureJørgen Lind2009-11-021-4/+7
|\ \
| * | Phonon: allows to stream wave files from QIODeviceThierry Bastian2009-10-231-4/+7
| |/ | | | | | | Reviewed-by: trust Me
* | Fix QT_NO_PHONON_VIDEOJørgen Lind2009-10-298-8/+17
| | | | | | | | Reviewed-by: Jens Bache-Wiig
* | Fix LIBRARY and SETTINGS in phononJørgen Lind2009-10-297-6/+37
| | | | | | | | | | | | Reviewed-by: Jens Bache-Wiig Squash me with Fix LIBRARY and SETTINGS in phonon 7d2282
* | Fix QT_NO_PROPERTIESJørgen Lind2009-10-292-2/+4
| | | | | | | | | | | | | | However, there are some stuff added to qscript that I'm really not sure about. Reviewed-by: tom
* | Added QT_NO_PHONON_EFFECT to gstreamer backendJørgen Lind2009-10-295-8/+10
| | | | | | | | Reviewed-by: Jens Bache-Wiig
* | Fix QT_NO_PHONON_ABSTRACTMEDIASTREAM in phononJørgen Lind2009-10-295-1/+41
| | | | | | | | | | | | Seemed to be missing from gstreamer backend Reviewed-by: Jens Bache-Wiig
* | Fix QFeature QT_NO_PHONON_VOLUMEFADEREFFECTJørgen Lind2009-10-293-4/+8
| | | | | | | | Reviewed-by: Jens Bache-Wiig
* | Make QT_NO_PHONON_PLATFORMPLUGIN workJørgen Lind2009-10-291-3/+4
|/ | | | Reviewed-by:tom
* Fix bug introduced by cleanup commit.Frans Englich2009-10-201-2/+0
| | | | Reviewed-by: Gareth Stockwell
* Does not disable full screen when end of video playlist is reached.Frans Englich2009-10-191-1/+1
| | | | | | | Tested on Symbian and Windows(DS9). Task-number: QTBUG-4869 Reviewed-by: Gareth Stockwell
* Kill warning, simplify code.Frans Englich2009-10-161-2/+4
| | | | Reviewed-by: TrustMe
* Replace tabs with whitespace.Frans Englich2009-10-155-65/+65
| | | | | sed -i -e 's/\t/ /g' `find -name "*.cpp" -or -name "*.h" -or -name "*.pro"`
* sed -i -e 's/for(/for (/g' `find -name "*.cpp" -or -name "*.h" -or -nameFrans Englich2009-10-154-5/+5
| | | | "*.pro"`
* sed -i -e 's/if(/if (/g' `find -name "*.cpp" -or -name "*.h" -or -nameFrans Englich2009-10-157-45/+45
| | | | "*.pro"`
* Use QT_NO_DEBUG, not _DEBUG.Frans Englich2009-10-154-9/+9
|
* Remove trailing whitespace.Frans Englich2009-10-157-108/+108
|
* Merge commit 'origin/4.6' into mmfphononFrans Englich2009-10-151-4/+27
|\ | | | | | | | | | | Conflicts: src/corelib/kernel/qcoreevent.cpp src/corelib/kernel/qcoreevent.h
| * Conservative fix for link error with ARM RVCT compiler on symbian sbsv2Shane Kearns2009-10-081-4/+19
| | | | | | | | | | | | | | | | | | | | Not exporting the whole class prevents the capabilities example from linking, because the vtable is not exported. However windows builds don't support export of templated class, and export the vtable implicitly when there is an exported member function. Task-number: QTBUG-4593 Reviewed-by: Thierry Bastian
| * Revert "Fix linker error with Symbian/ARM RVCT ABIv2 toolchain"Shane Kearns2009-10-071-4/+12
| | | | | | | | | | This reverts commit 342fcb287b09d016d482e25482ddd1b36e2983a3. Didn't work on all compilers
* | Modified video widget to respond to WinIdChange eventsGareth Stockwell2009-10-092-0/+12
| | | | | | | | | | Task-number: QTBUG-4664 Reviewed-by: Frans Englich