WinMM: Added chan-alloc and audio output options

7 files changed, 171 insertions, 35 deletions

diff --git a/utils/winmm_drv/CMakeLists.txt b/utils/winmm_drv/CMakeLists.txt
index ae76a0c..79bf099 100644
--- a/utils/winmm_drv/CMakeLists.txt
+++ b/utils/winmm_drv/CMakeLists.txt
@@ -114,7 +114,7 @@ target_compile_definitions(adlmidiconfig PRIVATE
     -DADL_IS_CPL_APPLET
 )
 
-target_link_libraries(adlmidiconfig PRIVATE comctl32 gdi32 user32)
+target_link_libraries(adlmidiconfig PRIVATE winmm comctl32 gdi32 user32)
 
 
 add_executable(adlmidiconfigtool ${ADLMIDI_DRIVER_SRC} cpl/adlconfig-tool.c cpl/res-tool.rc)
@@ -128,7 +128,7 @@ target_compile_definitions(adlmidiconfigtool PRIVATE
     -DUNICODE
 )
 
-target_link_libraries(adlmidiconfigtool PRIVATE comctl32 gdi32 user32)
+target_link_libraries(adlmidiconfigtool PRIVATE winmm comctl32 gdi32 user32)
 
 if(WIN32 AND CMAKE_COMPILER_IS_GNUCXX)
     target_compile_options(adlmidiconfig PRIVATE "-Wno-cast-function-type")
diff --git a/utils/winmm_drv/config/regconfig.c b/utils/winmm_drv/config/regconfig.c
index 353cea2..6e35df0 100644
--- a/utils/winmm_drv/config/regconfig.c
+++ b/utils/winmm_drv/config/regconfig.c
@@ -93,13 +93,15 @@ static BOOL readIntFromRegistry(HKEY hKeyParent, const PWCHAR subkey, const PWCH
 {
     WCHAR *buf = NULL;
     BOOL ret;
+
     ret = readStringFromRegistry(hKeyParent, subkey, valueName, &buf);
+
     if(ret && readData)
-    {
         *readData = _wtoi(buf);
-    }
+
     if(buf)
         free(buf);
+
     return ret;
 }
 
@@ -115,6 +117,34 @@ static BOOL writeIntToRegistry(HKEY hKeyParent, const PWCHAR subkey, const PWCHA
     return ret;
 }
 
+static BOOL readUIntFromRegistry(HKEY hKeyParent, const PWCHAR subkey, const PWCHAR valueName, UINT *readData)
+{
+    WCHAR *buf = NULL;
+    BOOL ret;
+
+    ret = readStringFromRegistry(hKeyParent, subkey, valueName, &buf);
+
+    if(ret && readData)
+        *readData = wcstoul(buf, NULL, 10);
+
+    if(buf)
+        free(buf);
+
+    return ret;
+}
+
+static BOOL writeUIntToRegistry(HKEY hKeyParent, const PWCHAR subkey, const PWCHAR valueName, UINT intData)
+{
+    WCHAR buf[20];
+    BOOL ret;
+
+    ZeroMemory(buf, 20);
+    _snwprintf(buf, 20, L"%u", intData);
+
+    ret = writeStringToRegistry(hKeyParent, subkey, valueName, buf);
+    return ret;
+}
+
 
 
 
@@ -133,8 +163,11 @@ void setupDefault(DriverSettings *setup)
     setup->flagFullBrightness = BST_UNCHECKED;
 
     setup->volumeModel = 0;
+    setup->chanAlloc = 0;
     setup->numChips = 4;
     setup->num4ops = -1;
+
+    setup->outputDevice = (UINT)-1;
 }
 
 
