Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR resolves: Ristellise/AegisubDC#36
I have no idea what the person who created the
combine_karaoke
method was thinking. To me, the previous results make no sense, so I changed its behavior to match what I think it should do. I have listed many examples to show what I think the result should be.Example 1 - The line has no collision and the timing of the second line is after the first line:
Before this PR (different k-time compared to the two lines):
After this PR (same k-time)
Example 2 - Lines have timing collision:
Before this PR (different k-time compared to the two lines):
After this PR (same k-time)
Example 3 - The line has no collision and the timing of the first line is after the second line:
Before this PR (different k-time compared to the two lines):
After this PR (different k-time compared to the two lines):
But, please note that
Join (concatenate)
also doesn't work in this third case!