Changeset 769 for trunk/src/3rdparty/phonon/mmf/abstractplayer.cpp

Timestamp:

Aug 2, 2010, 9:27:30 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.3 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/3rdparty/phonon/mmf/abstractplayer.cpp (modified) (3 diffs)

trunk/src/3rdparty/phonon/mmf/abstractplayer.cpp

@@ -49 +49 @@
         m_transitionTime = player->m_transitionTime;
         m_prefinishMark = player->m_prefinishMark;
+
+
+
+
+
     }
 }
@@ -97 +102 @@
 //-----------------------------------------------------------------------------
 
-void MMF::AbstractPlayer::setVideoOutput(VideoOutput* videoOutput)
+void MMF::AbstractPlayer::setVideoOutput(VideoOutput* videoOutput)
 {
     m_videoOutput = videoOutput;
@@ -142 +147 @@
 }
 
-Phonon::State MMF::AbstractPlayer::phononState(PrivateState state)
+Phonon::State MMF::AbstractPlayer::phononState(PrivateState state)
 {
     const Phonon::State phononState =