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

Fix: Fluidsynth should not try to lock sample data in memory #7365

Merged
merged 1 commit into from Mar 30, 2019

Conversation

@nielsmh
Copy link
Contributor

@nielsmh nielsmh commented Mar 10, 2019

This should avoid warnings about memory locking from Fluidsynth:
fluidsynth: warning: Failed to pin the sample data to RAM; swapping is possible.

@PeterN
Copy link
Member

@PeterN PeterN commented Mar 10, 2019

src/music/fluidsynth.cpp:66:24: error: use of undeclared identifier 'settings'
fluid_settings_setint(settings, "synth.lock-memory", 0);

@PeterN
Copy link
Member

@PeterN PeterN commented Mar 11, 2019

This does not solve the problem for me. Checking the return value of fluid_settings_setint gives a failed response, but I can't see a reason.

@nielsmh
Copy link
Contributor Author

@nielsmh nielsmh commented Mar 12, 2019

I'm not sure if moving the setint call up actually solves it, but it is probably more correct.

@PeterN
Copy link
Member

@PeterN PeterN commented Mar 12, 2019

It does not, I had already tried this.

@nielsmh
Copy link
Contributor Author

@nielsmh nielsmh commented Mar 29, 2019

Tested this on my own Fedora 29 system with fluidsynth 1.1.11, and this patch does solve the Failed to pin sample data warning.

@PeterN
Copy link
Member

@PeterN PeterN commented Mar 29, 2019

Still does not work for me, but if it works for you, that's good.

@nielsmh nielsmh merged commit df673e9 into OpenTTD:master Mar 30, 2019
8 checks passed
@nielsmh nielsmh deleted the fluid-no-lock branch Mar 30, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants