Skip to content

Conversation

@step-
Copy link
Contributor

@step- step- commented Jul 1, 2020

This commit implements the change suggested in #2091. It also changes
the unmatched combo box label value "91000" to "96100" to reflect the
integer value that the load settings function expects.

This commit implements the change suggested in xournalpp#2091. It also changes
the unmatched combo box label value "91000" to "96100" to reflect the
integer value that the `load` settings function expects.
@rolandlo rolandlo self-requested a review July 21, 2020 13:04
Copy link
Member

@rolandlo rolandlo left a comment

Choose a reason for hiding this comment

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

@step-
Thanks for your PR. Changing the default sample rate will come as a surprise to those who have used the audio recording before with the previous default. It would be better to keep 44100 Hz as the default. If someone runs into trouble (like you did) with this setting he will most likely check play around with the settings anyway and find that 16000 Hz works for him.
So unless you convince me of the opposite I would ask you to change back the default to 44100 Hz. The rest of the PR looks fine to me.

@step-
Copy link
Contributor Author

step- commented Jul 21, 2020

@rolandlo I was under the impression that the default value is saved to the user's configuration file on first run, therefore existing users wouldn't be affected by the new default because they already have a configuration file. But it doesn't matter what the default value is, as long as 16 kHz is offered as a choice. I committed the change you requested.

@rolandlo
Copy link
Member

@step- Ok, you are right about that. It only occurs after deleting the settings file. Anyway 44100 Hz is a very commonly used sample rate.

You have changed back the default in the Settings.cpp file, but not in the SettingsDialog.cpp file. So please change that as well.

Looking at various sources about sample rates (e.g. wikipedia) I find that 16000 Hz, 44100 Hz and 19200 Hz are all commonly used sample rates, but 96100 Hz is not. It should be 96000 Hz instead. So you should change the number 96100 to 96000 (consistently).
Once you have made the changes you may want to change the PR status from "Draft" to "Ready for review" so that it can be merged.

@step-
Copy link
Contributor Author

step- commented Jul 21, 2020

@rolandlo, yeah, I was wondering too why the original code used 96.1kHz instead of the more common 96kHz but since I found some internet sources citing 96.1kHz I didn't raise any question. Anyway, I've implemented the changes you requested.

@step- step- marked this pull request as ready for review July 21, 2020 21:14
@rolandlo
Copy link
Member

Ok, everything works fine now. Can you please squash your commits into one (following this tutorial)? Alternatively I can do it for you from within github. After the squashing I will merge your PR.

step- added 2 commits July 22, 2020 11:56
This commit implements the change suggested in xournalpp#2091 adding 16 kHz audio sample rate (the default rate remains 44 kHz).

This commit also changes the 96.1 kHz rate to 96 kHz, which is more
commonly used, and fixes the unmatched combobox label 91000.
Fix item id is set inconsequently for the 96000 Hz sample rate.

Co-authored-by: Roland Lötscher <40485433+rolandlo@users.noreply.github.com>
step- added 2 commits July 27, 2020 09:22
This commit implements the change suggested in xournalpp#2091 adding 16 kHz
audio sample rate (the default rate remains 44 kHz).

This commit also changes the 96.1 kHz rate to 96 kHz, which is more
commonly used, and fixes the unmatched combobox label 91000.
This commit implements the change suggested in xournalpp#2091 adding 16 kHz audio sample rate (the default rate remains 44 kHz).

This commit also changes the 96.1 kHz rate to 96 kHz, which is more
commonly used, and fixes the unmatched combobox label 91000.
@step-
Copy link
Contributor Author

step- commented Jul 27, 2020

@rolandlo done and squashed in c252a7f. The following commit ac04167 didn't change anything but was necessary to sync my local repo.

@rolandlo rolandlo merged commit e2a0f1d into xournalpp:master Jul 27, 2020
@rolandlo
Copy link
Member

@step- Thanks for your commit. I have merged it.

duncanawoods pushed a commit to duncanawoods/xournalpp that referenced this pull request Aug 3, 2020
 Add 16 kHz sample rate and sundry.

This commit implements the change suggested in xournalpp#2091 adding 16 kHz
audio sample rate (the default rate remains 44.1 kHz).

This commit also changes the 96.1 kHz rate to 96 kHz, which is more
commonly used, and fixes the unmatched combobox label 91000.
Technius pushed a commit to Technius/xournalpp that referenced this pull request Sep 21, 2020
 Add 16 kHz sample rate and sundry.

This commit implements the change suggested in xournalpp#2091 adding 16 kHz
audio sample rate (the default rate remains 44.1 kHz).

This commit also changes the 96.1 kHz rate to 96 kHz, which is more
commonly used, and fixes the unmatched combobox label 91000.

Backport: e2a0f1d
Technius pushed a commit that referenced this pull request Oct 21, 2020
 Add 16 kHz sample rate and sundry.

This commit implements the change suggested in #2091 adding 16 kHz
audio sample rate (the default rate remains 44.1 kHz).

This commit also changes the 96.1 kHz rate to 96 kHz, which is more
commonly used, and fixes the unmatched combobox label 91000.

Backport: e2a0f1d
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants