Fixed problem which caused duplicate entries to appear in media player file list.

This was due to the backend returning an incorrect initial state value.  Phonon::MMF::AbstractMediaPlayer::GroundState is now correctly mapped to Phonon::LoadingState.  (Previously it mapped to Phonon::StoppedState).

3 files changed, 2 insertions, 16 deletions

diff --git a/src/3rdparty/phonon/mmf/TODO.txt b/src/3rdparty/phonon/mmf/TODO.txt
index fc1cfa5..d866aea 100644
--- a/src/3rdparty/phonon/mmf/TODO.txt
+++ b/src/3rdparty/phonon/mmf/TODO.txt
@@ -17,9 +17,6 @@ Do we need to connect up the TRACE_* macros to another logging output (e.g. file
 * Fix position slider in audio test app (musicplayer.exe)
 The slider is enabled when playing, but does not move and cannot be dragged.  This means that we can't easily test seeking.
 
-* Fix track list in audio test app (musicplayer.exe)
-After loading a single clip, we get two entries in the list box: the first is blank and the second has the name of the clip we just loaded.  However, clicking on the first (blank) opens the clip, while clicking on the second (correct filename) has no effect.
-
 * Implement audio effects
 
 * Support for network streaming playback
@@ -41,18 +38,7 @@ This should probably be left for now, particularly until audio effects have been
 * Namespace macros
 For consistency with other backends, the code should be wrapped in QT_BEGIN_NAMESPACE / QT_END_NAMESPACE macros.
 
-
-
-
-
 * Fix mediaplayer.exe UI
 On Windows, the mediaplayer UI has a drop-down menu (for loading clips etc), start/stop buttons, a position slider and a volume slider.  On S60, we just get a blank screen and two blank softkeys, so no clip can be loaded (unless main.cpp is hacked by adding a hard-coded path).
 
 
-
-
-
-
-
-
-
diff --git a/src/3rdparty/phonon/mmf/abstractmediaplayer.cpp b/src/3rdparty/phonon/mmf/abstractmediaplayer.cpp
index 6342f37..ccb94c4 100644
--- a/src/3rdparty/phonon/mmf/abstractmediaplayer.cpp
+++ b/src/3rdparty/phonon/mmf/abstractmediaplayer.cpp
@@ -374,7 +374,7 @@ Phonon::State MMF::AbstractMediaPlayer::phononState(PrivateState state)
 {
     const Phonon::State phononState =
         GroundState == state
-        ?    Phonon::StoppedState
+        ?    Phonon::LoadingState
         :    static_cast<Phonon::State>(state);
 
     return phononState;
diff --git a/src/3rdparty/phonon/mmf/dummyplayer.cpp b/src/3rdparty/phonon/mmf/dummyplayer.cpp
index 9154984..d9e836d 100644
--- a/src/3rdparty/phonon/mmf/dummyplayer.cpp
+++ b/src/3rdparty/phonon/mmf/dummyplayer.cpp
@@ -73,7 +73,7 @@ bool MMF::DummyPlayer::isSeekable() const
 
 Phonon::State MMF::DummyPlayer::state() const
 {
-    return Phonon::StoppedState;
+    return Phonon::LoadingState;
 }
 
 qint64 MMF::DummyPlayer::currentTime() const