Please sign in to comment.
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
timidity / music_timidity.c updates (bug #4896):
* Timidity_init(): Library doesn't care about common timidity.cfg system locations any more, callers are responsible for it. It now takes a config_path argument as the full path of timidity.cfg. If the config file argument contains a parent directory, that will be added to timidity search path. The config file is supposed to contain any other dirs that needs to be added to the search path: therefore no need adding several predefined directory paths to the search paths either: they are now removed. * configury: New --with-timidity-cfg=FILE option to set the default config file of the library. * music.c, New public apis Mix_SetTimidityCfg and Mix_GetTimidityCfg Allows the mixer library user to set his own timidity config file. * music_timidity.c, TIMIDITY_Open(): Calls Timidity_Init() with a config file parameter now. The config file parameter priority is like the following: - TIMIDITY_CFG environment var: highest priority, try nothing else. - Mix_GetTimidityCfg() result: second priority (set by user of the mixer library using Mix_SetTimidityCfg()), nothing else is tried. - If the above two are absent, a few OS-specific predefined config file paths are tried. If that fails, Timidity_init() called with a NULL param so that the library's default config file is tried.
- Loading branch information
Showing with 134 additions and 75 deletions.
- +2 −0 CHANGES.txt
- +27 −14 configure
- +6 −0 configure.in
- +4 −0 include/SDL_mixer.h
- +31 −1 src/codecs/music_timidity.c
- +18 −8 src/codecs/timidity/common.c
- +1 −1 src/codecs/timidity/common.h
- +2 −18 src/codecs/timidity/options.h
- +17 −32 src/codecs/timidity/timidity.c
- +1 −1 src/codecs/timidity/timidity.h
- +25 −0 src/music.c
Oops, something went wrong.