diff options
| author | Yoann Lopes <yoann.lopes@digia.com> | 2014-03-04 17:22:47 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-07 15:12:13 +0100 |
| commit | 7d894ca0aabc054d0575139351937987f015e450 (patch) | |
| tree | 30a13e22058f8d5ece219621b7839e2a050deba0 /src/plugins/wmf/player/mfplayersession.h | |
| parent | a07530d6061edbec703ab0590eca103a787068e8 (diff) | |
WMF: each media player now has its own volume.
Instead of setting the volume on the audio session, which is shared by
all QMediaPlayers, we now set the volume on the media player's own audio
stream. This results in all QMediaPlayers correctly having independent
volumes.
[ChangeLog][QtMultimedia][Windows] QMediaPlayer::setVolume() does not
affect the volume of other QMediaPlayers anymore.
Task-number: QTBUG-30317
Change-Id: I8ea8ec47fc86127da01dc5c8247fb6f72c834630
Reviewed-by: Wouter Huysentruit <wouter_huysentruit@hotmail.com>
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
Diffstat (limited to 'src/plugins/wmf/player/mfplayersession.h')
| -rw-r--r-- | src/plugins/wmf/player/mfplayersession.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/wmf/player/mfplayersession.h b/src/plugins/wmf/player/mfplayersession.h index e7f8dcffa..3ba43ce58 100644 --- a/src/plugins/wmf/player/mfplayersession.h +++ b/src/plugins/wmf/player/mfplayersession.h @@ -152,7 +152,7 @@ private: IMFPresentationClock *m_presentationClock; IMFRateControl *m_rateControl; IMFRateSupport *m_rateSupport; - IMFSimpleAudioVolume *m_volumeControl; + IMFAudioStreamVolume *m_volumeControl; IPropertyStore *m_netsourceStatistics; PROPVARIANT m_varStart; UINT64 m_duration; @@ -218,6 +218,8 @@ private: int m_volume; bool m_muted; + void setVolumeInternal(int volume); + void createSession(); void setupPlaybackTopology(IMFMediaSource *source, IMFPresentationDescriptor *sourcePD); IMFTopologyNode* addSourceNode(IMFTopology* topology, IMFMediaSource* source, |