@@ -144,6 +177,7 @@ static const PWCHAR s_regPath       = L"SOFTWARE\\Wohlstand\\libADLMIDI";
 void loadSetup(DriverSettings *setup)
 {
     int iVal;
+    UINT uVal;
     WCHAR *sVal = NULL;
 
     if(readIntFromRegistry(HKEY_CURRENT_USER, s_regPath, L"useExternalBank", &iVal))
@@ -179,11 +213,17 @@ void loadSetup(DriverSettings *setup)
     if(readIntFromRegistry(HKEY_CURRENT_USER, s_regPath, L"volumeModel", &iVal))
         setup->volumeModel = iVal;
 
+    if(readIntFromRegistry(HKEY_CURRENT_USER, s_regPath, L"chanAlloc", &iVal))
+        setup->chanAlloc = iVal;
+
     if(readIntFromRegistry(HKEY_CURRENT_USER, s_regPath, L"numChips", &iVal))
         setup->numChips = iVal;
 
     if(readIntFromRegistry(HKEY_CURRENT_USER, s_regPath, L"num4ops", &iVal))
         setup->num4ops = iVal;
+
+    if(readUIntFromRegistry(HKEY_CURRENT_USER, s_regPath, L"outputDevice", &uVal))
+        setup->outputDevice = uVal;
 }
 
 void saveSetup(DriverSettings *setup)
@@ -202,8 +242,10 @@ void saveSetup(DriverSettings *setup)
     writeIntToRegistry(HKEY_CURRENT_USER, s_regPath, L"flagFullBrightness", setup->flagFullBrightness);
 
     writeIntToRegistry(HKEY_CURRENT_USER, s_regPath, L"volumeModel", setup->volumeModel);
+    writeIntToRegistry(HKEY_CURRENT_USER, s_regPath, L"chanAlloc", setup->chanAlloc);
     writeIntToRegistry(HKEY_CURRENT_USER, s_regPath, L"numChips", setup->numChips);
     writeIntToRegistry(HKEY_CURRENT_USER, s_regPath, L"num4ops", setup->num4ops);
+    writeUIntToRegistry(HKEY_CURRENT_USER, s_regPath, L"outputDevice", setup->outputDevice);
 }
 
 
diff --git a/utils/winmm_drv/config/regconfig.h b/utils/winmm_drv/config/regconfig.h
index f854d1b..7c49bd6 100644
--- a/utils/winmm_drv/config/regconfig.h
+++ b/utils/winmm_drv/config/regconfig.h
@@ -25,8 +25,11 @@ typedef struct DriverSettings_t
     BOOL    flagFullBrightness;
 
     int     volumeModel;
+    int     chanAlloc;
     int     numChips;
     int     num4ops;
+
+    UINT    outputDevice;
 } DriverSettings;
 
 extern const WCHAR g_adlSignalMemory[];
diff --git a/utils/winmm_drv/cpl/adlconfig.rc b/utils/winmm_drv/cpl/adlconfig.rc
index 455c906..ff7fcf2 100644
--- a/utils/winmm_drv/cpl/adlconfig.rc
+++ b/utils/winmm_drv/cpl/adlconfig.rc
@@ -14,37 +14,41 @@
 // Dialog resources
 //
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-IDD_CONFIG_BOX DIALOGEX 0, 0, 251, 244
+IDD_CONFIG_BOX DIALOGEX 0, 0, 247, 281
 STYLE DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_CAPTION | WS_POPUP | WS_SYSMENU
 CAPTION "libADLMIDI settings"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
-    GROUPBOX        "Instruments bank", IDC_INS_BANK, 9, 4, 233, 51, 0, WS_EX_LEFT
-    AUTORADIOBUTTON "Internal bank", IDC_BANK_INTERNAL, 15, 17, 63, 8, WS_GROUP | WS_TABSTOP, WS_EX_LEFT
-    COMBOBOX        IDC_BANK_ID, 83, 14, 155, 200, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST, WS_EX_LEFT
-    AUTORADIOBUTTON "External bank", IDC_BANK_EXTERNAL, 15, 33, 63, 8, WS_TABSTOP, WS_EX_LEFT
-    EDITTEXT        IDC_BANK_PATH, 83, 31, 107, 14, WS_DISABLED | ES_AUTOHSCROLL, WS_EX_LEFT
-    PUSHBUTTON      "Browse...", IDC_BROWSE_BANK, 194, 30, 45, 14, 0, WS_EX_LEFT
-    LTEXT           "Chip emulator type:", IDC_CHIPEMU_LABEL, 11, 60, 67, 10, SS_LEFT, WS_EX_LEFT
-    COMBOBOX        IDC_EMULATOR, 83, 58, 159, 200, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST, WS_EX_LEFT
-    LTEXT           "Number of chips", IDC_CHIPNUM_LABEL, 11, 78, 67, 8, SS_LEFT, WS_EX_LEFT
-    COMBOBOX        IDC_NUM_CHIPS, 83, 76, 34, 200, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST, WS_EX_LEFT
-    LTEXT           "Number of 4OP voices", IDC_4OPSNUM_LABEL, 128, 78, 72, 8, SS_LEFT, WS_EX_LEFT
-    COMBOBOX        IDC_NUM_4OPVO, 202, 76, 40, 200, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST, WS_EX_LEFT
-    LTEXT           "Volume model:", IDC_VM_LABEL, 11, 95, 67, 13, SS_LEFT, WS_EX_LEFT
-    COMBOBOX        IDC_VOLUMEMODEL, 83, 95, 159, 200, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST, WS_EX_LEFT
-    AUTOCHECKBOX    "Full-panning stereo", IDC_FLAG_SOFTPAN, 11, 115, 227, 10, 0, WS_EX_LEFT
-    AUTO3STATE      "Deep tremolo (Auto/Enable/Disable)", IDC_FLAG_TREMOLO, 11, 130, 227, 10, NOT WS_TABSTOP, WS_EX_LEFT
-    AUTO3STATE      "Deep vibrato (Auto/Enable/Disable)", IDC_FLAG_VIBRATO, 11, 145, 227, 10, NOT WS_TABSTOP, WS_EX_LEFT
-    AUTOCHECKBOX    "Scalable modulation", IDC_FLAG_SCALE, 11, 160, 227, 10, 0, WS_EX_LEFT
-    AUTOCHECKBOX    "Full-range brightness (CC74)", IDC_FLAG_FULLBRIGHT, 11, 175, 227, 10, 0, WS_EX_LEFT
-    PUSHBUTTON      "Reset synth now", IDC_RESET_SYNTH, 73, 195, 80, 14, 0, WS_EX_LEFT
-    PUSHBUTTON      "Restore defaults", IDC_RESTORE_DEFAULTS, 155, 195, 88, 14, 0, WS_EX_LEFT
-    PUSHBUTTON      "About...", IDC_ABOUT, 10, 212, 50, 14, 0, WS_EX_LEFT
-    DEFPUSHBUTTON   "OK", IDOK, 88, 212, 50, 14, 0, WS_EX_LEFT
-    PUSHBUTTON      "Cancel", IDCANCEL, 141, 212, 50, 14, 0, WS_EX_LEFT
-    PUSHBUTTON      "Apply", IDC_APPLYBUTTON, 194, 212, 50, 14, 0, WS_EX_LEFT
-    RTEXT           "Settings will be applied immediately", IDC_BOTTOMNOTE_LABEL, 7, 227, 235, 8, SS_RIGHT, WS_EX_LEFT
+    COMBOBOX        IDC_AUDIOOUT, 81, 7, 160, 200, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST, WS_EX_LEFT
+    AUTORADIOBUTTON "Internal bank", IDC_BANK_INTERNAL, 13, 35, 63, 8, WS_GROUP | WS_TABSTOP, WS_EX_LEFT
+    COMBOBOX        IDC_BANK_ID, 81, 32, 155, 200, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST, WS_EX_LEFT
+    AUTORADIOBUTTON "External bank", IDC_BANK_EXTERNAL, 13, 51, 63, 8, WS_TABSTOP, WS_EX_LEFT
+    EDITTEXT        IDC_BANK_PATH, 81, 49, 107, 14, WS_DISABLED | ES_AUTOHSCROLL, WS_EX_LEFT
+    PUSHBUTTON      "Browse...", IDC_BROWSE_BANK, 192, 48, 45, 14, 0, WS_EX_LEFT
+    COMBOBOX        IDC_EMULATOR, 81, 77, 160, 200, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST, WS_EX_LEFT
+    COMBOBOX        IDC_NUM_CHIPS, 81, 95, 34, 200, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST, WS_EX_LEFT
+    COMBOBOX        IDC_NUM_4OPVO, 201, 95, 40, 200, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST, WS_EX_LEFT
+    COMBOBOX        IDC_VOLUMEMODEL, 81, 114, 160, 200, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST, WS_EX_LEFT
+    COMBOBOX        IDC_CHANALLOC, 81, 133, 160, 200, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_HASSTRINGS, WS_EX_LEFT
+    AUTOCHECKBOX    "Full-panning stereo", IDC_FLAG_SOFTPAN, 8, 154, 227, 10, 0, WS_EX_LEFT
+    AUTO3STATE      "Deep tremolo (Auto/Enable/Disable)", IDC_FLAG_TREMOLO, 8, 169, 227, 10, 0, WS_EX_LEFT
+    AUTO3STATE      "Deep vibrato (Auto/Enable/Disable)", IDC_FLAG_VIBRATO, 8, 184, 227, 10, 0, WS_EX_LEFT
+    AUTOCHECKBOX    "Scalable modulation", IDC_FLAG_SCALE, 8, 199, 227, 10, 0, WS_EX_LEFT
+    AUTOCHECKBOX    "Full-range brightness (CC74)", IDC_FLAG_FULLBRIGHT, 8, 214, 227, 10, 0, WS_EX_LEFT
+    PUSHBUTTON      "About...", IDC_ABOUT, 6, 234, 50, 14, 0, WS_EX_LEFT
+    PUSHBUTTON      "Reset synth now", IDC_RESET_SYNTH, 71, 234, 80, 14, 0, WS_EX_LEFT
+    PUSHBUTTON      "Restore defaults", IDC_RESTORE_DEFAULTS, 153, 234, 88, 14, 0, WS_EX_LEFT
+    DEFPUSHBUTTON   "OK", IDOK, 85, 251, 50, 14, 0, WS_EX_LEFT
+    PUSHBUTTON      "Cancel", IDCANCEL, 138, 251, 50, 14, 0, WS_EX_LEFT
+    PUSHBUTTON      "Apply", IDC_APPLYBUTTON, 191, 251, 50, 14, 0, WS_EX_LEFT
+    GROUPBOX        "Instruments bank", IDC_INS_BANK, 7, 22, 233, 51, 0, WS_EX_LEFT
+    LTEXT           "Chip emulator type:", IDC_CHIPEMU_LABEL, 9, 79, 67, 10, SS_LEFT, WS_EX_LEFT
+    LTEXT           "Number of chips", IDC_CHIPNUM_LABEL, 9, 97, 67, 8, SS_LEFT, WS_EX_LEFT
+    LTEXT           "Number of 4OP voices", IDC_4OPSNUM_LABEL, 126, 97, 72, 8, SS_LEFT, WS_EX_LEFT
+    LTEXT           "Volume model:", IDC_VM_LABEL, 9, 116, 67, 8, SS_LEFT, WS_EX_LEFT
+    RTEXT           "Settings will be applied immediately", IDC_BOTTOMNOTE_LABEL, 4, 266, 235, 8, SS_RIGHT, WS_EX_LEFT
+    LTEXT           "Channels allocation:", IDC_CA_LABEL, 9, 135, 64, 8, SS_LEFT, WS_EX_LEFT
+    LTEXT           "Audio output:", IDC_AUDIOOUT_LABEL, 11, 9, 65, 8, SS_LEFT, WS_EX_LEFT
 END
 
 
diff --git a/utils/winmm_drv/cpl/config_dialog.c b/utils/winmm_drv/cpl/config_dialog.c
index 195524d..3f5c66d 100644
--- a/utils/winmm_drv/cpl/config_dialog.c
+++ b/utils/winmm_drv/cpl/config_dialog.c
@@ -1,5 +1,6 @@
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
+#include <mmsystem.h>
 #include <commctrl.h>
 #include <commdlg.h>
 #include <string.h>
@@ -38,6 +39,15 @@ static const char *const volume_models_descriptions[] =
     NULL
 };
 
+static const char *const channel_allocation_descriptions[] =
+{
+    "Auto (defined by bank)",
+    "Sounding off delay based",
+    "Same instrument",
+    "Any first released",
+    NULL
+};
+
 static const char * const emulator_type_descriptions[] =
 {
     "Nuked OPL3 1.8",
@@ -50,6 +60,7 @@ static const char * const emulator_type_descriptions[] =
 
 static DriverSettings g_setup;
 static HINSTANCE      s_hModule;
+static UINT           s_audioOutPrev = WAVE_MAPPER;
 
 static void syncBankType(HWND hwnd, int type);
 static void sync4ops(HWND hwnd);
@@ -109,6 +120,12 @@ static void syncWidget(HWND hwnd)
     updateBankName(hwnd, g_setup.bankPath);
     SendDlgItemMessageA(hwnd, IDC_EMULATOR, CB_SETCURSEL, (WPARAM)g_setup.emulatorId, (LPARAM)0);
     SendDlgItemMessageA(hwnd, IDC_VOLUMEMODEL, CB_SETCURSEL, (WPARAM)g_setup.volumeModel, (LPARAM)0);
+    SendDlgItemMessageA(hwnd, IDC_CHANALLOC, CB_SETCURSEL, (WPARAM)g_setup.chanAlloc + 1, (LPARAM)0);
+
+    if(g_setup.outputDevice == WAVE_MAPPER)
+        SendDlgItemMessageA(hwnd, IDC_AUDIOOUT, CB_SETCURSEL, (WPARAM)0, (LPARAM)0);
+    else
+        SendDlgItemMessageA(hwnd, IDC_AUDIOOUT, CB_SETCURSEL, (WPARAM)g_setup.outputDevice + 1, (LPARAM)0);
 
     sync4ops(hwnd);
 }
@@ -116,6 +133,8 @@ static void syncWidget(HWND hwnd)
 static void buildLists(HWND hwnd)
 {
     int i, bMax;
+    UINT ai, aMax;
+    WAVEOUTCAPSW wavDev;
     HMODULE lib;
     const char *const* list;
     BankNamesCount adl_getBanksCount;
@@ -152,11 +171,27 @@ static void buildLists(HWND hwnd)
         SendDlgItemMessageA(hwnd, IDC_VOLUMEMODEL, CB_ADDSTRING, (LPARAM)0, (LPARAM)volume_models_descriptions[i]);
     }
 
+    // Channel allocation mode
+    for(i = 0; channel_allocation_descriptions[i] != NULL; ++i)
+    {
+        SendDlgItemMessageA(hwnd, IDC_CHANALLOC, CB_ADDSTRING, (LPARAM)0, (LPARAM)channel_allocation_descriptions[i]);
+    }
+
     // Emulators list
     for(i = 0; emulator_type_descriptions[i] != NULL; ++i)
     {
         SendDlgItemMessageA(hwnd, IDC_EMULATOR, CB_ADDSTRING, (LPARAM)0, (LPARAM)emulator_type_descriptions[i]);
     }
+
+    // Audio devices
+    aMax = waveOutGetNumDevs();
+    SendDlgItemMessageW(hwnd, IDC_AUDIOOUT, CB_ADDSTRING, (LPARAM)0, (WPARAM)L"[Default device]");
+    for(ai = 0; ai < aMax; ++ai)
+    {
+        memset(&wavDev, 0, sizeof(wavDev));
+        waveOutGetDevCapsW(ai, &wavDev, sizeof(wavDev));
+        SendDlgItemMessageW(hwnd, IDC_AUDIOOUT, CB_ADDSTRING, (LPARAM)0, (WPARAM)wavDev.szPname);
+    }
 }
 
 static void syncBankType(HWND hwnd, int type)
@@ -209,6 +244,18 @@ static void openCustomBank(HWND hwnd)
     }
 }
 
+static void warnIfOutChanged(HWND hwnd)
+{
+    if(s_audioOutPrev != g_setup.outputDevice)
+    {
+        s_audioOutPrev = g_setup.outputDevice;
+        MessageBoxW(hwnd,
+                    L"To apply the change of the audio output device, you should reload your applications.",
+                    L"Audio output device changed",
+                    MB_OK|MB_ICONINFORMATION);
+    }
+}
+
 INT_PTR CALLBACK ToolDlgProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
 {
     switch(Message)
@@ -230,6 +277,17 @@ INT_PTR CALLBACK ToolDlgProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lPar
                         MB_OK);
         break;
 
+        case IDC_AUDIOOUT:
+            if(HIWORD(wParam) == CBN_SELCHANGE)
+            {
+                g_setup.outputDevice = SendMessageW((HWND)lParam, (UINT)CB_GETCURSEL, (WPARAM)0, (LPARAM)0);
+                if(g_setup.outputDevice == 0)
+                    g_setup.outputDevice = WAVE_MAPPER;
+                else
+                    g_setup.outputDevice--;
+            }
+            break;
+
         case IDC_NUM_CHIPS:
             if(HIWORD(wParam) == CBN_SELCHANGE)
             {
@@ -260,6 +318,13 @@ INT_PTR CALLBACK ToolDlgProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lPar
             }
             break;
 
+        case IDC_CHANALLOC:
+            if(HIWORD(wParam) == CBN_SELCHANGE)
+            {
+                g_setup.chanAlloc = SendMessageW((HWND)lParam, (UINT)CB_GETCURSEL, (WPARAM)0, (LPARAM)0) - 1;
+            }
+            break;
+
         case IDC_BANK_INTERNAL:
             g_setup.useExternalBank = 0;
             syncBankType(hwnd, FALSE);
@@ -329,11 +394,13 @@ INT_PTR CALLBACK ToolDlgProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lPar
         case IDC_APPLYBUTTON:
             saveSetup(&g_setup);
             sendSignal(DRV_SIGNAL_RELOAD_SETUP);
+            warnIfOutChanged(hwnd);
             break;
 
         case IDOK:
             saveSetup(&g_setup);
             sendSignal(DRV_SIGNAL_RELOAD_SETUP);
+            warnIfOutChanged(hwnd);
             EndDialog(hwnd, IDOK);
             break;
 
@@ -358,6 +425,8 @@ BOOL runAdlSetupBox(HINSTANCE hModule, HWND hwnd)
     s_hModule = hModule;
 
     loadSetup(&g_setup);
+    // Keep the last audio output setup for the future
+    s_audioOutPrev = g_setup.outputDevice;
 
     DialogBoxW(hModule, MAKEINTRESOURCEW(IDD_CONFIG_BOX), hwnd, ToolDlgProc);
 
diff --git a/utils/winmm_drv/cpl/resource.h b/utils/winmm_drv/cpl/resource.h
index 4d41e9f..27b17e5 100644
--- a/utils/winmm_drv/cpl/resource.h
+++ b/utils/winmm_drv/cpl/resource.h
@@ -28,5 +28,9 @@
 #define IDC_4OPSNUM_LABEL                       1025
 #define IDC_RESET_SYNTH                         1026
 #define IDC_BOTTOMNOTE_LABEL                    1027
+#define IDC_CHANALLOC                           1028
+#define IDC_CA_LABEL                            1029
+#define IDC_AUDIOOUT                            1030
+#define IDC_AUDIOOUT_LABEL                      1031
 #define IDC_DRIVERNAME                          40000
 #define IDC_DRIVERDESC                          40001
diff --git a/utils/winmm_drv/src/MidiSynth.cpp b/utils/winmm_drv/src/MidiSynth.cpp
index 29cbb78..b1baa13 100644
--- a/utils/winmm_drv/src/MidiSynth.cpp
+++ b/utils/winmm_drv/src/MidiSynth.cpp
@@ -133,7 +133,7 @@ private:
     bool        stopProcessing;
 
 public:
-    int Init(Bit16s *buffer, unsigned int bufferSize, unsigned int chunkSize, bool useRingBuffer, unsigned int sampleRate)
+    int Init(Bit16s *buffer, unsigned int bufferSize, unsigned int chunkSize, bool useRingBuffer, unsigned int sampleRate, UINT outDevice)
     {
         DWORD callbackType = CALLBACK_NULL;
         DWORD_PTR callback = (DWORD_PTR)NULL;
@@ -148,7 +148,7 @@ public:
         PCMWAVEFORMAT wFormat = {WAVE_FORMAT_PCM, 2, sampleRate, sampleRate * 4, 4, 16};
 
         // Open waveout device
-        int wResult = waveOutOpen(&hWaveOut, WAVE_MAPPER, (LPWAVEFORMATEX)&wFormat, callback, (DWORD_PTR)&midiSynth, callbackType);
+        int wResult = waveOutOpen(&hWaveOut, outDevice, (LPWAVEFORMATEX)&wFormat, callback, (DWORD_PTR)&midiSynth, callbackType);
         if(wResult != MMSYSERR_NOERROR)
         {
             MessageBoxW(NULL, L"Failed to open waveform output device", L"libADLMIDI", MB_OK | MB_ICONEXCLAMATION);
@@ -308,17 +308,21 @@ void WaveOutWin32::RenderingThread(void *)
         while(!s_waveOut.stopProcessing)
         {
             bool allBuffersRendered = true;
+
             for(UINT i = 0; i < s_waveOut.chunks; i++)
             {
                 if(s_waveOut.WaveHdr[i].dwFlags & WHDR_DONE)
                 {
                     allBuffersRendered = false;
                     midiSynth.Render((Bit16s *)s_waveOut.WaveHdr[i].lpData, s_waveOut.WaveHdr[i].dwBufferLength / 4);
+
                     if(waveOutWrite(s_waveOut.hWaveOut, &s_waveOut.WaveHdr[i], sizeof(WAVEHDR)) != MMSYSERR_NOERROR)
                         MessageBoxW(NULL, L"Failed to write block to device", L"libADLMIDI", MB_OK | MB_ICONEXCLAMATION);
+
                     midiSynth.CheckForSignals();
                 }
             }
+
             if(allBuffersRendered)
                 WaitForSingleObject(s_waveOut.hEvent, INFINITE);
         }
@@ -518,8 +522,12 @@ int MidiSynth::Init()
     m_setupInit = false;
     LoadSynthSetup();
 
-    UINT wResult = s_waveOut.Init(buffer, bufferSize, chunkSize, useRingBuffer, sampleRate);
-    if(wResult) return wResult;
+    UINT wResult = s_waveOut.Init(buffer, bufferSize, chunkSize, useRingBuffer, sampleRate, m_setup.outputDevice);
+
+    if(wResult)
+        return wResult;
+
+    m_setupCurrent.outputDevice = m_setup.outputDevice;
 
     // Start playing stream
     adl_generate(synth, bufferSize * 2, buffer);
@@ -664,6 +672,12 @@ void MidiSynth::LoadSynthSetup()
         m_setupCurrent.volumeModel = m_setup.volumeModel;
     }
 
+    if(!m_setupInit || m_setupCurrent.chanAlloc != m_setup.chanAlloc)
+    {
+        adl_setChannelAllocMode(synth, m_setup.chanAlloc);
+        m_setupCurrent.chanAlloc = m_setup.chanAlloc;
+    }
+
     if(!m_setupInit || m_setupCurrent.numChips != m_setup.numChips)
     {
         adl_setNumChips(synth, m_setup.numChips);