Merge dev41

starg2 · Apr 8, 2019 · f6976f6 · f6976f6
2 parents 593e8eb + 4741b51
commit f6976f6
Show file tree

Hide file tree

Showing 6 changed files with 181 additions and 184 deletions.
diff --git a/interface/w32g_i.c b/interface/w32g_i.c
@@ -273,7 +273,7 @@ int32 SetValue(int32 value, int32 min, int32 max)
  return v;
 }
 
-int w32gSecondTiMidity(int opt, int argc, char **argv);
+int w32gSecondTiMidity(int opt, int argc, char **argv, int nfiles, char **files);
 int w32gSecondTiMidityExit(void);
 int SecondMode = 1;
 

diff --git a/interface/w32g_playlist.c b/interface/w32g_playlist.c
@@ -526,6 +526,7 @@ static int w32g_shuffle_playlist_delete(int n)
  for ( i = 0; i < playlist_shuffle.max; i++ ) {
  if ( playlist_shuffle.list[i] == n ) {
  delete_flag = 1;
+ i++;
  break;
  }
  }

diff --git a/interface/w32g_ut2.c b/interface/w32g_ut2.c
@@ -949,7 +949,7 @@ int PauseOldTiMidity(void)
 // opt==5 : ２重に起動する
 // 自分が終了するべきときは FALSE を返す
 // 自分が終了するべきでないときは TRUE を返す
-int w32gSecondTiMidity(int opt, int argc, char **argv)
+int w32gSecondTiMidity(int opt, int argc, char **argv, int nfiles, char **files)
 {
  int i;
  switch (opt) {
@@ -961,7 +961,7 @@ int w32gSecondTiMidity(int opt, int argc, char **argv)
  return FALSE;
  if (opt==0)
  ClearPlaylistOldTiMidity();
- SendFilesToOldTiMidity(argc > 0 ? argc-1 : 0, argv+1);
+ SendFilesToOldTiMidity(nfiles, files);
  return FALSE;
  } else {
  if (TryUniqTiMidity(20)==TRUE) {

diff --git a/timidity/controls.c b/timidity/controls.c
@@ -206,9 +206,6 @@ ControlMode *ctl_list[]={
 #ifdef IA_W32GUI
  &w32gui_control_mode,
 #endif /* IA_W32GUI */
-#ifdef IA_W32G_SYN
- &winsyn_control_mode,
-#endif /* IA_W32GUI */
 #if !defined(__MACOS__) && !defined(IA_W32GUI) && !defined(IA_W32G_SYN) && !defined(IA_WINSYN) && !(defined(__W32__) && defined(CFG_FOR_SF))
  &dumb_control_mode,
 #endif

diff --git a/timidity/sndfontini.c b/timidity/sndfontini.c
@@ -119,8 +119,6 @@ void OverrideSFSettingLoad()
  memcpy(sfini_path, fn, FILEPATH_MAX);
 
 #include "loadsndfontini.h"
-
- printf("\n**********************************\nsoundfont.ini load ... ok\n");
 }
 
 #endif