From c06ade24d64becfc93f8982b67646d7bceade339 Mon Sep 17 00:00:00 2001 From: Starg Date: Sat, 8 Dec 2018 22:50:58 +0900 Subject: [PATCH] Support sf3 as config file --- interface/w32g_pref.c | 4 ++-- timidity/timidity.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/interface/w32g_pref.c b/interface/w32g_pref.c index 6ab0989b..3c011672 100644 --- a/interface/w32g_pref.c +++ b/interface/w32g_pref.c @@ -5933,12 +5933,12 @@ static int DlgOpenConfigFile(char *Filename, HWND hwnd) dir[FILEPATH_MAX]; int i, res; const char *filter, - filter_en[] = "All Supported file (*.cfg;*.config;*.sf2)\0*.cfg;*.config;*.sf2;*.sf3\0" + filter_en[] = "All Supported files (*.cfg;*.config;*.sf2;*.sf3)\0*.cfg;*.config;*.sf2;*.sf3\0" "SoundFont file (*.sf2)\0*.sf2;*.sf3\0" "Config file (*.cfg;*.config)\0*.cfg;*.config\0" "All files (*.*)\0*.*\0" "\0\0", - filter_jp[] = "‚·‚ׂĂ̑Ήžƒtƒ@ƒCƒ‹ (*.cfg;*.config;*.sf2)\0*.cfg;*.config;*.sf2;*.sf3\0" + filter_jp[] = "‚·‚ׂĂ̑Ήžƒtƒ@ƒCƒ‹ (*.cfg;*.config;*.sf2;*.sf3)\0*.cfg;*.config;*.sf2;*.sf3\0" "SoundFont ƒtƒ@ƒCƒ‹ (*.sf2)\0*.sf2;*.sf3\0" "Config ƒtƒ@ƒCƒ‹ (*.cfg;*.config)\0*.cfg;*.config\0" "‚·‚ׂẴtƒ@ƒCƒ‹ (*.*)\0*.*\0" diff --git a/timidity/timidity.c b/timidity/timidity.c index abce23b5..120408ca 100644 --- a/timidity/timidity.c +++ b/timidity/timidity.c @@ -2285,7 +2285,7 @@ MAIN_INTERFACE int read_config_file(const char *name, int self, int allow_missin tf = open_with_constmem(name, strlen(name), OF_VERBOSE); name = "(configuration)"; } - else if (check_file_extension(name, ".sf2", 0) == 1) + else if (check_file_extension(name, ".sf2", 0) == 1 || check_file_extension(name, ".sf3", 0) == 1) { const char fmt[] = "soundfont \"%s\"\n"; onmemory = (char*) safe_malloc(strlen(fmt) + strlen(name) + 1); -- 2.11.0