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

Odd behaviour of libz decoding of cover_default.png at TracksTreeMode… #1708

Merged
merged 2 commits into from
Jun 11, 2018
Merged

Odd behaviour of libz decoding of cover_default.png at TracksTreeMode… #1708

merged 2 commits into from
Jun 11, 2018

Conversation

WaylonR
Copy link
Contributor

@WaylonR WaylonR commented Jun 11, 2018

…l::addCoverArt bypassed by using the SVG version

Using the PNG version, caused the UI/Thread 1 to lock up.

…l::addCoverArt bypassed by using the SVG version
res/mixxx.qrc Outdated
@@ -3,6 +3,7 @@
<file>../LICENSE</file>
<file>images/ic_mixxx_window.png</file>
<file>images/library/cover_default.png</file>
Copy link
Contributor

Choose a reason for hiding this comment

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

remove the PNG image here and delete the PNG file

res/mixxx.qrc Outdated
@@ -3,6 +3,7 @@
<file>../LICENSE</file>
<file>images/ic_mixxx_window.png</file>
<file>images/library/cover_default.png</file>
<file>images/templates/cover_default.svg</file>
Copy link
Contributor

Choose a reason for hiding this comment

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

move this to images/library instead of images/templates

@Be-ing
Copy link
Contributor

Be-ing commented Jun 11, 2018

Before we can merge your code, please sign the Mixxx Contributor Agreement and comment here when you have. In a nutshell, it allows us to distribute your work under the GPL as well as the Mac App Store which has terms that conflict with the GPL (refer to the link for the full legalese).

@WaylonR
Copy link
Contributor Author

WaylonR commented Jun 11, 2018

Signed.

@Be-ing
Copy link
Contributor

Be-ing commented Jun 11, 2018

For the future, please use shorter text for your short commit message. You can explain more details in the rest of the commit message.

Files and resource config changed.
@Be-ing
Copy link
Contributor

Be-ing commented Jun 11, 2018

Looks good to me, thanks!

@Be-ing Be-ing merged commit dcdf9f5 into mixxxdj:jmigual-library-redesign Jun 11, 2018
@Be-ing Be-ing added this to the 2.2.0 milestone Jun 13, 2018
@Be-ing Be-ing added the library label Jun 13, 2018
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