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 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

This comment has been minimized.

Copy link
Member

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);

@nielsmh nielsmh force-pushed the nielsmh:fluid-no-lock branch from a05c71a to cd0ea69 Mar 10, 2019
@PeterN

This comment has been minimized.

Copy link
Member

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

This comment has been minimized.

Copy link
Contributor Author

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

This comment has been minimized.

Copy link
Member

PeterN commented Mar 12, 2019

It does not, I had already tried this.

@nielsmh

This comment has been minimized.

Copy link
Contributor Author

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.

@nielsmh nielsmh force-pushed the nielsmh:fluid-no-lock branch from ee7eeb2 to 2e58bd9 Mar 29, 2019
@nielsmh nielsmh force-pushed the nielsmh:fluid-no-lock branch from 2e58bd9 to c2a8d8d Mar 29, 2019
@PeterN

This comment has been minimized.

Copy link
Member

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
8 checks passed
OpenTTD CI Build #20190329.9 succeeded
Details
OpenTTD CI (Linux commit-checker) Linux commit-checker succeeded
Details
OpenTTD CI (Linux linux-amd64-clang-3.8) Linux linux-amd64-clang-3.8 succeeded
Details
OpenTTD CI (Linux linux-amd64-gcc-6) Linux linux-amd64-gcc-6 succeeded
Details
OpenTTD CI (Linux linux-i386-gcc-6) Linux linux-i386-gcc-6 succeeded
Details
OpenTTD CI (MacOS) MacOS succeeded
Details
OpenTTD CI (Windows Win32) Windows Win32 succeeded
Details
OpenTTD CI (Windows Win64) Windows Win64 succeeded
Details
@nielsmh nielsmh deleted the nielsmh: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
Projects
None yet
4 participants
You can’t perform that action at this time.