diff options
author | Gareth Stockwell <ext-gareth.stockwell@nokia.com> | 2009-12-02 17:03:48 (GMT) |
---|---|---|
committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-01-11 13:43:54 (GMT) |
commit | 9db0466448b83e99fafcd0b890eb39304b247af9 (patch) | |
tree | b81738016c3012c1237f9061fe75c859e3373288 | |
parent | 1859d5d014578723ecda80d8cd8d61da4d54ea95 (diff) | |
download | Qt-9db0466448b83e99fafcd0b890eb39304b247af9.zip Qt-9db0466448b83e99fafcd0b890eb39304b247af9.tar.gz Qt-9db0466448b83e99fafcd0b890eb39304b247af9.tar.bz2 |
Removed dead code from Phonon MMF backend
The following source types are handled in MediaObject::createPlayer
Invalid, Disc, Stream, Empty
The code removed in this patch is therefore never executed.
Reviewed-by: Frans Englich
(cherry picked from commit 8e21fc62fe40c8e393007516958c216ad8dbd629)
-rw-r--r-- | src/3rdparty/phonon/mmf/abstractmediaplayer.cpp | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/3rdparty/phonon/mmf/abstractmediaplayer.cpp b/src/3rdparty/phonon/mmf/abstractmediaplayer.cpp index 344413d..544762a 100644 --- a/src/3rdparty/phonon/mmf/abstractmediaplayer.cpp +++ b/src/3rdparty/phonon/mmf/abstractmediaplayer.cpp @@ -251,19 +251,9 @@ void MMF::AbstractMediaPlayer::open(const MediaSource &source, RFile& file) break; } - case MediaSource::Invalid: - case MediaSource::Disc: - case MediaSource::Stream: - TRACE_0("Error opening source: type not supported"); - errorMessage = tr("Error opening source: type not supported"); - break; - - case MediaSource::Empty: - TRACE_0("Empty source - doing nothing"); - TRACE_EXIT_0(); - return; + // Other source types are handled in MediaObject::createPlayer - // Protection against adding new media types and forgetting to update this switch + // Protection against adding new media types and forgetting to update this switch default: TRACE_PANIC(InvalidMediaTypePanic); } |