Commit Graph

276 Commits

Author SHA1 Message Date
Sergii Pylypenko
f09fa9f340 Fixed Android compilation 2021-12-10 03:40:35 +02:00
Sergii Pylypenko
2f6b20cbfd Merge branch upstream/master while introducing compile errors and reverting parts of Android changes, video BPP options are gone 2021-11-29 02:20:37 +02:00
Sergii Pylypenko
7a488b09ea Fixed mutex deadlock in libtimidity shutdown function 2021-11-28 03:34:42 +02:00
Sergii Pylypenko
7defb52028 Merge branch upstream/master 2021-11-28 03:16:36 +02:00
Sergii Pylypenko
0e229a652b Emscripten: disable extmidi 2021-11-28 02:04:25 +02:00
Sergii Pylypenko
63104ab06f Fixed incorrect buffer size for Timidity mixer routine 2021-11-28 02:04:25 +02:00
Sergii Pylypenko
316b9490b2 Fixed libtimidity not working with SDL2 2021-11-28 02:04:25 +02:00
Charles Pigott
1e529e1632 Fix: [Fluidsynth] Crash when debug output enabled (#9446) 2021-07-19 10:36:35 +01:00
rubidium42
eb6cdadc4d Codechange: replace IConsolePrintF with IConsolePrint and fmt formatting
Also make some strings more consistent with the rest of the console strings.
2021-06-13 15:25:31 +02:00
rubidium42
55a11710a6 Codechange: convert printf DEBUG statements to fmt Debug statements 2021-06-13 12:45:45 +02:00
milek7
886f5c104a Fix: Workarounds for BeMidi driver to work properly on Haiku 2021-05-24 08:56:18 +02:00
milek7
36bcd2956a Fix: Building on Haiku 2021-05-24 08:56:18 +02:00
Rubidium
79fc094c54 Cleanup: [Fluidsynth] Remove fluid_player_join
The function fluid_player_join in the library is broken beyond compare for the
usecases it was used for (see their #872). It does not wait until it is safe
to delete the player, so it is up to the end user to ensure that.

For OpenTTD we acquire a lock before fluid_synth_write_s16 and we acquire the
same lock in the stop function. So, only one of the functions can be doing its
thing, meaning we do not need to wait for the player to be stopped as it
cannot be doing anything as we prevent that by the lock.
2021-05-10 16:03:16 +02:00
rubidium42
a432009f06 Cleanup: [Fluidsynth] Comply better with the coding style 2021-05-05 16:03:34 +02:00
rubidium42
6bd7f8816d Fix #9117, 04ce1f07: [Fluidsynth] Infinite wait when stopping song (#9181)
In FluidSynth 2.2.0 an extra state was added to denote stopping. To transition
from this state to a stopped state the rendering needs to be running. Since
04ce1f07 locking was added that skipped the rendering when something else held
a lock, so the state would never get to stopped and join would never return.
2021-05-03 16:40:19 +01:00
Loïc Guilloux
888389c28d Codechange: Use std::string in console commands/aliases registration, and std::map instead our sorted linked list (#9057)
* Codechange: Use std::string in console commands and aliases registration

* Codechange: Use std::map to register console commands

* Codechange: Use std::map to register console aliases

* Cleanup: Remove now unused function
2021-04-24 15:19:57 +02:00
Ghislain Antony Vaillant
e7cf589868 Fix: Honor default soundfont for FluidSynth
Debian now provides a default soundfont for FluidSynth via its alternatives system.

In short, FluidSynth is configured to look for `/usr/share/sounds/sf3/default-GM.sf3` as its default soundfont, and each soundfront package (FluidR3, OPL-3, MuseScore...) may provide or override this symlink. By default, FluidSynth is installed on Debian with the `TimGM6mb` soundfont by default due to its limited size.

See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=929185 for further details.
2021-04-07 12:30:04 +02:00
Ghislain Antony Vaillant
9725bd8dd0 Fix: Use FluidSynth default soundfont 2021-04-07 12:29:21 +02:00
Niels Martin Hansen
e0561dbded Fix #8713: Change OTTD2FS and FS2OTTD to return string objects instead of static buffers 2021-04-07 09:31:47 +02:00
Milek7
33c5f984f5 Codechange: Use COINIT_MULTITHREADED in CoInitializeEx (#8938) 2021-04-04 07:40:56 +01:00
Sergii Pylypenko
870c254ee2 Merge tag '1.11.0-beta2' into master 2021-03-03 00:51:28 +02:00
Niels Martin Hansen
b427ddce88 Codechange: Switch to explicit wide strings 2021-02-23 11:25:39 +01:00
Niels Martin Hansen
beeb9e0a1b Remove: [Win32] Last pretenses of being able to build for Windows 95 2021-02-23 11:25:39 +01:00
pelya
2bc0595127 Fixed Android compilation and warnings 2021-01-25 21:31:09 +02:00
pelya
88923bb314 Added timidity support on Android 2021-01-25 01:05:26 +02:00
pelya
3a82c97aa1 Merge remote-tracking branch 'upstream/master' 2021-01-25 00:50:42 +02:00
Charles Pigott
9b800a96ed Codechange: Remove min/max functions in favour of STL variants (#8502) 2021-01-08 11:16:18 +01:00
Michael Lutz
65f65ad2ad Codechange: Convert some more FIO functions to take std::string. 2020-12-27 13:19:25 +01:00
Michael Lutz
f3326d34e7 Codechange: Use std::string in FIO search path handling. 2020-12-27 13:19:25 +01:00
Charles Pigott
348c231e12 Codechange: Make codestyle for CMake files consistent for 'control' statements 2020-09-25 14:43:13 +01:00
TechGeekNZ
716c883737 Fix: Globally apply preprocessor directive coding style
Global; except for the 32-bit SSE blitter, which has some #DEFINEs
in not-very-nice places.
2020-07-03 09:08:46 +02:00
Patric Stout
4d04009d12 Codechange: remove #ifdef from .cpp files to exclude features
With CMake, these files are simply not compiled to start with.
2020-06-05 19:36:05 +02:00
Patric Stout
56d54cf60e Add: introduce CMake for project management
CMake works on all our supported platforms, like MSVC, Mingw, GCC,
Clang, and many more. It allows for a single way of doing things,
so no longer we need shell scripts and vbs scripts to work on all
our supported platforms.

Additionally, CMake allows to generate project files for like MSVC,
KDevelop, etc.

This heavily reduces the lines of code we need to support multiple
platforms from a project perspective.

Addtiionally, this heavily improves our detection of libraries, etc.
2020-06-05 19:36:05 +02:00
Michael Lutz
37bc2f8064 Codechange: Use std::string in the driver and blitter selection code. 2020-05-21 20:02:34 +02:00
Niels Martin Hansen
2c84549db0 Fix: Two issues in MIDI file writer
Variable-length values would write threshold values with a byte too many.
System Exclusive messages would cause write to fail since the end byte was treated as part of next message.
2020-05-08 22:43:43 +02:00
Michael Lutz
4bfa3ff619 Remove: [OSX] Old QuickTime music driver. 2020-04-12 18:44:43 +02:00
Michael Lutz
b17ea3de36 Remove: [OSX] Support for the pre-10.5 audio/music APIs. 2020-04-12 18:44:43 +02:00
pelya
798fbc3466 Merge branch 'origin/master' commit 'a499e9acdd385b57dd43caf88af3a6f7f53716ba' 2020-03-20 00:10:46 +02:00
Niels Martin Hansen
04ce1f0713 Fix #7885: [Fluidsynth] Use recommended method of setting sample rate 2020-02-07 21:01:11 +01:00
Milek7
41163331aa Fix: Silence all notes when stopping song in fluidsynth 2020-01-12 16:19:02 +00:00
Milek7
823333c4b0 Fix: correct checking of fluid_settings_setnum return code 2020-01-12 14:55:20 +00:00
S. D. Cloudt
13cc8a0cee Cleanup: Removed SVN headers 2019-11-10 17:59:20 +00:00
Michael Lutz
d5a9bd404a Codechange: [OSX] Use std::unique_ptr with a custom deleter to simply memory management of Core Foundation types. 2019-11-01 22:32:53 +01:00
Charles Pigott
3cc6b7f725 Fix: Signedness issue in midi driver 2019-09-30 14:00:06 +01:00
Charles Pigott
7b400d43c1 Codechange: Fix warning about discarding qualifiers by *really* casting the variable 2019-09-30 14:00:06 +01:00
Charles Pigott
b839e355ba Fix: Compilation error on MinGW due to usage of C++17 template deduction 2019-09-30 14:00:06 +01:00
JMcKiern
04f659e768 Fix: Some typos found using codespell 2019-09-29 21:27:32 +01:00
Michael Lutz
316e4e9417 Fix: [OSX] Macro name conflict when trying to compile the QuickTime music driver. 2019-09-29 20:31:48 +02:00
Niels Martin Hansen
a933afabfd Add: [Win32] Select MIDI device by port name 2019-08-31 21:13:25 +01:00
Niels Martin Hansen
1e723934a1 Fix 27384486e4: Error in GM Reset sysex data 2019-07-07 22:46:21 +02:00