OSDN Git Service

Support sf3 as config file
authorStarg <starg@users.osdn.me>
Sat, 8 Dec 2018 13:50:58 +0000 (22:50 +0900)
committerStarg <starg@users.osdn.me>
Sat, 8 Dec 2018 13:50:58 +0000 (22:50 +0900)
interface/w32g_pref.c
timidity/timidity.c

index 6ab0989..3c01167 100644 (file)
@@ -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[] = "\82·\82×\82Ä\82Ì\91Î\89\9e\83t\83@\83C\83\8b (*.cfg;*.config;*.sf2)\0*.cfg;*.config;*.sf2;*.sf3\0"
+           filter_jp[] = "\82·\82×\82Ä\82Ì\91Î\89\9e\83t\83@\83C\83\8b (*.cfg;*.config;*.sf2;*.sf3)\0*.cfg;*.config;*.sf2;*.sf3\0"
                 "SoundFont \83t\83@\83C\83\8b (*.sf2)\0*.sf2;*.sf3\0"
                 "Config \83t\83@\83C\83\8b (*.cfg;*.config)\0*.cfg;*.config\0"
                 "\82·\82×\82Ä\82Ì\83t\83@\83C\83\8b (*.*)\0*.*\0"
index abce23b..120408c 100644 (file)
@@ -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);