• R/O
  • HTTP
  • SSH
  • HTTPS

timidity41: Commit


Commit MetaInfo

Révisionc9be59e8994dfcc337967afc10778e3999233b5a (tree)
l'heure2019-11-09 23:13:55
AuteurStarg <starg@user...>
CommiterStarg

Message de Log

Merge branch 'dev41' into unicode

Change Summary

Modification

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -99,6 +99,7 @@ add_definitions(
9999
100100 # MSVCRT
101101 -D_CRT_SECURE_NO_WARNINGS
102+ -D_CRT_NONSTDC_NO_DEPRECATE
102103 )
103104
104105 set(
--- a/interface/w32g_i.c
+++ b/interface/w32g_i.c
@@ -1731,7 +1731,7 @@ void MainWndUpdateSoundSpecButton(void)
17311731 #undef SUBWINDOW_POS_IS_OLD_CLOSED_WINDOW
17321732 void ShowSubWindow(HWND hwnd,int showflag)
17331733 {
1734- int i, num;
1734+ int i, num = 0;
17351735 RECT rc;
17361736 #ifdef SUBWINDOW_POS_IS_OLD_CLOSED_WINDOW
17371737 RECT rc2;
--- a/libarc/url_file.c
+++ b/libarc/url_file.c
@@ -223,7 +223,7 @@ URL url_file_open(const char *fname)
223223 ptr_size_t mapsize;
224224 FILE *fp; /* Non NULL if mmap is failure */
225225 #ifdef __W32__
226- HANDLE hFile, hMap;
226+ HANDLE hFile = INVALID_HANDLE_VALUE, hMap = 0;
227227 #endif /* __W32__ */
228228
229229 #ifdef DEBUG
--- a/libunimod/unimod.h
+++ b/libunimod/unimod.h
@@ -43,7 +43,9 @@ extern "C"
4343 */
4444
4545 #ifdef __W32__
46+#ifndef WIN32_LEAN_AND_MEAN
4647 #define WIN32_LEAN_AND_MEAN
48+#endif
4749 #if defined(__POCC__) && defined(RC_NONE)
4850 #undef RC_NONE
4951 #endif
--- a/timidity/CMakeLists.txt
+++ b/timidity/CMakeLists.txt
@@ -6,6 +6,11 @@ add_definitions(
66 # calcnewton
77
88 add_executable(calcnewton calcnewt.c)
9+
10+if(MSVC AND "${CMAKE_C_COMPILER_ID}" MATCHES "Clang")
11+ target_compile_options(calcnewton PRIVATE /Oi-)
12+endif()
13+
914 add_custom_command(
1015 OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/newton_table.c"
1116 COMMAND calcnewton "${CMAKE_CURRENT_BINARY_DIR}/newton_table.c"
--- a/timidity/effect.c
+++ b/timidity/effect.c
@@ -24505,7 +24505,7 @@ const int8 cab_type_xg[] = {0, 1, 2, 3, 3, 1, 1};
2450524505
2450624506 static double ins_xg_revchar_to_roomsize(struct effect_xg_t *st)
2450724507 {
24508- double rs;
24508+ double rs = 1.0;
2450924509 switch(st->type_msb) {
2451024510 case 0x01:
2451124511 switch(st->type_lsb) {
@@ -24559,7 +24559,7 @@ static double ins_xg_revchar_to_roomsize(struct effect_xg_t *st)
2455924559
2456024560 static double ins_xg_revchar_to_level(struct effect_xg_t *st)
2456124561 {
24562- double level;
24562+ double level = 1.0;
2456324563 switch(st->type_msb) {
2456424564 case 0x01:
2456524565 switch(st->type_lsb) {
@@ -24902,7 +24902,7 @@ static void conv_xg_reverb1(struct effect_xg_t *st, EffectList *ef)
2490224902 rvb->rev_wet = ins_xg_revchar_to_level(st);
2490324903 rvb->rev_width = initialwidth;
2490424904 }else{ // StandardReverb
24905- int type;
24905+ int type = 0;
2490624906 if(st->connection == XG_CONN_SYSTEM_REVERB){
2490724907 rvb0->mode = CH_STEREO;
2490824908 }else{
@@ -33571,7 +33571,7 @@ static void conv_sd_reverb2(struct mfx_effect_sd_t *st, EffectList *ef)
3357133571 rvb->rev_level = 0.55;
3357233572 rvb->rev_dif = 1.0;
3357333573 }else{ // StandardReverb
33574- int type;
33574+ int type = 0;
3357533575 info->rev_type = 0;
3357633576 rvb3->mode = CH_STEREO;
3357733577 switch(*reverb_status_sd.type) {
--- a/timidity/int_synth.c
+++ b/timidity/int_synth.c
@@ -3607,6 +3607,7 @@ static void mms_editor_save_ini(int num)
36073607 }
36083608 // mode
36093609 snprintf(key, sizeof(key), "op_%d_mode", j);
3610+ flg = 0;
36103611 if(setting->op_mode[j][0] > 0){
36113612 memset(data, 0, sizeof(data));
36123613 for(i = 0; i < MMS_OP_MODE_MAX; i++){
Afficher sur ancien navigateur de dépôt.