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

Remove offensive language (Pt. 1) #11942

Merged
merged 17 commits into from
Sep 10, 2023

Conversation

Holzhaus
Copy link
Member

@Holzhaus Holzhaus commented Sep 8, 2023

This is a partial fix for #11931. What is missing is the CO group rename of [Master] and the EngineMaster rename, which would affect way more files.

Copy link
Member

@Swiftb0y Swiftb0y left a comment

Choose a reason for hiding this comment

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

AudioPath::AudioPathType enum members (in soundmanagerutil.h) is not yet converted. Didn't do a thorough exhaustiveness check apart from that.

src/engine/enginemaster.cpp Outdated Show resolved Hide resolved
src/engine/enginemaster.cpp Outdated Show resolved Hide resolved
@Holzhaus
Copy link
Member Author

Holzhaus commented Sep 9, 2023

AudioPath::AudioPathType enum members (in soundmanagerutil.h) is not yet converted. Didn't do a thorough exhaustiveness check apart from that.

I added this in 43535a7. I think the PR is big enough now, let's do further changes in subsequent PRs to keep stuff reviewable.

@Holzhaus
Copy link
Member Author

Holzhaus commented Sep 9, 2023

Ah, and please merge this 2.4 into main before merging this PR (if necessary). This will make it easier to resolve conflicts afterwards, because I guess there will be a bunch of them due to the channelcount/samplerate refactoring.

Corresponding manual PR is here btw: mixxxdj/manual#578

@Swiftb0y
Copy link
Member

please merge this 2.4 into main before merging this PR (if necessary)

I assume this is not necessary anymore since you just did that an hour ago, right?

Copy link
Member

@Swiftb0y Swiftb0y left a comment

Choose a reason for hiding this comment

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

LGTM. any objections?

static unsigned char maxChannelsForType(AudioPathType type);

uint hashValue() const {
enum class AudioPathType : int {
Copy link
Member

Choose a reason for hiding this comment

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

any particular reason for specifying the underlying type explicitly?

Copy link
Member Author

@Holzhaus Holzhaus Sep 10, 2023

Choose a reason for hiding this comment

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

any particular reason for specifying the underlying type explicitly?

There is code that uses the enum's int value and converts between the types. Although the underlying type of a scoped enum class is always int if not otherwise specified, I thought that explicit is better than implicit and specifying a type shows that we actually care about the underlying type and want to use int here.

Copy link
Member

Choose a reason for hiding this comment

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

I think its only important to specify the underlying type when doing a bit_cast/reinterpret_cast on a struct that contains this. Otherwise the type is only specified to be as many bits wide as required to hold all enum values...

Just because we static_cast from and to int for this enum doesn't really mean that it needs to be represented in memory as an int... Anyways, I don't really see the usage warranted here, but idc. Just my two cents.

@Holzhaus
Copy link
Member Author

Holzhaus commented Sep 10, 2023

Feel free to merge. I have a follow-up PR in progress where we rename to EngineMixer and a few other variable names and comments are fixed.

@Swiftb0y
Copy link
Member

Welp, here goes nothing. Lets see how many conflicts this creates.

@Swiftb0y Swiftb0y merged commit 082c75f into mixxxdj:2.4 Sep 10, 2023
11 checks passed
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.

2 participants