summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGareth Stockwell <ext-gareth.stockwell@nokia.com>2010-08-02 11:10:14 (GMT)
committerGareth Stockwell <ext-gareth.stockwell@nokia.com>2010-08-02 12:06:00 (GMT)
commit700ba679e88241ce35b16c46326a854c07ac9b8a (patch)
treecaed146782ea1c2329009b5c70db923ec085039d
parentfa99c88f2a87b98911916b7d701b884281a3342b (diff)
downloadQt-700ba679e88241ce35b16c46326a854c07ac9b8a.zip
Qt-700ba679e88241ce35b16c46326a854c07ac9b8a.tar.gz
Qt-700ba679e88241ce35b16c46326a854c07ac9b8a.tar.bz2
Fixed build break on Symbian versions earlier than S^3
The following overload was added in S^3: TInt RApaLsSession::RecognizeData(const TDesC8& aBuffer, TDataRecognitionResult& aDataType) const In order to allow the backend to compile against earlier versions of the platform, this patch calls the RecognizeData overload which taking the same arguments as above, plus a filename (for which KNullDesC is passed). Task-number: QTBUG-6562 Reviewed-by: trustme
-rw-r--r--src/3rdparty/phonon/mmf/mediaobject.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/phonon/mmf/mediaobject.cpp b/src/3rdparty/phonon/mmf/mediaobject.cpp
index b476535..98326b8 100644
--- a/src/3rdparty/phonon/mmf/mediaobject.cpp
+++ b/src/3rdparty/phonon/mmf/mediaobject.cpp
@@ -158,7 +158,7 @@ MMF::MediaType MMF::MediaObject::bufferMediaType(const uchar *data, qint64 size)
if (openRecognizer()) {
TDataRecognitionResult recognizerResult;
const TPtrC8 des(data, size);
- const TInt err = m_recognizer.RecognizeData(des, recognizerResult);
+ const TInt err = m_recognizer.RecognizeData(KNullDesC, des, recognizerResult);
if (KErrNone == err) {
const TPtrC mimeType = recognizerResult.iDataType.Des();
result = Utils::mimeTypeToMediaType(mimeType);