diff options
| author | Frans Englich <frans.englich@nokia.com> | 2009-09-29 16:20:44 (GMT) |
|---|---|---|
| committer | Frans Englich <frans.englich@nokia.com> | 2009-09-29 16:20:44 (GMT) |
| commit | 946b656791cef433b249ad0bebd2143a1b54c6f4 (patch) | |
| tree | e01047632f83a82eae0d20b6fd984ecf92be7d4b /src/3rdparty/phonon/mmf/abstractplayer.cpp | |
| parent | a9ea6e24db0e25ec8c84c9a29356aac999421d07 (diff) | |
| parent | 1cbe6b2126a10ad846167d147b4cfbf3c6d9b402 (diff) | |
| download | Qt-946b656791cef433b249ad0bebd2143a1b54c6f4.zip Qt-946b656791cef433b249ad0bebd2143a1b54c6f4.tar.gz Qt-946b656791cef433b249ad0bebd2143a1b54c6f4.tar.bz2 | |
Merge branch 'mmfphonon' of scm.dev.nokia.troll.no:qt/qt-s60-public into mmfphonon
Conflicts:
src/3rdparty/phonon/mmf/abstractplayer.cpp
Diffstat (limited to 'src/3rdparty/phonon/mmf/abstractplayer.cpp')
| -rw-r--r-- | src/3rdparty/phonon/mmf/abstractplayer.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/3rdparty/phonon/mmf/abstractplayer.cpp b/src/3rdparty/phonon/mmf/abstractplayer.cpp index 0d97272..62fccef 100644 --- a/src/3rdparty/phonon/mmf/abstractplayer.cpp +++ b/src/3rdparty/phonon/mmf/abstractplayer.cpp @@ -34,6 +34,7 @@ MMF::AbstractPlayer::AbstractPlayer() : m_videoOutput(0) , m_state(GroundState) , m_error(NoError) + , m_volume(InitialVolume) , m_tickInterval(DefaultTickInterval) , m_transitionTime(0) , m_prefinishMark(0) @@ -45,6 +46,7 @@ MMF::AbstractPlayer::AbstractPlayer(const AbstractPlayer& player) : m_videoOutput(player.m_videoOutput) , m_state(GroundState) , m_error(NoError) + , m_volume(player.m_volume) , m_tickInterval(player.tickInterval()) , m_transitionTime(player.transitionTime()) , m_prefinishMark(player.prefinishMark()) @@ -89,6 +91,16 @@ void MMF::AbstractPlayer::setTransitionTime(qint32 time) //----------------------------------------------------------------------------- +// VolumeObserver +//----------------------------------------------------------------------------- + +void MMF::AbstractPlayer::volumeChanged(qreal volume) +{ + m_volume = volume; +} + + +//----------------------------------------------------------------------------- // Video output //----------------------------------------------------------------------------- |