equal
deleted
inserted
replaced
46 m_videoOutput = player->m_videoOutput; |
46 m_videoOutput = player->m_videoOutput; |
47 m_volume = player->m_volume; |
47 m_volume = player->m_volume; |
48 m_tickInterval = player->m_tickInterval; |
48 m_tickInterval = player->m_tickInterval; |
49 m_transitionTime = player->m_transitionTime; |
49 m_transitionTime = player->m_transitionTime; |
50 m_prefinishMark = player->m_prefinishMark; |
50 m_prefinishMark = player->m_prefinishMark; |
|
51 |
|
52 // This is to prevent unwanted state transitions occurring as a result |
|
53 // of MediaObject::switchToNextSource() during playlist playback. |
|
54 if (StoppedState == player->m_state) |
|
55 m_state = player->m_state; |
51 } |
56 } |
52 } |
57 } |
53 |
58 |
54 //----------------------------------------------------------------------------- |
59 //----------------------------------------------------------------------------- |
55 // MediaObjectInterface |
60 // MediaObjectInterface |
139 Phonon::State MMF::AbstractPlayer::phononState() const |
144 Phonon::State MMF::AbstractPlayer::phononState() const |
140 { |
145 { |
141 return phononState(m_state); |
146 return phononState(m_state); |
142 } |
147 } |
143 |
148 |
144 Phonon::State MMF::AbstractPlayer::phononState(PrivateState state) |
149 Phonon::State MMF::AbstractPlayer::phononState(PrivateState state) const |
145 { |
150 { |
146 const Phonon::State phononState = |
151 const Phonon::State phononState = |
147 GroundState == state |
152 GroundState == state |
148 ? Phonon::LoadingState |
153 ? Phonon::LoadingState |
149 : static_cast<Phonon::State>(state); |
154 : static_cast<Phonon::State>(state); |