OSDN > Find Software > Multimedia > Sound/Audio > MIDI > TiMidity++ 41 version > SCM > git > timidity41 > Commit

TiMidity++ 41 version
Fork

timidity41: Commit

Fix type incompatibility

--- a/CMakeLists.txt

+++ b/CMakeLists.txt

		@@ -169,6 +169,7 @@ if(MSVC)
169	169	endif()
170	170
171	171	add_compile_options(/we4013) # '%s' undefined; assuming extern returning int
	172	+ add_compile_options(/we4028) # formal parameter %d different from declaration
172	173	add_compile_options(/we4133) # 'function': incompatible types - from '%s' to '%s'
173	174
174	175	if(TIM41_USE_AVX2)

--- a/interface/w32g.h

+++ b/interface/w32g.h

		@@ -270,7 +270,7 @@ extern int w32g_get_rc(ptr_size_t *value, int wait_if_empty);
270	270	extern void w32g_lock(void);
271	271	extern void w32g_unlock(void);
272	272	extern void MainWndScrollbarProgressUpdate(int sec);
273		-extern void PutsConsoleWnd(char *str);
	273	+extern void PutsConsoleWnd(const char *str);
274	274	extern void w32g_ctle_play_start(int sec);
275	275	extern void SettingWndApply(void);
276	276	extern int w32g_lock_open_file;

		@@ -278,7 +278,7 @@ extern void w32g_i_init(void);
278	278	extern void CanvasChange(int mode);
279	279	extern HINSTANCE hInst;
280	280	extern void w32g_show_console(void);
281		-extern void MPanelStartLoad(char *filename);
	281	+extern void MPanelStartLoad(const char *filename);
282	282
283	283
284	284	/* w32g_utl.c */

--- a/interface/w32g_syn.c

+++ b/interface/w32g_syn.c

		@@ -413,7 +413,7 @@ static int w32g_syn_main(void)
413	413	return 0;
414	414	}
415	415
416		-static VOID CALLBACK forced_exit(HWND hwnd, UINT uMsg, UINT idEvent, DWORD dwTime)
	416	+static VOID CALLBACK forced_exit(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime)
417	417	{
418	418	exit(0);
419	419	}

--- a/interface/w32g_utl.c

+++ b/interface/w32g_utl.c

		@@ -1503,7 +1503,7 @@ int IniVersionCheck(void)
1503	1503	return 0;
1504	1504	}
1505	1505
1506		-void BitBltRect(HDC dst, HDC src, RECT *rc)
	1506	+void BitBltRect(HDC dst, HDC src, const RECT *rc)
1507	1507	{
1508	1508	BitBlt(dst, rc->left, rc->top,
1509	1509	rc->right - rc->left, rc->bottom - rc->top,

		@@ -1622,7 +1622,7 @@ void TmFillRect(HDC hdc, RECT *rc, int color)
1622	1622	#ifndef S_ISDIR
1623	1623	#define S_ISDIR(mode) (((mode)&0xF000) == 0x4000)
1624	1624	#endif /* S_ISDIR */
1625		-int is_directory(char *path)
	1625	+int is_directory(const char *path)
1626	1626	{
1627	1627	struct stat st;
1628	1628	if(path == '@') / special identifire for playlist file */

--- a/timidity/controls.h

+++ b/timidity/controls.h

		@@ -153,7 +153,7 @@ typedef struct {
153	153	void (*close)(void);
154	154	int (pass_playing_list)(int number_of_files, char list_of_files[]);
155	155	int (read)(ptr_size_t valp);
156		- int (write)(const uint8 buf, size_t size);
	156	+ int (write)(const uint8 buf, int size);
157	157	int (cmsg)(int type, int verbosity_level, const char fmt, ...);
158	158	void (event)(CtlEvent ev); /* Control events */
159	159

--- a/timidity/timidity.c

+++ b/timidity/timidity.c

		@@ -8202,7 +8202,7 @@ static RETSIGTYPE sigterm_exit(int sig)
8202	8202	}
8203	8203	#endif /* HAVE_SIGNAL */
8204	8204
8205		-static void timidity_arc_error_handler(char *error_message)
	8205	+static void timidity_arc_error_handler(const char *error_message)
8206	8206	{
8207	8207	extern int open_file_noise_mode;
8208	8208	if(open_file_noise_mode)