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

Add support for the SeratoMarkers_ GEOB tag (Hotcues/Loops/Track Color) #2495

Merged
merged 48 commits into from
Feb 16, 2020

Conversation

Holzhaus
Copy link
Member

@Holzhaus Holzhaus commented Feb 9, 2020

This augments the Serato Markers2 tag parser that was added in #2323. The Serato Markers_ contains the first 5 Hotcues, the first 9 saved loops and the library track color.

All of this information (and more) is also stored in the Serato Markers2 tag, but Serato will prefer information from this tag if it's present. If we add support for writing Serato Markers2, we should also write Serato Markers_ because otherwise our changes would not be picked up by Serato.

@Holzhaus Holzhaus changed the title [WIP] Add support for the SeratoMarkers_ GEOB tag (Hotcues/Loops/Track Color) Add support for the SeratoMarkers_ GEOB tag (Hotcues/Loops/Track Color) Feb 9, 2020
src/track/serato/markers.cpp Outdated Show resolved Hide resolved
<< (quint8)m_type
<< (quint8)m_isLocked;
return data;
}
Copy link
Member

Choose a reason for hiding this comment

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

This also required a lot comments, including examples.

Copy link
Member Author

Choose a reason for hiding this comment

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

src/track/serato/markers.cpp Outdated Show resolved Hide resolved
src/track/serato/markers.cpp Outdated Show resolved Hide resolved
src/track/serato/markers.cpp Show resolved Hide resolved
src/track/serato/markers2.h Outdated Show resolved Hide resolved
src/track/serato/markers.h Outdated Show resolved Hide resolved
src/track/serato/markers2.h Outdated Show resolved Hide resolved
src/track/serato/markers2.h Outdated Show resolved Hide resolved
src/track/serato/markers2.h Outdated Show resolved Hide resolved
@Holzhaus
Copy link
Member Author

Holzhaus commented Feb 11, 2020

I almost completely rewrote the parser code using QDataStream. IMHO it looks much cleaner now. Please test and review.

@Holzhaus Holzhaus requested a review from daschuer February 11, 2020 13:09
Copy link
Member

@daschuer daschuer left a comment

Choose a reason for hiding this comment

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

Nice changes. Here some more comments.

src/test/seratomarkerstest.cpp Outdated Show resolved Hide resolved
src/test/seratomarkerstest.cpp Outdated Show resolved Hide resolved
src/track/serato/markers.cpp Outdated Show resolved Hide resolved
src/track/serato/markers.cpp Outdated Show resolved Hide resolved
src/track/serato/markers.cpp Outdated Show resolved Hide resolved
src/track/serato/markers.cpp Outdated Show resolved Hide resolved
src/track/serato/markers2.h Outdated Show resolved Hide resolved
@Holzhaus
Copy link
Member Author

Merge?

@Holzhaus
Copy link
Member Author

I added some improvements that @uklotzde pointed out in PR #2499. I also move to QDataStream for SeratoMarkers2 parsing. I think this is ready now. Please review.

Copy link
Member

@daschuer daschuer left a comment

Choose a reason for hiding this comment

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

I have added some nit picks about possible implementation defined issues.

src/test/seratomarkers2test.cpp Outdated Show resolved Hide resolved
src/track/serato/markers.cpp Outdated Show resolved Hide resolved
src/track/serato/markers.cpp Outdated Show resolved Hide resolved
src/track/serato/markers2.cpp Show resolved Hide resolved
src/track/serato/markers2.cpp Show resolved Hide resolved
src/track/serato/markers2.cpp Show resolved Hide resolved
src/track/serato/markers2.cpp Outdated Show resolved Hide resolved
@Holzhaus
Copy link
Member Author

Had to remove the last commit since it made the tests fail

@Holzhaus Holzhaus requested a review from daschuer February 16, 2020 16:42
@daschuer
Copy link
Member

LGTM, Thank you.

@daschuer daschuer merged commit 2702d33 into mixxxdj:master Feb 16, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants