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

Jack2 capture_client.c #12

Merged
merged 6 commits into from
Dec 29, 2021
Merged

Jack2 capture_client.c #12

merged 6 commits into from
Dec 29, 2021

Conversation

dvzrv
Copy link
Collaborator

@dvzrv dvzrv commented Nov 25, 2021

example-clients/capture_client.c:
Merge the jack2 version of capture_client.c into this repository, after
extracting its history using git-filter-repo.
The jack2 version of the file had been added in modified form, which
makes a normal rebased merge on top of the original version impossible.

Relates to #9

example-clients/capture_client.c:
Remove the original capture_client.c, as in the jack2 repository it was
introduced in modified form, which makes matching the file history not
possible.
@dvzrv dvzrv added the enhancement New feature or request label Nov 25, 2021
@dvzrv dvzrv requested a review from falkTX November 25, 2021 14:21
@dvzrv dvzrv self-assigned this Nov 25, 2021
{
jack_client_t *client;
jack_thread_info_t thread_info;
jack_thread_info_t thread_info;
Copy link
Member

Choose a reason for hiding this comment

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

tab vs spaces conflict here, will resolve after merging.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I think a general code cleanup PR would be great once all the current changes are merged.
There is a lot of weird indentation, tab poisoning, inconsistent formatting, etc. going on :)

@falkTX falkTX merged commit 60ed477 into main Dec 29, 2021
@falkTX falkTX deleted the jack2_capture_client branch December 29, 2021 23:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants