Skip to content
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.

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

Fix trim when importing WAV #75261

Merged
merged 1 commit into from
Jun 9, 2023
Merged

Conversation

AThousandShips
Copy link
Member

@AThousandShips AThousandShips commented Mar 23, 2023

Regression from #59170

It seems the trim condition was changed from !loop to (loop_mode != AudioStreamSample::LOOP_DISABLED) which are opposite

This also affects 3.x due to backport, and I have a 3.x version of this fix and can open PR for it if this gets accepted and backport is wanted.

Fixes #75236

3.x version: #78048

@AThousandShips AThousandShips requested a review from a team as a code owner March 23, 2023 15:27
@Chaosus Chaosus added this to the 4.1 milestone Mar 23, 2023
@fire fire requested a review from a team May 29, 2023 12:07
@AThousandShips
Copy link
Member Author

Could someone take a look at this?

Copy link
Member

@akien-mga akien-mga left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My bad, good catch!

@akien-mga akien-mga added cherrypick:3.x Considered for cherry-picking into a future 3.x release cherrypick:3.5 Considered for cherry-picking into a future 3.5.x release labels Jun 9, 2023
@akien-mga akien-mga merged commit 0e0758c into godotengine:master Jun 9, 2023
@akien-mga akien-mga removed cherrypick:3.x Considered for cherry-picking into a future 3.x release cherrypick:3.5 Considered for cherry-picking into a future 3.5.x release labels Jun 9, 2023
@akien-mga
Copy link
Member

Thanks!

@AThousandShips
Copy link
Member Author

Thank you!

@AThousandShips AThousandShips deleted the wav_trim branch June 9, 2023 13:37
@YuriSizov
Copy link
Contributor

Cherry-picked for 4.0.4.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Godot 4 "Trim" audio import setting does nothing
5 participants