summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/phonon
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-151-10/+12
|\ | | | | | | | | Conflicts: src/gui/styles/qs60style_s60.cpp
| * Merge branch 'mmfphonon' into 4.6Frans Englich2010-03-101-10/+12
| |\
| | * Fix SDP files are not supported.Frans Englich2010-03-101-10/+12
| | | | | | | | | | | | | | | | | | | | | The Phonon glue code rejected SDPs based on the MIME type for SDPs. Task-number: QTBUG-8702 Reviewed-by: Gareth Stockwell
* | | make it possible to use sse2 with mingwThierry Bastian2010-03-112-2/+2
| | | | | | | | | | | | | | | | | | | | | All the windows callback functions need an attribute to force the alignment of the arg pointer. Reviewed-by: Benjamin Poulain
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-051-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (56 commits) fixed treatment of zlib on Mac when crossbuilding Partial overloading support for qdbus cli tool. Allow empty authority in QUrl::setAuthority as per docs. Added test for QTBUG-6962: Empty authority ignored by QUrl::setAuthority. fixed case of GL include directory check in MAC_APPLICATION_MENU translations Re-generate the Unicode tables after updates to the program that generates them Fix the code after merge: DerivedNormalizationProps has two or more columns add some usefull definitions to qunicodetables_p.h qchar.cpp: fix identation finish last commit prefer DerivedNormalizationProps.txt over CompositionExclusions.txt improve error reporting a bit more improve error reporting fix incorect condition check if string to int conversions were done w/o errors improve error reporting for unassigned grapheme/word/sentence break classes avoid using of qunicodetables_p.h in generator use QHash for line break map use QHash for age map ...
| * | | fixed case of GL include directoryMark Brand2010-03-051-1/+1
| | | | | | | | | | | | | | | | | | | | Merge-request: 484 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
* | | | Fixa few warnings on mingwThierry Bastian2010-03-051-1/+1
|/ / /
* | | optimization: get rid of QString::fromUtf16() usage, part 2Oswald Buddenhagen2010-02-162-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QString::fromUtf16() is slow - it does a BOM check and optionally byte swapping, which is utterly irrelevant when converting internal data structures which are raw utf16 in host byte order. so replace it with QString::fromUnicode() where possible (which seems to be everywhere). the reasoning is the same as in commit e0fda52f, so not getting further reviews. Reviewed-by: denis Reviewed-by: joao
* | | Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-092-31/+25
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: src/gui/kernel/qcocoapanel_mac.mm src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
| * | Merge remote branch 'origin/4.6' into 4.6Paul Olav Tvete2010-02-051-31/+22
| |\ \ | | | | | | | | | | | | | | | | Conflicts: dist/changes-4.6.2
| | * | I10n: Use 'real' Linguist comments in Phonon::EnvironmentalReverbFriedemann Kleint2010-02-041-31/+22
| | | | | | | | | | | | | | | | Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | | Merge remote branch 'staging/4.6' into 4.6Samuel Rødal2010-02-041-0/+3
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | Manual resolve of conflict in changes-4.6.2 in staging-2. Conflicts: dist/changes-4.6.2
| | * | fix crash in Phonon::DS9 backendJoerg Bornemann2010-02-011-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When using a VideoWidget in a QGraphicsProxyWidget, then Phonon::DS9 crashed, if the VideoWidget didn't have a MediaSource. Reviewed-by: Thierry
* | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Olivier Goffart2010-02-042-2/+22
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/assistant/simpletextviewer/findfiledialog.cpp qmake/generators/symbian/symmake.cpp tools/assistant/lib/qhelpgenerator.cpp tools/assistant/lib/qhelpsearchquerywidget.cpp translations/translations.pri
| * | | Added descriptions of translatable strings for Phonon MMF reverb effectGareth Stockwell2010-02-031-1/+21
| | | | | | | | | | | | | | | | Reviewed-by: trustme
| * | | Corrected namespace for Phonon::MMF translatable error stringsGareth Stockwell2010-02-031-1/+1
| |/ / | | | | | | | | | | | | | | | Error strings are now part of the Phonon::MMF namespace. Reviewed-by: trustme
* | | build fix for phonon on winceThierry Bastian2010-01-252-2/+2
| | |
* | | Merge branch '4.6'Thiago Macieira2010-01-188-12/+12
|\ \ \ | |/ /
| * | Workaround for compiler error with MWCC (Symbian emulator)Shane Kearns2010-01-188-12/+12
| |/ | | | | | | | | | | | | Recent changes to phonon and syncqt cause problems with the default search path for #include with this compiler. Reviewed-by: Gareth Stockwell
* | Merge branch '4.6'Thiago Macieira2010-01-1322-226/+1136
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt doc/src/deployment/deployment.qdoc src/corelib/io/qfsfileengine_win.cpp src/corelib/xml/qxmlstream.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h tools/assistant/tools/assistant/centralwidget.cpp tools/linguist/lupdate/main.cpp
| * Added enable/disable parameter to each effect in Phonon MMF backendGareth Stockwell2010-01-1112-68/+74
| | | | | | | | | | Task-number: QTBUG-4659 Reviewed-by: Espen Riskedal
| * Simplified error handling for audio effectsGareth Stockwell2010-01-1112-31/+33
| | | | | | | | | | Task-number: QTBUG-4659 Reviewed-by: Espen Riskedal
| * Implemented stereo widening effect in Phonon MMF backendGareth Stockwell2010-01-113-1/+161
| | | | | | | | | | Task-number: QTBUG-4659 Reviewed-by: Espen Riskedal
| * Implemented reverb effect in Phonon MMF backendGareth Stockwell2010-01-115-2/+283
| | | | | | | | | | Task-number: QTBUG-4659 Reviewed-by: Espen Riskedal
| * Implemented loudness effect in Phonon MMF backendGareth Stockwell2010-01-113-0/+146
| | | | | | | | | | Task-number: QTBUG-4659 Reviewed-by: Espen Riskedal
| * Implemented bass boost in Phonon MMF backendGareth Stockwell2010-01-115-11/+42
| | | | | | | | | | Task-number: QTBUG-4659 Reviewed-by: Espen Riskedal
| * Refactored AbstractAudioEffect to reduce redundancy in derived classesGareth Stockwell2010-01-116-41/+37
| | | | | | | | | | Task-number: QTBUG-4659 Reviewed-by: Espen Riskedal
| * Removed unnecessary check in Phonon MMF backendGareth Stockwell2010-01-111-5/+3
| | | | | | | | | | | | | | | | This pointer is guaranteed not to be null by the check in AbstractAudioEffect::setParameterValue. Task-number: QTBUG-4659 Reviewed-by: trustme
| * Added a macro to reduce boilerplate code in Phonon MMF backendGareth Stockwell2010-01-115-17/+35
| | | | | | | | | | Task-number: QTBUG-4659 Reviewed-by: Espen Riskedal
| * Removed dependency of EffectFactory on native effect headersGareth Stockwell2010-01-116-60/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By refactoring the static capabilities / parameters interface exposed by AbstractAudioEffect-derived classes to the EffectFactory, the latter's implementation no longer needs access to the headers for native effect classes. Previously, during the initialization phase, the EffectFactory tried to create an instance of each native effect class, in order to determine whether that effect is supported. This is now done inside the backend class for each effect, thereby improving encapsulation. Task-number: QTBUG-4659 Reviewed-by: Espen Riskedal
| * Delayed creation of audio effect object until audio is initializedGareth Stockwell2010-01-118-23/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When applying effects to an audio stream, we must ensure that the MMF utility API (CMdaAudioPlayerUtility or CVideoPlayerUtility) instance has loaded a controller before calling attempting to create a CAudioEffect- derived object. If the controller has not been loaded, construction of the effect object will fail. Even if we mitigate against this, calling CAudioEffect::ApplyL() will only have an effect if there is a controller object - or more precisely, a DevSound instance - on which to apply the effect. This patch delays construction of the effect object until the MediaObject has transitioned out of the LoadingState, indicating that an underlying DevSound instance will have been created. Task-number: QTBUG-4659 Reviewed-by: Espen Riskedal
| * Modified effect parameter handling to improve user experienceGareth Stockwell2010-01-118-23/+173
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change is to work around a limitation in the Phonon::EffectWidget class. This widget only displays sliders for parameters with numeric values if the variant type of the parameter is QReal and the range is exactly -1.0 to +1.0; otherwise, a spinbox is displayed. This is rather inconvenient for many effects, such as the audio equalizer, for which a slider is a much more natural UI control. The MMF backend therefore reports the type of numeric parameters to be QReal, and the range to be -1.0 to +1.0. Internally, the integer range for the parameter is stored. Changes to the parameter value are converted from the client-side, floating point representation to the internal, integer representation. Task-number: QTBUG-4659 Reviewed-by: Espen Riskedal
| * Added comments to clarify usage of Phonon::EffectParameter APIGareth Stockwell2010-01-111-8/+9
| | | | | | | | | | Task-number: QTBUG-4659 Reviewed-by: trustme
| * Shortened description of audio equalizer bandsGareth Stockwell2010-01-111-1/+1
| | | | | | | | | | | | | | | | This improves the small-screen layout of the equalizer configuration dialog. Task-number: QTBUG-4659 Reviewed-by: trustme
| * Implemented audio effects capability querying in Phonon MMF backendGareth Stockwell2010-01-0810-132/+225
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch addresses the following deficiencies in the existing implementation of audio effects: 1. Native effect objects (e.g. CAudioEqualizer, CBassBoost etc) were created frequently, just in order to check whether a given effect is supported, or retrieve the list of parameters which it requires. Although this is in part due to a deficiency in the S60 audio effects API (it doesn't have a 'capability query' concept), it can be improved by using caching. This patch introduces a singleton EffectFactory object, which lazily initializes a data structure containing information about support and parameters. 2. In order to either query effect support, the native effect object ultimately needs to access a DevSound instance. Previously, the effect object was provided with a CMdaAudioPlayerUtility object. If this player utility has not loaded an MMF controller plugin *before* the effects object makes any calls to the player utility, incorrect results will be returned. This was observed in the previous code. For querying, we don't actually need to load an MMF controller; instead, we would like to directly provide a CMMFDevSound instance to the effect object. Unfortunately, this API is not available in public S60 SDKs, so we must use the next lowest interface available, namely CMdaAudioOutputStream. By making this change, this patch ensures that support and parameter queries made via the EffectFactory will return the correct result. At this point, however, effect settings made via the Phonon API are not actually applied to the audio output. Fixing this will require notifying the audio effects backend nodes of state changes in the MediaObject. Task-number: QTBUG-4659 Reviewed-by: Espen Riskedal
| * Corrected parameter name ordering in internal Phonon MMF function signaturesGareth Stockwell2010-01-082-4/+4
| | | | | | | | | | | | | | | | Some instances of the changeState signal declaration had the newState and oldState parameters in the wrong order. While this has no effect on the behaviour of the code, it can be confusing to developers reading it. Reviewed-by: trustme
| * Fixed typo in Phonon::EffectWidget implementationGareth Stockwell2010-01-081-1/+1
| | | | | | | | | | Task-number: QTBUG-4659 Reviewed-by: trustme
* | Merge branch '4.6'Thiago Macieira2010-01-1229-501/+837
|\ \ | |/
| * Fixed build breakage on S60 3.1 due to audio effects changesGareth Stockwell2010-01-086-31/+10
| | | | | | | | | | | | | | | | Removed calls to the video overload of the audio effect constructors, e.g. CAudioEqualizer::NewL(VideoPlayerUtility&) Task-number: QTBUG-7223 Reviewed-by: trustme
| * Implemented node disconnection in Phonon MMF backendGareth Stockwell2009-12-0820-194/+348
| | | | | | | | | | Task-number: QTBUG-4663 Reviewed-by: Frans Englich
| * Removed dead code from Phonon MMF backendGareth Stockwell2009-12-081-12/+2
| | | | | | | | | | | | | | | | | | The following source types are handled in MediaObject::createPlayer Invalid, Disc, Stream, Empty The code removed in this patch is therefore never executed. Reviewed-by: Frans Englich
| * Re-emit prefinishMarkReached and aboutToFinish if rewound back past mark.Gareth Stockwell2009-12-082-2/+25
| | | | | | | | | | Task-number: QTBUG-6214 Reviewed-by: Frans Englich
| * Implemented support for playlist handling in Phonon MMF backendGareth Stockwell2009-12-0812-170/+129
| | | | | | | | | | | | | | | | | | | | The main changes are: 1. MediaObject emits prefinishMark at the appropriate instant 2. MediaObject emits aboutToFinish at the appropriate instant 3. MediaObject switches to next source when playback completes Task-number: QTBUG-6214 Reviewed-by: Frans Englich
| * Changed call sequence of seeking in Phonon MMF backend, for streamingGareth Stockwell2009-12-082-19/+11
| | | | | | | | | | | | | | | | | | | | | | | | Modified the sequence of calls made to the MMF APIs when seeking during ongoing playback. This fixes a bug found during early testing of streaming playback, whereby playback would not resume following the seeking operation. This was due to an interaction between the pause / seek / play operations, and the buffering callbacks received from the MMF, which caused the backend to enter an incorrect state. Task-number: QTBUG-4660 Reviewed-by: Frans Englich
| * Implemented buffer status notifications in Phonon MMF backendGareth Stockwell2009-12-089-62/+162
| | | | | | | | | | | | | | | | | | | | | | | | When clips are buffering (either at the start of playback, or during playback, when buffer levels drop due to e.g. CPU, file system or network load), the backend receives notification from the MMF. While buffering is ongoing, the backend periodically queries the filling status and emits a signal. Task-number: QTBUG-4660 Reviewed-by: Frans Englich
| * Added support for streaming playback to Phonon MMF backendGareth Stockwell2009-12-088-6/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because the MIME type of the stream cannot always be deduced from the URL, we assume that it is a video stream. This is based on the assumption that the video controllers will be capable of parsing the container formats for audio-only, as well as video clips. Note that this assumption may not hold on all devices. Note that most implementations of the MMF client APIs do not support HTTP streaming (a.k.a. progressive download). The backend has therefore only been tested with RTSP streams - see the JIRA entry for further details. Task-number: QTBUG-4660 Reviewed-by: Frans Englich
| * Merge branch 'mmfphonon' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Gareth Stockwell2009-12-082-34/+34
| |\ | | | | | | | | | mmfphonon
| | * Symbian: More i18n strings work.Frans Englich2009-12-072-34/+34
| | | | | | | | | | | | | | | | | | | | | | | | * Consistently capitalize error sentences * Simplify & fix code/documentation. Task-number: QTBUG-4994 Reviewed-by: TrustMe
| * | Phonon MMF: leaves during object construction throw exceptionsGareth Stockwell2009-12-082-9/+7
| | | | | | | | | | | | Reviewed-by: Frans Englich
| * | Removed stale TODO comments from Phonon MMF backendGareth Stockwell2009-12-083-4/+1
| |/ | | | | | | Reviewed-by: Frans Englich
generated by cgit v0.12 at 2025-01-27 13:54:39 (GMT)