--- a/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayercontrol.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayercontrol.h	Fri May 14 16:41:33 2010 +0300
@@ -49,13 +49,13 @@
 #include "ms60mediaplayerresolver.h"
 #include <QtCore/qdebug.h>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 class QMediaPlayer;
 class QMediaTimeRange;
 class QMediaContent;
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class S60MediaPlayerSession;
 class S60MediaPlayerService;
@@ -69,6 +69,7 @@
         , m_muted(false)
         , m_playbackRate(0)
         , m_mediaStatus(QMediaPlayer::UnknownMediaStatus)
+        , m_audioEndpoint(QString("Default"))
     {
     }
     
@@ -76,17 +77,20 @@
     void setMuted(bool muted) { m_muted = muted; }
     void setPlaybackRate(int rate) { m_playbackRate = rate; }
     void setMediaStatus(QMediaPlayer::MediaStatus status) {m_mediaStatus=status;}
+    void setAudioEndpoint(const QString& audioEndpoint) { m_audioEndpoint = audioEndpoint; }
     
     int volume() const { return m_volume; }
     bool isMuted() const { return m_muted; }
     qreal playbackRate() const { return m_playbackRate; }
     QMediaPlayer::MediaStatus mediaStatus() const {return m_mediaStatus;}
+    QString audioEndpoint() const { return m_audioEndpoint; }
     
 private:
     int m_volume;
     bool m_muted;
     qreal m_playbackRate;
     QMediaPlayer::MediaStatus m_mediaStatus;
+    QString m_audioEndpoint;
 };
 
 class S60MediaPlayerControl : public QMediaPlayerControl
@@ -121,6 +125,7 @@
     virtual void pause();
     virtual void stop();  
     S60MediaPlayerSession* session();
+    void setAudioEndpoint(const QString& name);
 
     // Own methods
     void setVideoOutput(QObject *output);