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.

Sign up for GitHub

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

Jump to bottom

Store default recording format after "Resore Defaults", fixing lp1857806 #2414

Merged
merged 4 commits into from
Feb 3, 2020
Merged

Store default recording format after "Resore Defaults", fixing lp1857806 #2414

merged 4 commits into from
Feb 3, 2020

Conversation

daschuer
Copy link
Member

No description provided.

@daschuer daschuer added this to the 2.2.4 milestone Dec 29, 2019
@daschuer daschuer changed the base branch from master to 2.2 December 29, 2019 18:39
@daschuer
Copy link
Member Author

strange: clang fails with (master merged, rebased later)

In file included from src/sources/soundsourcewv.cpp:4:
src/sources/soundsourcewv.h:9:14: error: typedef redefinition with different types ('void' vs 'struct WavpackContext')
typedef void WavpackContext;
             ^
/usr/local/include/wavpack/wavpack.h:283:31: note: previous definition is here
typedef struct WavpackContext WavpackContext;

@daschuer daschuer mentioned this pull request Dec 29, 2019
Merged
@daschuer
Copy link
Member Author

possible fix is here: #2416

@uklotzde
Copy link
Contributor

uklotzde commented Jan 6, 2020

Please add an entry to the change log to closely keep track of bug fixes.

@daschuer
Copy link
Member Author

daschuer commented Jan 8, 2020

Done.

uklotzde
uklotzde suggested changes Jan 12, 2020
View reviewed changes
CHANGELOG Outdated
@@ -1,5 +1,6 @@
==== 2.2.4 2020-mm-dd ====
* Prevent infinite loop when decoding corrupt MP3 files #2417
* Store default recording format after "Resore Defaults" lp:1857806 #2414
Copy link
Contributor

Choose a reason for hiding this comment

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

typo

@daschuer
Copy link
Member Author

Ups .. I have amended the last commit.

@daschuer
Copy link
Member Author

merge?

@uklotzde
Copy link
Contributor

uklotzde commented Feb 3, 2020

Sorry for the delay. We have far too many open PRs.

LGTM. Thank you.

@uklotzde uklotzde merged commit fb5dfa2 into mixxxdj:2.2 Feb 3, 2020
@daschuer daschuer deleted the lp1857806 branch September 26, 2021 17:37
@mixxxbot mixxxbot mentioned this pull request Aug 23, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@uklotzde uklotzde uklotzde requested changes

Assignees
No one assigned
Labels
minor bug
Projects
None yet
Milestone
2.2.4
Development

Successfully merging this pull request may close these issues.
2 participants
@daschuer @uklotzde