summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/phonon/mmf/abstractmediaplayer.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/3rdparty/phonon/mmf/abstractmediaplayer.cpp')
-rw-r--r--src/3rdparty/phonon/mmf/abstractmediaplayer.cpp16
1 files changed, 11 insertions, 5 deletions
diff --git a/src/3rdparty/phonon/mmf/abstractmediaplayer.cpp b/src/3rdparty/phonon/mmf/abstractmediaplayer.cpp
index a3affef..703590b 100644
--- a/src/3rdparty/phonon/mmf/abstractmediaplayer.cpp
+++ b/src/3rdparty/phonon/mmf/abstractmediaplayer.cpp
@@ -178,13 +178,8 @@ void MMF::AbstractMediaPlayer::setTickInterval(qint32 interval)
Phonon::ErrorType MMF::AbstractMediaPlayer::errorType() const
{
- TRACE_CONTEXT(AbstractMediaPlayer::errorType, EAudioApi);
- TRACE_ENTRY("state %d", m_state);
-
const Phonon::ErrorType result = (ErrorState == m_state)
? m_error : NoError;
-
- TRACE_RETURN("%d", result);
}
QString MMF::AbstractMediaPlayer::errorString() const
@@ -466,6 +461,17 @@ void MMF::AbstractMediaPlayer::changeState(PrivateState newState)
TRACE_EXIT_0();
}
+void MMF::AbstractMediaPlayer::setError(Phonon::ErrorType error)
+{
+ TRACE_CONTEXT(AbstractMediaPlayer::setError, EAudioInternal);
+ TRACE_ENTRY("state %d error %d", m_state, error);
+
+ m_error = error;
+ changeState(ErrorState);
+
+ TRACE_EXIT_0();
+}
+
qint64 MMF::AbstractMediaPlayer::toMilliSeconds(const TTimeIntervalMicroSeconds &in)
{
return in.Int64() / 1000;