Skip to content

Fix build with EXTRA_METADATA enabled / Update dirty flag#2652

Merged
daschuer merged 7 commits into
mixxxdj:masterfrom
uklotzde:extra_metadata
Apr 12, 2020
Merged

Fix build with EXTRA_METADATA enabled / Update dirty flag#2652
daschuer merged 7 commits into
mixxxdj:masterfrom
uklotzde:extra_metadata

Conversation

@uklotzde
Copy link
Copy Markdown
Contributor

@uklotzde uklotzde commented Apr 11, 2020 •
edited
Loading

@daschuer The EXTRA_METADATA feature is broken, caused by #2645.

Update: I might have found a minor bug. The dirty flag was not updated when merging re-imported metadata. I also decided to update the documentation, because I got confused by what I had written originally 🙈

@uklotzde uklotzde requested a review from daschuer April 11, 2020 17:29
@uklotzde uklotzde added this to the 2.3.0 milestone Apr 11, 2020
@uklotzde uklotzde changed the title Fix build with EXTRA_METADATA enabled Fix build with EXTRA_METADATA enabled / Update dirty flag Apr 11, 2020
@daschuer
Copy link
Copy Markdown
Member

daschuer commented Apr 12, 2020

Sorry for eating my dog food :-/
Where do you usually define EXTRA_METADATA? For Testing I have put it into util/macros.h Just building.

daschuer
daschuer reviewed Apr 12, 2020
View reviewed changes
Comment thread src/track/trackrecord.cpp Outdated
modified |= copyIfNotNull(pMergedTrackInfo->ptrLyricist(), importedTrackInfo.getLyricist());
modified |= copyIfNotNull(pMergedTrackInfo->ptrMood(), importedTrackInfo.getMood());
modified |= copyIfNotNull(pMergedTrackInfo->ptrMovement(), importedTrackInfo.getMovement());
modified |= copyIfNotNull(pMergedTrackInfo->ptrMusicBrainzArtistId(), importedTrackInfo.getMusicBrainzArtistId());
Copy link
Copy Markdown
Member

@daschuer daschuer Apr 12, 2020

Choose a reason for hiding this comment

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

Unfortunately these line are exceeding the GitHub diff view. Please break them, or use the our GitHub pre-comit hook.

Copy link
Copy Markdown
Contributor Author

@uklotzde uklotzde Apr 12, 2020

Choose a reason for hiding this comment

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

I tried to keep the formatting to reduce the risk for merge conflicts. Now exactly that happened during reformatting ;) Fixed.

@uklotzde
Copy link
Copy Markdown
Contributor Author

uklotzde commented Apr 12, 2020

Sorry for eating my dog food :-/
Where do you usually define EXTRA_METADATA? For Testing I have put it into util/macros.h Just building.

Oh, you are right, now I remember. We have no build flag/feature for this particular define. It is only set implicitly with -DAOIDE=ON (CMake). This might be the reason why the bugs slipped through unnoticed.

daschuer
daschuer approved these changes Apr 12, 2020
View reviewed changes
Copy link
Copy Markdown
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.

Thank you.

@daschuer
Copy link
Copy Markdown
Member

daschuer commented Apr 12, 2020

Now it builds.

@daschuer daschuer merged commit 53498cb into mixxxdj:master Apr 12, 2020
@daschuer
Copy link
Copy Markdown
Member

daschuer commented Apr 12, 2020

I have added https://www.mixxx.org/wiki/doku.php/coding_guidelines#non-const_references
I hope we can tweak it in a way that it acceptable for you as well. Please have a look.

@uklotzde uklotzde deleted the extra_metadata branch April 13, 2020 20:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@daschuer daschuer daschuer approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

2.3.0

Development

Successfully merging this pull request may close these issues.

2 participants

@uklotzde @daschuer