Serato color types #11228
Merged
Serato color types #11228
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
daschuer
force-pushed
the
fix-serato-track-color-reset-on-import_1
branch
from
cc62391
to
5c9b36e
Compare
Holzhaus
requested changes
Jan 31, 2023
src/track/serato/tags.cpp
Outdated
| return std::nullopt; | ||
| } | ||
|
|
||
| return std::optional<RgbColor::optional_t>{SeratoTags::storedToDisplayedTrackColor(*color)}; | ||
| return pStoredColor->toDisplayedColor(); |
There was a problem hiding this comment.
This looks like reintroduces the bug fixed in #11217. This toDisplayedColor() call may return nullopt if the tag color is set to "no color". The SeratoTags::getTrackColor function that it's used in may also return nullopt if no tag contains color information. From the callers perspective, these cases can only be distinguishe if we return the nested optional here.
That said, the function signature still has the nested optional, so the compiler is probably smart enough to figure that out automatically. Anyway, I find that code a bit confusing and would prefer if you made the nesting explicit, as before.
This makes the intention of the function more visible.
Holzhaus
approved these changes
Feb 2, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 introduces SeratoStoredTrackColor and SeratoStoredHotcueColor along with the common base class SeratoStoredColor.
With the help of these Types the color conversion should be automatically correct and well documented.
A positive side effect is that CueInfo now always have the displayed color representation.