Fix merge

diff --git a/interface/w32g_pref.c b/interface/w32g_pref.c
index 0c040bc..446466d 100644 (file)
--- a/interface/w32g_pref.c
+++ b/interface/w32g_pref.c
@@ -1422,9 +1422,9 @@ PrefPlayerDialogProc(HWND hwnd, UINT uMess, WPARAM wParam, LPARAM lParam)
                DLG_FLAG_TO_CHECKBUTTON(hwnd,IDC_CHECK_AUTOSAVE_PLAYLIST, sp_temp->AutosavePlaylist);
                DLG_FLAG_TO_CHECKBUTTON(hwnd,IDC_CHECK_POS_SIZE_SAVE, sp_temp->PosSizeSave);
                
-               //for (i = 0; i <= cb_num_IDC_COMBO_SUBWINDOW_MAX; i++)
-               //      CB_INSSTR(IDC_COMBO_SUBWINDOW_MAX, cb_info_IDC_COMBO_SUBWINDOW_MAX[i]);
-               //CB_SET(IDC_COMBO_SUBWINDOW_MAX, RANGE(sp_temp->SubWindowMax, 0, cb_num_IDC_COMBO_SUBWINDOW_MAX));
+               for (i = 0; i <= cb_num_IDC_COMBO_SUBWINDOW_MAX; i++)
+                       CB_INSSTR(IDC_COMBO_SUBWINDOW_MAX, cb_info_IDC_COMBO_SUBWINDOW_MAX[i]);
+               CB_SET(IDC_COMBO_SUBWINDOW_MAX, RANGE(sp_temp->SubWindowMax, 0, cb_num_IDC_COMBO_SUBWINDOW_MAX));
 
                if(CurrentPlayerLanguage == LANGUAGE_JAPANESE) {
                        for (i = 0; i < CB_NUM(process_priority_num); i++)
@@ -1622,7 +1622,7 @@ PrefPlayerDialogProc(HWND hwnd, UINT uMess, WPARAM wParam, LPARAM lParam)
                DLG_CHECKBUTTON_TO_FLAG(hwnd, IDC_CHECK_AUTOSAVE_PLAYLIST, sp_temp->AutosavePlaylist);
                DLG_CHECKBUTTON_TO_FLAG(hwnd, IDC_CHECK_POS_SIZE_SAVE, sp_temp->PosSizeSave);
                
-               //sp_temp->SubWindowMax = CB_GETS(IDC_COMBO_SUBWINDOW_MAX, 5);
+               sp_temp->SubWindowMax = CB_GETS(IDC_COMBO_SUBWINDOW_MAX, 5);
 
                // Set process priority
                st_temp->processPriority = process_priority_num[CB_GETS(IDC_COMBO_PROCESS_PRIORITY, 2)];

diff --git a/interface/w32g_res.h b/interface/w32g_res.h
index 06b0da7..ff3e98b 100644 (file)
--- a/interface/w32g_res.h
+++ b/interface/w32g_res.h
@@ -192,7 +192,7 @@
 #define IDC_EDIT_SPECTROGRAM_UPDATE    3550
 // etc
 #define IDC_CHECK_SEACHDIRRECURSIVE    3600
-//#define IDC_COMBO_SUBWINDOW_MAX        3601
+#define IDC_COMBO_SUBWINDOW_MAX        3601
 #define IDC_CHECK_POS_SIZE_SAVE        3602
 #define IDC_CHECK_INIFILE_AUTOSAVE     3603
 // language

diff --git a/timidity/playmidi.h b/timidity/playmidi.h
index 002aa57..b5d75e7 100644 (file)
--- a/timidity/playmidi.h
+++ b/timidity/playmidi.h
@@ -166,9 +166,6 @@ enum midi_event_t
        ME_LOOP_EXPANSION_START, /* start of expanded loops */
        ME_LOOP_EXPANSION_END,  /* end of expanded loops */
        
-       ME_LOOP_EXPANSION_START, /* start of expanded loops */
-       ME_LOOP_EXPANSION_END,  /* end of expanded loops */
-
        ME_LAST = 254,                  /* Last sequence of MIDI list.
                                                         * This event is reserved for realtime player.
                                                         */