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

Fix some music memory leaks

Browse Source
This commit is contained in:
JappaWakka 2025-02-28 11:01:53 +01:00
parent 2400d68fb6
commit a7bb36f10c
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -71,6 +71,7 @@ Public Class LoopStream
MusicManager._currentSong = NextSong MusicManager._currentSong = NextSong
_enableLooping = NextSong.IsLoop _enableLooping = NextSong.IsLoop
Else Else
_sourceStream.Dispose()
If MusicManager.GetSong("silence").AudioType = ".ogg" Then If MusicManager.GetSong("silence").AudioType = ".ogg" Then
_sourceStream = New VorbisWaveReader(MusicManager.GetSong("silence").Song) _sourceStream = New VorbisWaveReader(MusicManager.GetSong("silence").Song)
ElseIf MusicManager.GetSong("silence").AudioType = ".mp3" Then ElseIf MusicManager.GetSong("silence").AudioType = ".mp3" Then
@ -142,9 +143,6 @@ Public Class MusicManager
Public Shared _isCurrentlyFading As Boolean = False Public Shared _isCurrentlyFading As Boolean = False
' NAudio properties ' NAudio properties
Public Shared outputDevice As WaveOutEvent Public Shared outputDevice As WaveOutEvent
Public Shared audioFileOGG As VorbisWaveReader
Public Shared audioFileMP3 As Mp3FileReader
Public Shared audioFileWMA As MediaFoundationReader
Public Shared _stream As WaveChannel32 Public Shared _stream As WaveChannel32
Public Shared EnableLooping As Boolean = True Public Shared EnableLooping As Boolean = True
@ -368,15 +366,13 @@ Public Class MusicManager
If _stream IsNot Nothing Then If _stream IsNot Nothing Then
_stream.Dispose() _stream.Dispose()
End If End If
If song.AudioType = ".ogg" Then If song.AudioType = ".ogg" Then
audioFileOGG = New VorbisWaveReader(song.Song) _stream = New NAudio.Wave.WaveChannel32(New LoopStream(New VorbisWaveReader(song.Song), song.IsLoop))
_stream = New NAudio.Wave.WaveChannel32(New LoopStream(audioFileOGG, song.IsLoop))
ElseIf song.AudioType = ".mp3" Then ElseIf song.AudioType = ".mp3" Then
audioFileMP3 = New Mp3FileReader(song.Song) _stream = New NAudio.Wave.WaveChannel32(New LoopStream(New Mp3FileReader(song.Song), song.IsLoop))
_stream = New NAudio.Wave.WaveChannel32(New LoopStream(audioFileMP3, song.IsLoop))
ElseIf song.AudioType = ".wma" Then ElseIf song.AudioType = ".wma" Then
audioFileWMA = New MediaFoundationReader(song.Song) _stream = New NAudio.Wave.WaveChannel32(New LoopStream(New MediaFoundationReader(song.Song), song.IsLoop))
_stream = New NAudio.Wave.WaveChannel32(New LoopStream(audioFileWMA, song.IsLoop))
End If End If
Try Try
outputDevice.Init(_stream) outputDevice.Init(_stream)