--- a/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediarecognizer.h	Fri Jun 11 14:26:25 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediarecognizer.h	Wed Jun 23 19:08:38 2010 +0300
@@ -44,15 +44,8 @@
 
 #include <QtCore/qobject.h>
 
-#ifdef USE_SYMBIAN_MEDIARECOGNIZER
-#include <mediarecognizer.h>
-typedef CMediaRecognizer MobilityMediaRecognizer;
-typedef CMediaRecognizer::TMediaType MobilityMediaType;
-#else
-#include <mpmediarecognizer.h>
-typedef CMPMediaRecognizer MobilityMediaRecognizer;
-typedef CMPMediaRecognizer::TMPMediaType MobilityMediaType;
-#endif
+#include <apgcli.h>
+#include <f32file.h>
 
 class QUrl;
 
@@ -71,10 +64,16 @@
     S60MediaRecognizer(QObject *parent = 0);
     ~S60MediaRecognizer();
     
-    MediaType IdentifyMediaType(const QUrl &url);
+    S60MediaRecognizer::MediaType mediaType(const QUrl &url);
+    S60MediaRecognizer::MediaType identifyMediaType(const QString& fileName);
+
+protected:
+    TPtrC QString2TPtrC( const QString& string );
 
 private:
-    MobilityMediaRecognizer *m_recognizer;
+    RApaLsSession m_recognizer;
+    RFile m_file;
+    RFs m_fileServer;
 };
 
 #endif /* S60MEDIARECOGNIZER_H_ */