tyler.durden/P3D-Legacy
1
0
Fork 0
mirror of https://github.com/P3D-Legacy/P3D-Legacy.git synced 2025-07-28 00:04:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Actually fix the music sharing its volume with the soundeffects

Browse Source
This commit is contained in:
JappaWakkaP3D 2020-10-25 15:27:55 +01:00 committed by Vitaly Mikhailov
parent bd290df9bb
commit 620f4d8325
1 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
P3D/Resources/Sound/MusicManager.vb
View File

@ -94,7 +94,7 @@ Public Class MusicManager
Private Shared _isFadingIn As Boolean = False Private Shared _isFadingIn As Boolean = False
' NAudio properties ' NAudio properties
Public Shared outputDevice As WaveOutEvent Public Shared outputDevice As WaveOutEvent
Public Shared audioFile As VorbisWaveReader Public Shared audioFile As WaveChannel32
Public Shared _loop As WaveStream Public Shared _loop As WaveStream
Public Shared Property MasterVolume As Single = 1.0F Public Shared Property MasterVolume As Single = 1.0F
@ -271,8 +271,8 @@ Public Class MusicManager
Public Shared Sub UpdateVolume() Public Shared Sub UpdateVolume()
_lastVolume = Volume * MasterVolume _lastVolume = Volume * MasterVolume
If Not outputDevice Is Nothing Then If Not audioFile Is Nothing Then
outputDevice.Volume = Volume * MasterVolume audioFile.Volume = Volume * MasterVolume
End If End If
End Sub End Sub
@ -317,13 +317,13 @@ Public Class MusicManager
outputDevice.Dispose() outputDevice.Dispose()
End If End If
outputDevice = New WaveOutEvent() outputDevice = New WaveOutEvent()
audioFile = New VorbisWaveReader(song.Song) audioFile = New NAudio.Wave.WaveChannel32(New VorbisWaveReader(song.Song))
_loop = New LoopStream(audioFile, _isLooping) _loop = New LoopStream(audioFile, _isLooping)
outputDevice.Init(_loop) outputDevice.Init(_loop)
If Paused = False Then If Paused = False Then
outputDevice.Play() outputDevice.Play()
End If End If
outputDevice.Volume = Volume * MasterVolume audioFile.Volume = Volume * MasterVolume
_currentSongExists = True _currentSongExists = True
_currentSongName = song.Name _currentSongName = song.Name
_currentSong = song _currentSong = song