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

Restarting Music Fix

Browse Source 
Fixed the music from restarting after unpausing or exiting the menu
This commit is contained in:
JappaWakka 2021-01-21 19:35:48 +01:00 committed by Vitaly Mikhailov
parent 66079e69d0
commit c09656fe38
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,6 +48,7 @@ Public Class LoopStream
If MusicManager._isIntroStarted = True Then If MusicManager._isIntroStarted = True Then
Dim IntroContinueSong As SongContainer = MusicManager.GetSong(MusicManager._introContinueSong) Dim IntroContinueSong As SongContainer = MusicManager.GetSong(MusicManager._introContinueSong)
If IntroContinueSong IsNot Nothing Then If IntroContinueSong IsNot Nothing Then
Logger.Debug($"Play song [{IntroContinueSong.Name}]")
_sourceStream = New VorbisWaveReader(IntroContinueSong.Song) _sourceStream = New VorbisWaveReader(IntroContinueSong.Song)
_enableLooping = True _enableLooping = True
_sourceStream.Position = 0 _sourceStream.Position = 0
@ -56,7 +57,7 @@ Public Class LoopStream
_enableLooping = True _enableLooping = True
_sourceStream.Position = 0 _sourceStream.Position = 0
End If End If
MusicManager._isIntroStarted = False MusicManager._fadeIntoIntro = False
Else Else
Exit While Exit While
End If End If
@ -103,7 +104,7 @@ Public Class MusicManager
' speeds that get added/subtracted from the volume to fade the song ' speeds that get added/subtracted from the volume to fade the song
Private Shared _fadeSpeed As Single = DEFAULT_FADE_SPEED Private Shared _fadeSpeed As Single = DEFAULT_FADE_SPEED
' if the song that gets played after fading completed is an intro to another song ' if the song that gets played after fading completed is an intro to another song
Private Shared _fadeIntoIntro As Boolean = False Public Shared _fadeIntoIntro As Boolean = False
Private Shared _isFadingOut As Boolean = False Private Shared _isFadingOut As Boolean = False
Private Shared _isFadingIn As Boolean = False Private Shared _isFadingIn As Boolean = False
' NAudio properties ' NAudio properties
@ -324,6 +325,7 @@ Public Class MusicManager
End Sub End Sub
Private Shared Sub Play(song As SongContainer) Private Shared Sub Play(song As SongContainer)
Private Shared Sub Play(song As SongContainer, Optional ByVal introSong As SongContainer = Nothing)
If Not song Is Nothing Then If Not song Is Nothing Then
Logger.Debug($"Play song [{song.Name}]") Logger.Debug($"Play song [{song.Name}]")
If Not outputDevice Is Nothing Then If Not outputDevice Is Nothing Then
@ -363,7 +365,7 @@ Public Class MusicManager
End Function End Function
Public Shared Function Play(song As String, playIntro As Boolean, Optional loopSong As Boolean = True) As SongContainer Public Shared Function Play(song As String, playIntro As Boolean, Optional loopSong As Boolean = True) As SongContainer
Return Play(song, playIntro, DEFAULT_FADE_SPEED) Return Play(song, playIntro, DEFAULT_FADE_SPEED, loopSong)
End Function End Function
Public Shared Function Play(song As String, playIntro As Boolean, fadeSpeed As Single, Optional loopSong As Boolean = True) As SongContainer Public Shared Function Play(song As String, playIntro As Boolean, fadeSpeed As Single, Optional loopSong As Boolean = True) As SongContainer
@ -386,7 +388,7 @@ Public Class MusicManager
' setup the continue song ' setup the continue song
_introContinueSong = songName _introContinueSong = songName
' do not repeat media player, do not want intro to loop ' do not repeat media player, do not want intro to loop
'_isLooping = False _isLooping = False
If fadeSpeed > 0F Then If fadeSpeed > 0F Then
_isIntroStarted = False _isIntroStarted = False
@ -400,8 +402,6 @@ Public Class MusicManager
playedSong = introSong playedSong = introSong
' load the next song so the end of the intro doesn't lag
GetSong(song)
End If End If
Else Else
_isIntroStarted = False _isIntroStarted = False