Skip to content

Restart song when loading events #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Fernthedev wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Restart song when loading events #5

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59b9656
Restart song when loading events
Fernthedev Dec 27, 2021
4b3882c
Don't wait for events when seeking forward
Fernthedev Dec 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions CustomJSONData/CustomEventCallbackController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@ private void LateUpdate()
return;
}

bool start = false;

foreach (CustomEventCallbackData customEventCallbackData in _customEventCallbackData)
{
while (customEventCallbackData.nextEventIndex < BeatmapData.customEventsData.Count)
Expand All @@ -85,6 +87,14 @@ private void LateUpdate()
break;
}

// Events are before/during start
// This should only be done if the starting time is 0
if (customEventData.time <= SpawningStartTime && SpawningStartTime == 0)
{
start = true;
// TODO: Pause the song so the audio doesn't play while loading?
}

// skip events before song start
if (customEventData.time >= SpawningStartTime || customEventCallbackData.callIfBeforeStartTime)
{
Expand All @@ -94,6 +104,16 @@ private void LateUpdate()
customEventCallbackData.nextEventIndex++;
}
}

// Restart the song since we were loading for events
// this *should* fix the issues caused by the map running in the background while events were loading
if (!start || AudioTimeSource is not AudioTimeSyncController implAudioTimeSource)
{
return;
}

implAudioTimeSource.StartSong(0);
implAudioTimeSource.Resume();
}

public class CustomEventCallbackData
Expand Down