diff options
| author | Gareth Stockwell <gareth.stockwell@sosco.com> | 2009-08-21 10:39:36 (GMT) |
|---|---|---|
| committer | Gareth Stockwell <gareth.stockwell@sosco.com> | 2009-08-21 10:39:36 (GMT) |
| commit | 3f39d630d3dcc161c4a85127129274ca7ea857a2 (patch) | |
| tree | ba726756cfdd87883fd546ff2f0e5c2b20e64eac /src/3rdparty/phonon/mmf/abstractplayer.cpp | |
| parent | 932c48658656fa328507b16e39c3a6cc820ef15e (diff) | |
| download | Qt-3f39d630d3dcc161c4a85127129274ca7ea857a2.zip Qt-3f39d630d3dcc161c4a85127129274ca7ea857a2.tar.gz Qt-3f39d630d3dcc161c4a85127129274ca7ea857a2.tar.bz2 | |
Further tidied up volume handling
Diffstat (limited to 'src/3rdparty/phonon/mmf/abstractplayer.cpp')
| -rw-r--r-- | src/3rdparty/phonon/mmf/abstractplayer.cpp | 34 |
1 files changed, 4 insertions, 30 deletions
diff --git a/src/3rdparty/phonon/mmf/abstractplayer.cpp b/src/3rdparty/phonon/mmf/abstractplayer.cpp index 7786d8b..870b50f 100644 --- a/src/3rdparty/phonon/mmf/abstractplayer.cpp +++ b/src/3rdparty/phonon/mmf/abstractplayer.cpp @@ -27,18 +27,16 @@ using namespace Phonon::MMF; // Constructor / destructor //----------------------------------------------------------------------------- -MMF::AbstractPlayer::AbstractPlayer() : - m_tickInterval(DefaultTickInterval) - , m_volume(InitialVolume) +MMF::AbstractPlayer::AbstractPlayer() + : m_tickInterval(DefaultTickInterval) , m_transitionTime(0) , m_prefinishMark(0) { } -MMF::AbstractPlayer::AbstractPlayer(const AbstractPlayer& player) : - m_tickInterval(player.tickInterval()) - , m_volume(player.volume()) +MMF::AbstractPlayer::AbstractPlayer(const AbstractPlayer& player) + : m_tickInterval(player.tickInterval()) , m_transitionTime(player.transitionTime()) , m_prefinishMark(player.prefinishMark()) { @@ -81,27 +79,3 @@ void MMF::AbstractPlayer::setTransitionTime(qint32 time) } -//----------------------------------------------------------------------------- -// VolumeControlInterface -//----------------------------------------------------------------------------- - -qreal MMF::AbstractPlayer::volume() const -{ - return m_volume; -} - -bool MMF::AbstractPlayer::setVolume(qreal volume) -{ - bool result = false; - if(volume != m_volume) - { - result = doSetVolume(volume); - if(result) - { - m_volume = volume; - } - } - return result; -} - - |