--- a/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/mediaplayer_s60.pri	Fri Jun 11 14:26:25 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/mediaplayer_s60.pri	Wed Jun 23 19:08:38 2010 +0300
@@ -6,22 +6,27 @@
 	-lcone \
     -lmmfcontrollerframework \
     -lefsrv \
-    -lbitgdi 
+    -lbitgdi \
+    -lapgrfx \
+    -lapmime \
 
-# If support to DRM is wanted then comment out the following line 
+# If support to DRM is wanted then comment out the following line
 #CONFIG += drm_supported
 
+# We are building Symbian backend with media player support
+DEFINES += HAS_MEDIA_PLAYER
+
 drm_supported {
     LIBS + = -ldrmaudioplayutility
     DEFINES += S60_DRM_SUPPORTED
-}    
+}
 
 HEADERS += \
     $$PWD/s60mediaplayercontrol.h \
     $$PWD/s60mediaplayerservice.h \
     $$PWD/s60mediaplayersession.h \
+    $$PWD/s60mediametadataprovider.h \
     $$PWD/s60videoplayersession.h \
-    $$PWD/s60mediametadataprovider.h \
     $$PWD/s60videosurface.h \
     $$PWD/s60videooverlay.h \
     $$PWD/s60videorenderer.h \
@@ -35,8 +40,8 @@
     $$PWD/s60mediaplayercontrol.cpp \
     $$PWD/s60mediaplayerservice.cpp \
     $$PWD/s60mediaplayersession.cpp \
+    $$PWD/s60mediametadataprovider.cpp \
     $$PWD/s60videoplayersession.cpp \
-    $$PWD/s60mediametadataprovider.cpp \
     $$PWD/s60videosurface.cpp \
     $$PWD/s60videooverlay.cpp \
     $$PWD/s60videorenderer.cpp \
@@ -45,40 +50,34 @@
     $$PWD/s60videowidget.cpp \
     $$PWD/s60mediaplayeraudioendpointselector.cpp
 
+
+contains(surfaces_s60_enabled,yes) {
+    DEFINES += MMF_VIDEO_SURFACES_SUPPORTED
+    message("Surfaces_s60 enabled")
+}
+
 contains(S60_VERSION, 3.1) {
-
     #3.1 doesn't provide audio routing in videoplayer
-    DEFINES += HAS_NO_AUDIOROUTING_IN_VIDEOPLAYER
-
+    contains(audiorouting_s60_enabled,yes) {
     MMP_RULES += "$${LITERAL_HASH}ifndef WINSCW" \
-    "LIBRARY    MPEngine.lib" \
-    "MACRO    HAS_MEDIA_PLAYER" \
-    "$${LITERAL_HASH}endif"
-
-    !exists($${EPOCROOT}epoc32\release\winscw\udeb\audiooutputrouting.lib) {
-        MMP_RULES += "$${LITERAL_HASH}ifdef WINSCW" \
-                     "MACRO HAS_NO_AUDIOROUTING" \
-                     "$${LITERAL_HASH}else" \
-                     "LIBRARY audiooutputrouting.lib" \
-                     "$${LITERAL_HASH}endif"
-        message("Note: AudioOutput Routing API not supported for 3.1 winscw target and in videoplayer")
+                "MACRO HAS_AUDIOROUTING" \
+                "LIBRARY audiooutputrouting.lib" \
+                "$${LITERAL_HASH}endif"
+    message("Note: AudioOutput Routing API not supported for 3.1 winscw target and in videoplayer")
     }
 
 } else {
-    LIBS += -lMPEngine
-    DEFINES += HAS_MEDIA_PLAYER
-    LIBS += -laudiooutputrouting
+    contains(audiorouting_s60_enabled,yes) {
+        #We use audiooutputrouting.lib for directing audio output to speaker/earspeaker
+        DEFINES += HAS_AUDIOROUTING_IN_VIDEOPLAYER
+        DEFINES += HAS_AUDIOROUTING
+        message("Audiorouting_s60 enabled for post 3.1 sdk")
+        LIBS += -laudiooutputrouting
+    }
+
 }
 
-exists($${EPOCROOT}epoc32\include\platform\mw\mediarecognizer.h) {
-    symbian:LIBS += -lplaybackhelper
-    DEFINES += USE_SYMBIAN_MEDIARECOGNIZER
-    #these are sdk plugins that don't exits in Symbian3
-    symbian:LIBS -= -lMPEngine
-    message("Using Symbian mediarecognizer")
-}
 exists($$[QT_INSTALL_HEADERS]\QtGui\private\qwidget_p.h) {
     DEFINES += USE_PRIVATE_QWIDGET_METHODS
     message("Enabling use of private QWidget methods")
-}
-
+}
\ No newline at end of file