From 4bdd75bd721610b992b01c9ebc659da2a8730480 Mon Sep 17 00:00:00 2001
From: Frans Englich <frans.englich@nokia.com>
Date: Tue, 8 Sep 2009 23:22:54 +0200
Subject: Improve signal connections between MediaObject and AbstractPlayer.

MediaObject deals with an AbstractPlayer, so make sure we have the signals
declared in that base class, instead of individually in each sub-class.
---
 src/3rdparty/phonon/mmf/abstractmediaplayer.cpp | 3 ++-
 src/3rdparty/phonon/mmf/abstractmediaplayer.h   | 6 ------
 src/3rdparty/phonon/mmf/abstractplayer.h        | 8 ++++++++
 src/3rdparty/phonon/mmf/audioplayer.h           | 3 ---
 src/3rdparty/phonon/mmf/videoplayer.h           | 4 ----
 5 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/3rdparty/phonon/mmf/abstractmediaplayer.cpp b/src/3rdparty/phonon/mmf/abstractmediaplayer.cpp
index 1e032f3..bdf188d 100644
--- a/src/3rdparty/phonon/mmf/abstractmediaplayer.cpp
+++ b/src/3rdparty/phonon/mmf/abstractmediaplayer.cpp
@@ -443,7 +443,8 @@ qint64 MMF::AbstractMediaPlayer::toMilliSeconds(const TTimeIntervalMicroSeconds
 
 void MMF::AbstractMediaPlayer::tick()
 {
-    emit tick(currentTime());
+	// For the MWC compiler, we need to qualify the base class.
+    emit MMF::AbstractPlayer::tick(currentTime());
 }
 
 QT_END_NAMESPACE
diff --git a/src/3rdparty/phonon/mmf/abstractmediaplayer.h b/src/3rdparty/phonon/mmf/abstractmediaplayer.h
index f11b559..e69f325 100644
--- a/src/3rdparty/phonon/mmf/abstractmediaplayer.h
+++ b/src/3rdparty/phonon/mmf/abstractmediaplayer.h
@@ -68,7 +68,6 @@ protected:
     // AbstractPlayer
     virtual void doSetTickInterval(qint32 interval);
 
-protected:
     virtual void doPlay() = 0;
     virtual void doPause() = 0;
     virtual void doStop() = 0;
@@ -121,11 +120,6 @@ protected:
 private:
     void doVolumeChanged();
 
-Q_SIGNALS:
-    void tick(qint64 time);
-    void stateChanged(Phonon::State oldState,
-                      Phonon::State newState);
-
 private Q_SLOTS:
     /**
      * Receives signal from m_tickTimer
diff --git a/src/3rdparty/phonon/mmf/abstractplayer.h b/src/3rdparty/phonon/mmf/abstractplayer.h
index 0f846ca..72d0a3b 100644
--- a/src/3rdparty/phonon/mmf/abstractplayer.h
+++ b/src/3rdparty/phonon/mmf/abstractplayer.h
@@ -88,6 +88,14 @@ public:
 
     void setVideoOutput(VideoOutput* videoOutput);
 
+Q_SIGNALS:
+    void totalTimeChanged(qint64 length);
+    void finished();
+    void tick(qint64 time);
+    void stateChanged(Phonon::State oldState,
+                      Phonon::State newState);
+
+
 protected:
     virtual void videoOutputChanged();
 
diff --git a/src/3rdparty/phonon/mmf/audioplayer.h b/src/3rdparty/phonon/mmf/audioplayer.h
index 3245159..f16de1d 100644
--- a/src/3rdparty/phonon/mmf/audioplayer.h
+++ b/src/3rdparty/phonon/mmf/audioplayer.h
@@ -87,9 +87,6 @@ public:
 #endif
 
     CPlayerType *player() const;
-Q_SIGNALS:
-    void totalTimeChanged(qint64 length);
-    void finished();
 
 private:
     void construct();
diff --git a/src/3rdparty/phonon/mmf/videoplayer.h b/src/3rdparty/phonon/mmf/videoplayer.h
index 887a26b..5761ce7 100644
--- a/src/3rdparty/phonon/mmf/videoplayer.h
+++ b/src/3rdparty/phonon/mmf/videoplayer.h
@@ -73,10 +73,6 @@ public:
     // VideoOutputObserver
     virtual void videoOutputRegionChanged();
 
-Q_SIGNALS:
-    void totalTimeChanged(qint64 length);
-    void finished();
-
 private:
     void construct();
     VideoOutput& videoOutput();
-- 
cgit v0.12