summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/phonon
Commit message (Collapse)AuthorAgeFilesLines
* Phonon: allows to stream wave files from QIODeviceThierry Bastian2009-10-231-4/+7
| | | | Reviewed-by: trust Me
* 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
* | Reformatting to comply with Qt code styleGareth Stockwell2009-10-092-9/+9
| | | | | | | | Reviewed-by: Frans Englich
* | Refactored event-handling code in video widgetGareth Stockwell2009-10-092-13/+15
| | | | | | | | | | | | Moved common code into videoOutputRegionChanged() Reviewed-by: Frans Englich
* | Modified ObjectDump annotator for Symbian window informationGareth Stockwell2009-10-091-35/+35
| | | | | | | | | | | | This prevents a crash when applied to controls which are non-window owning Reviewed-by: Frans Englich
* | Added ObjectDump annotator which prints Symbian-specific internal widget flagsGareth Stockwell2009-10-092-0/+40
| | | | | | | | Reviewed-by: Frans Englich
* | Modified getDsaRegion to be compiled only in debug buildsGareth Stockwell2009-10-091-4/+9
| | | | | | | | Reviewed-by: Frans Englich
* | Preventing unnecessary calls to CVideoPlayerUtility::SetDisplayWindowLGareth Stockwell2009-10-092-18/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | getNativeWindowSystemHandles now checks the window handle and screen rectangle against the previous value; SetDisplayWindowL is only called if the window and/or screen rectangle have changed. This allows videoOutputRegionChanged to be called 'speculatively' - i.e. in response to Qt events which may or may not reflect a change in the underlying window system - with only actual window system events getting propagated into the MMF. The reason for this change is that SetDisplayWindowL results in the current DSA session (owned by CVideoPlayerUtility) being torn down and a new one set up. This in turn requires handshaking with the window server, and may be slow. Reviewed-by: Frans Englich
* | Simplified handling of native window information in VideoPlayerGareth Stockwell2009-10-092-64/+55
|/ | | | | | | | | | | Now retrieve RWsSession and CScreenDevice from CCoeEnv::Static() once (at construction), instead of at every call to getNativeWindowSystemHandles(). Collapsed m_screenRect and m_clipRect into a single m_rect member, since the two rectangles are always identical anyway. Reviewed-by: Frans Englich
* Merge commit 'qt/4.6' into mmfphononFrans Englich2009-10-071-12/+4
|\
| * Fix linker error with Symbian/ARM RVCT ABIv2 toolchainShane Kearns2009-10-071-12/+4
| | | | | | | | | | | | | | | | | | | | Not exporting the whole class prevents the capabilities example from linking, because the vtable is not exported. Changing from member exports to exporting the class also fixes the GCC 3.4.x compiler error. Task-number: QTBUG-4593 Reviewed-by: Thiago
* | Use QScopedPointer for AudioPlayer's CPlayerType.Frans Englich2009-10-072-7/+7
| | | | | | | | Reviewed-by: Gareth Stockwell
* | mediaplayer: crash in settings dialog.Frans Englich2009-10-073-15/+42
|/ | | | | | | The MediaPlayer requires that an output device is available. Task-number: QTBUG-4755 Reviewed-by: Gareth Stockwell
* Fix crash related to audio equalizer.Frans Englich2009-10-062-17/+14
| | | | | | The constructor initializer relied on member variables. Task-number: QTBUG-4689
* Remove TODO.txt, we've moved to Jira.Frans Englich2009-10-021-29/+0
|
* Merge commit 'qt/4.6' into mmfphononFrans Englich2009-10-0217-2/+94
|\ | | | | | | | | Conflicts: src/gui/kernel/qwidget_s60.cpp
| * Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-10-011-2/+20
| |\
| | * Fixes: Phonon-gst: Respect device MediaSource property.Dmytro Poplavskiy2009-10-011-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Task: QT-1027 RevBy: Andrew den Exter Details: All gst disk sources support setting device name with "device" property, otherwise the default device is used.
| | * Fixes: Phonon-gst: use correct URLs for different disk types.Dmytro Poplavskiy2009-10-011-2/+15
| | | | | | | | | | | | | | | | | | | | | RevBy: Andrew den Exter Details: Phonon gstreamer backend used cdda:// URL and corresponding gst source element regardless of disk type.
| * | qdoc: Marked some undocumented Phonon classes internalMartin Smith2009-10-011-1/+1
| | |
| * | qdoc: Marked some undocumented Phonon classes internalMartin Smith2009-10-0116-0/+74
| | |
* | | Merge branch 'mmfphonon' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Gareth Stockwell2009-10-012-9/+10
|\ \ \ | | | | | | | | | | | | mmfphonon
| * | | Use correct return value.Frans Englich2009-10-011-1/+1
| |/ / | | | | | | | | | Fixes tst_MediaObject::testReconnectBetweenTwoMediaObjects().
| * | Merge commit 'origin/4.6' into mmfphononFrans Englich2009-09-301-8/+9
| |\ \
| | * | Phonon/EffectFactory: Remove calls to QObject tr().Friedemann Kleint2009-09-301-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | Replace them by calls to QCoreApplication::translate() to provide translators with context information. Reviewed-by: Frans Englich <frans.englich@nokia.com>
* | | | Removed dummy VideoOutput instance.Gareth Stockwell2009-09-304-45/+79
|/ / / | | | | | | | | | This is part of an attempt to get the draggablevideo test app working on Symbian. Use of the dummy video output object causes a top-level window to be created, which was suspected of being the reason why video is not visible. This is not the case - for some reason, when the VideoOutput window is activated, it is still marked as 'hidden' by the window server (CWsClientWindow::ResetHiddenFlag, triggered from CCoeControl::ActivateL).
* | | Fixed compilation error and one warning, when building with RVCTGareth Stockwell2009-09-303-11/+12
| | |
* | | Merge branch 'mmfphonon' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Frans Englich2009-09-298-29/+51
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | mmfphonon Conflicts: src/3rdparty/phonon/mmf/abstractplayer.cpp
| * | | Fixed seek during video playbackGareth Stockwell2009-09-292-4/+13
| | | |
| * | | Fixed problem which caused playback to always start at default volume.Gareth Stockwell2009-09-296-29/+34
| | | | | | | | | | | | | | | | Volume changes made before playback starts are now correctly propagated.
| * | | Updated TODO listGareth Stockwell2009-09-291-0/+8
| |/ /
* | | Changes for fixing media object.Frans Englich2009-09-297-164/+171
|/ / | | | | | | | | | | | | | | | | | | | | This brings tst_MediaObject to 15/7, from previously not running. Changes involves: * Skipping .qrc related tests * Loading/mimetype detction from file:/ URIs * State fixes * As part of previous point, move state and error handling down in AbstractPlayer.
* | Fixed build errors due to header filename clashes between epoc32/include and ↵Gareth Stockwell2009-09-281-1/+1
| | | | | | | | | | | | | | | | Phonon. Both epoc32/include and $QTDIR/include/Phonon contain a file called videoplayer.h. Both of these directories are listed as SYSTEMINCLUDE paths in the generated MMP file, with the Phonon path coming first. This means that '#include <videoplayer.h>' picks up the Phonon header rather than (as intended) the Symbian one. A new qmake variable, PREPEND_INCLUDEPATH, is defined, allowing the .pro file to specify that /epoc32/include should be the first SYSTEMINCLUDE.
* | Revert "Disable code, as we don't have the required code in QtGui."Frans Englich2009-09-281-8/+6
| | | | | | | | This reverts commit 1062bbbcd6c30844d9ade10de80f27a3afd4dacf.
* | Disable code, as we don't have the required code in QtGui.Frans Englich2009-09-241-6/+8
| |
* | Remove TODO comment.Frans Englich2009-09-241-2/+0
| | | | | | | | Addresses review comment.
* | Do runtime check for SetVolume.Frans Englich2009-09-241-5/+12
| | | | | | | | | | This was previously in, but apparently disappeared as part of git work. Addresses review comment.
* | Essentially do 's/NULL/0/g', to adhere to Qt coding style.Frans Englich2009-09-249-22/+22
| | | | | | | | Addresses review comment.
* | Remove TODO comment.Frans Englich2009-09-241-1/+0
| | | | | | | | Addresses review comment.
generated by cgit v0.12 at 2024-10-21 08:35:55 (GMT)