kalugin66/webtorrent-desktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not use setVolume for storing global volume

Browse Source
This commit is contained in:
gabriel
2016-05-29 12:38:19 +02:00
committed by Feross Aboukhadijeh
parent 829206e921
commit e3c6049fdb
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
renderer/main.js
View File

@@ -415,8 +415,7 @@ function setVolume (volume) {
if (isCasting()) { if (isCasting()) {
Cast.setVolume(volume) Cast.setVolume(volume)
} else { } else {
// Persist volume across videos state.playing.setVolume = volume
state.setVolume = volume
} }
} }

5
renderer/views/player.js
View File

@@ -51,8 +51,9 @@ function renderMedia (state) {
mediaElement.playbackRate = state.playing.playbackRate mediaElement.playbackRate = state.playing.playbackRate
} }
// Set volume // Set volume
if (state.setVolume !== null && isFinite(state.setVolume)) { if (state.playing.setVolume !== null && isFinite(state.playing.setVolume)) {
mediaElement.volume = state.setVolume mediaElement.volume = state.playing.setVolume
state.playing.setVolume = null
} }
// Switch to the newly added subtitle track, if available // Switch to the newly added subtitle track, if available