scsynth: CoreAudio: don't complain about mismatched sample rates if numInputBusChannels == 0 #2610
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 2 commits
January 1, 2017 16:20
The scsynth CoreAudio driver checks to make sure that the sample rates of the input and output devices are the same, and if they are not, an error message is produced and scsynth refuses to boot. This commit skips the check if the number of input bus channels is 0. This allows the command-line option "-i 0" to serve as a simple workaround if the user would prefer to simply ignore the input device.
vivid-synth
reviewed
Jan 2, 2017
| inputStreamDesc.mSampleRate != outputStreamDesc.mSampleRate | ||
| ) { | ||
| scprintf( | ||
| "ERROR: Input sample rate is %g, but output is %g. " |
There was a problem hiding this comment.
maybe s/output/output rate/ for clarity?
vivid-synth
reviewed
Jan 2, 2017
| ) { | ||
| scprintf( | ||
| "ERROR: Input sample rate is %g, but output is %g. " | ||
| "Mismatched sample rates are not supported. " |
There was a problem hiding this comment.
What's SC's style regarding adjacent strings for concatenation?
There was a problem hiding this comment.
I've seen it in other places in our codebase, but I'm too lazy to check where.
There was a problem hiding this comment.
C++ will concatenate these just fine. SC does the same thing, no added spaces.
|
Other than my little stylistic questions, looks good to me (although I'm another person who can't test -- just go off @samaaron 's word that it works correctly) |
telephon
approved these changes
Jan 2, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix for #2608. The scsynth CoreAudio driver checks to make sure that the sample rates of the input and output devices are the same, and if they are not, an error message is produced and scsynth refuses to boot. This commit skips the check if the number of input bus channels is 0. This allows the command-line option "-i 0" to serve as a simple workaround if the user would prefer to simply ignore the input device.
The driver still queries some information about the input device, so this is sort of a bandage. Also, I'm committing blind, so please test.