diff -ruN TiMidity++-2.11.0/ChangeLog TiMidity++-2.11.1/ChangeLog --- TiMidity++-2.11.0/ChangeLog Thu Dec 27 20:52:51 2001 +++ TiMidity++-2.11.1/ChangeLog Sat Dec 29 08:00:12 2001 @@ -1,3 +1,15 @@ +2001-12-29 Masanao Izumo + + * Version 2.11.1 released. + +2001-12-29 Masanao Izumo + + * interface/w32g_res.rc: fixed. + * timidity/timidity.c (Windows): fixed. + * timidity/timidity.c: Try to continue even if any configuration + file is not found. + * interface/{w32g_ini.c,w32g.h}: fixed. + 2001-12-27 Masanao Izumo * Version 2.11.0 released. diff -ruN TiMidity++-2.11.0/NEWS TiMidity++-2.11.1/NEWS --- TiMidity++-2.11.0/NEWS Thu Dec 27 20:54:26 2001 +++ TiMidity++-2.11.1/NEWS Sat Dec 29 07:27:30 2001 @@ -1,3 +1,6 @@ +12/29, 2001 + * Version 2.11.1 released. + 12/27, 2001 * Version 2.11.0 released. * Configuration menu of Windows GUI was changed. diff -ruN TiMidity++-2.11.0/configs/msc-config.h TiMidity++-2.11.1/configs/msc-config.h --- TiMidity++-2.11.0/configs/msc-config.h Thu Dec 27 20:54:39 2001 +++ TiMidity++-2.11.1/configs/msc-config.h Sat Dec 29 08:53:42 2001 @@ -267,7 +267,7 @@ /* In VDS Macro AAA=BBB is not available. */ #define __W32__ -#define TIMID_VERSION "2.11.0" +#define TIMID_VERSION "2.11.1" #define DEFAULT_PATH ".\\" #define AU_W32 #define AU_VORBIS diff -ruN TiMidity++-2.11.0/configure TiMidity++-2.11.1/configure --- TiMidity++-2.11.0/configure Thu Dec 27 19:55:57 2001 +++ TiMidity++-2.11.1/configure Sat Dec 29 07:27:39 2001 @@ -1400,7 +1400,7 @@ # Define the identity of the package. PACKAGE=TiMidity++ -VERSION=2.11.0 +VERSION=2.11.1 cat >>confdefs.h <SoundSpecWndFlag)); IniGetKeyInt(INI_SEC_PLAYER,"SubWindowMax",&(sp->SubWindowMax)); IniGetKeyStringN(INI_SEC_PLAYER,"ConfigFile",sp->ConfigFile,MAXPATH + 32); - if(!sp->ConfigFile[0]) - strcpy(sp->ConfigFile, W32G_TIMIDITY_CFG); + if(!sp->ConfigFile[0]) { + GetWindowsDirectory(sp->ConfigFile, sizeof(sp->ConfigFile) - 14); + strcat(sp->ConfigFile, "\\TIMIDITY.CFG"); + } IniGetKeyStringN(INI_SEC_PLAYER,"PlaylistFile",sp->PlaylistFile,MAXPATH + 32); IniGetKeyStringN(INI_SEC_PLAYER,"PlaylistHistoryFile",sp->PlaylistHistoryFile,MAXPATH + 32); IniGetKeyStringN(INI_SEC_PLAYER,"MidiFileOpenDir",sp->MidiFileOpenDir,MAXPATH + 32); diff -ruN TiMidity++-2.11.0/interface/w32g_res.rc TiMidity++-2.11.1/interface/w32g_res.rc --- TiMidity++-2.11.0/interface/w32g_res.rc Thu Dec 27 20:47:15 2001 +++ TiMidity++-2.11.1/interface/w32g_res.rc Sat Dec 29 07:26:09 2001 @@ -301,7 +301,7 @@ EDITTEXT IDC_EDIT_CONFIG_FILE,62,10,137,14,ES_AUTOHSCROLL | ES_OEMCONVERT GROUPBOX "Player",IDC_GROUPBOX_PLAYERMODE,2,32,106,61,WS_GROUP - CONTROL "Not Looping",IDC_CHECKBOX_AUTOQUIT,"Button", + CONTROL "Auto Quit",IDC_CHECKBOX_AUTOQUIT,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,117,44,77,8 CONTROL "Auto Uniq",IDC_CHECKBOX_AUTOUNIQ,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,117,56,76,8 @@ -312,8 +312,8 @@ BS_AUTORADIOBUTTON | WS_TABSTOP,152,112,42,8 CONTROL "English",IDC_RADIOBUTTON_ENGLISH,"Button", BS_AUTORADIOBUTTON | WS_TABSTOP,152,124,43,8 - CONTROL "Auto Quit",IDC_CHECKBOX_NOT_CONTINUE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,44,64,8 + CONTROL "Not Continue",IDC_CHECKBOX_NOT_CONTINUE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,44,97,8 CONTROL "Not Drag Start",IDC_CHECKBOX_NOT_DRAG_START,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,56,97,8 GROUPBOX "Directory",IDC_STATIC,77,101,67,23 @@ -325,10 +325,10 @@ GROUPBOX "INI File",IDC_STATIC,77,125,67,24 CONTROL "Auto Save",IDC_CHECK_INIFILE_AUTOSAVE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,83,134,53,10 - CONTROL "Not Continue",IDC_CHECKBOX_NOT_LOOPING,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,68,51,8 + CONTROL "Not Looping",IDC_CHECKBOX_NOT_LOOPING,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,68,97,8 CONTROL "Auto Start",IDC_CHECKBOX_AUTOSTART,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,80,56,8 + BS_AUTOCHECKBOX | WS_TABSTOP,7,80,97,8 CONTROL "Random Mode",IDC_CHECKBOX_RANDOM,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,117,80,75,8 CONTROL "Popup",IDC_CHECK_DOCWNDAUTOPOPUP,"Button", diff -ruN TiMidity++-2.11.0/timidity/timidity.c TiMidity++-2.11.1/timidity/timidity.c --- TiMidity++-2.11.0/timidity/timidity.c Thu Dec 27 19:39:14 2001 +++ TiMidity++-2.11.1/timidity/timidity.c Sat Dec 29 08:15:08 2001 @@ -31,6 +31,7 @@ #ifdef __W32__ #include #include +#include #endif #ifdef HAVE_UNISTD_H #include @@ -2897,8 +2898,10 @@ #ifdef IA_W32GUI extern char *ConfigFile; - if(!ConfigFile[0]) - strcpy(ConfigFile, W32G_TIMIDITY_CFG); + if(!ConfigFile[0]) { + GetWindowsDirectory(ConfigFile, 1023 - 13); + strcat(ConfigFile, "\\TIMIDITY.CFG"); + } strncpy(local, ConfigFile, sizeof(local) - 1); #else /* !IA_W32GUI */ @@ -3124,18 +3127,17 @@ "requesting fragment size: %d", play_mode->extra_param[1]); } +#ifndef IA_W32GUI if(play_mode->open_output() < 0) { ctl->cmsg(CMSG_FATAL, VERB_NORMAL, "Couldn't open %s (`%c')", play_mode->id_name, play_mode->id_character); output_fail = 1; -#ifndef IA_W32GUI ctl->close(); return 2; -#endif /* IA_W32GUI */ } - +#endif /* IA_W32GUI */ if(!control_ratio) { control_ratio = play_mode->rate / CONTROLS_PER_SECOND; @@ -3214,6 +3216,7 @@ int w32gSecondTiMidity(int opt, int argc, char **argv); int w32gSecondTiMidityExit(void); extern int SecondMode; +static int CoInitializeOK = 0; #endif /* IA_W32GUI */ #ifndef __MACOS__ @@ -3245,9 +3248,6 @@ extern int setreuid(int ruid, int euid); #endif -puts("#### WINMAIN"); -sleep(3); - uid = getuid(); if(setpriority(PRIO_PROCESS, 0, DANGEROUS_RENICE) < 0) { @@ -3308,6 +3308,8 @@ timidity_start_initialize(); #ifdef IA_W32GUI + if(CoInitialize(NULL)==S_OK) + CoInitializeOK = 1; w32g_initialize(); /* Secondary TiMidity Execute */ @@ -3386,7 +3388,9 @@ ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "Try %s -h for help", program_name); } +#ifndef IA_W32GUI /* Try to continue if it is Windows version */ return 1; /* problems with command line */ +#endif } timidity_init_player(); @@ -3404,6 +3408,8 @@ { int res = timidity_play_main(nfiles, files); w32gSecondTiMidityExit(); + if(CoInitializeOK) + CoUninitialize(); return res; } #endif /* IA_W32GUI */