diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-20 15:15:22 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-20 15:16:14 (GMT) |
| commit | de5e292f706ab05d2a8a213bbd73db06a61eb9d2 (patch) | |
| tree | 75bb15bf233340dedbf4a3023c3a5ce2e83155f5 /src/imports/multimedia | |
| parent | 935240ce8a06a67cab4ed15311f4c89ca8d17b77 (diff) | |
| download | Qt-de5e292f706ab05d2a8a213bbd73db06a61eb9d2.zip Qt-de5e292f706ab05d2a8a213bbd73db06a61eb9d2.tar.gz Qt-de5e292f706ab05d2a8a213bbd73db06a61eb9d2.tar.bz2 | |
Rename m_volume to m_vol
HP-UX has a #define somewhere for m_volume
Diffstat (limited to 'src/imports/multimedia')
| -rw-r--r-- | src/imports/multimedia/qdeclarativemediabase.cpp | 10 | ||||
| -rw-r--r-- | src/imports/multimedia/qdeclarativemediabase_p.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/imports/multimedia/qdeclarativemediabase.cpp b/src/imports/multimedia/qdeclarativemediabase.cpp index 5bad969..bbd5901 100644 --- a/src/imports/multimedia/qdeclarativemediabase.cpp +++ b/src/imports/multimedia/qdeclarativemediabase.cpp @@ -232,7 +232,7 @@ QDeclarativeMediaBase::QDeclarativeMediaBase() , m_loaded(false) , m_muted(false) , m_position(0) - , m_volume(1.0) + , m_vol(1.0) , m_playbackRate(1.0) , m_mediaService(0) , m_playerControl(0) @@ -313,7 +313,7 @@ void QDeclarativeMediaBase::setObject(QObject *object) } // Init - m_playerControl->setVolume(m_volume * 100); + m_playerControl->setVolume(m_vol * 100); m_playerControl->setMuted(m_muted); m_playerControl->setPlaybackRate(m_playbackRate); @@ -457,15 +457,15 @@ void QDeclarativeMediaBase::setPosition(int position) qreal QDeclarativeMediaBase::volume() const { - return m_playerControl == 0 ? m_volume : qreal(m_playerControl->volume()) / 100; + return m_playerControl == 0 ? m_vol : qreal(m_playerControl->volume()) / 100; } void QDeclarativeMediaBase::setVolume(qreal volume) { - if (m_volume == volume) + if (m_vol == volume) return; - m_volume = volume; + m_vol = volume; if (m_playerControl != 0) m_playerControl->setVolume(qRound(volume * 100)); diff --git a/src/imports/multimedia/qdeclarativemediabase_p.h b/src/imports/multimedia/qdeclarativemediabase_p.h index 43df54d..7d262e0 100644 --- a/src/imports/multimedia/qdeclarativemediabase_p.h +++ b/src/imports/multimedia/qdeclarativemediabase_p.h @@ -154,7 +154,7 @@ protected: bool m_loaded; bool m_muted; int m_position; - qreal m_volume; + qreal m_vol; qreal m_playbackRate; QMediaService *m_mediaService; QMediaPlayerControl *m_playerControl; |