summaryrefslogtreecommitdiffstats
path: root/src/plugins/directshow/player/directshowplayercontrol.h
diff options
context:
space:
mode:
authorYoann Lopes <yoann.lopes@theqtcompany.com>2015-10-31 16:27:36 +0100
committerYoann Lopes <yoann.lopes@theqtcompany.com>2015-11-04 15:04:08 +0000
commit1ed707deeaf91b1b15e3d3175bc5d9f44b585710 (patch)
tree94d9c9c48900339134f3279d07748af314da8aba /src/plugins/directshow/player/directshowplayercontrol.h
parent9ebf1265da2c23ec86201d7f521a9352e0762944 (diff)
DirectShow: fix setting volume when a media is not loaded.
Store the pending volume and apply it once the media is loaded. Change-Id: I6998e9139aa3680220faa871b3116409855a1b35 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
Diffstat (limited to 'src/plugins/directshow/player/directshowplayercontrol.h')
-rw-r--r--src/plugins/directshow/player/directshowplayercontrol.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/directshow/player/directshowplayercontrol.h b/src/plugins/directshow/player/directshowplayercontrol.h
index a42d3c7b1..d59b8ac28 100644
--- a/src/plugins/directshow/player/directshowplayercontrol.h
+++ b/src/plugins/directshow/player/directshowplayercontrol.h
@@ -116,6 +116,7 @@ private:
void scheduleUpdate(int properties);
void emitPropertyChanges();
+ void setVolumeHelper(int volume);
DirectShowPlayerService *m_service;
IBasicAudio *m_audio;
@@ -125,7 +126,8 @@ private:
QMediaPlayer::MediaStatus m_status;
QMediaPlayer::Error m_error;
int m_streamTypes;
- int m_muteVolume;
+ int m_volume;
+ bool m_muted;
qint64 m_position;
qint64 m_pendingPosition;
qint64 m_duration;