dialog yay

Author: jgcodes2020

CMakePresets.json

@@ -7,7 +7,8 @@
       "generator": "Ninja",
       "binaryDir": "${sourceDir}/build",
       "cacheVariables": {
-        "CMAKE_EXPORT_COMPILE_COMMANDS": true
+        "CMAKE_EXPORT_COMPILE_COMMANDS": true,
+        "CMAKE_BUILD_TYPE": "Debug"
       }
     },
     {

src/Plugins.Win32.SDLAudio/CMakeLists.txt

@@ -5,14 +5,19 @@ SPDX-License-Identifier: GPL-2.0-or-later
 ]===]
 
 add_library(Mupen64RR.Plugins.Win32.SDLAudio MODULE
+    "Config_Win32.cpp"
     "Main.cpp"
     "Main_Win32.cpp"
     "SDLBackend.cpp"
 
     "Config.hpp"
+    "Config_Win32.hpp"
     "Main.hpp"
     "Main_Win32.hpp"
     "SDLBackend.hpp"
+
+    "Resource.h"
+    "Resource.rc"
 )
 set_target_properties(Mupen64RR.Plugins.Win32.SDLAudio PROPERTIES
     CXX_STANDARD 23
@@ -24,4 +29,5 @@ set_target_properties(Mupen64RR.Plugins.Win32.SDLAudio PROPERTIES
 target_link_libraries(Mupen64RR.Plugins.Win32.SDLAudio PRIVATE
     Mupen64RR.Plugins.Win32.Common
     SDL3::SDL3
+    nlohmann_json::nlohmann_json
 )

src/Plugins.Win32.SDLAudio/Config.hpp

@@ -6,15 +6,18 @@
 
 #pragma once
 
+#include <ostream>
 namespace SDLAudio
 {
 struct Config
 {
     uint32_t default_sample_rate = 33600;
-    uint32_t src_buffer_size = 16384;
     uint32_t src_buffer_target = 2048;
-    uint32_t dst_buffer_size = 1024;
     bool swap_channels = false;
-    bool audio_sync = false;
+    bool audio_sync = true;
+
+    // void write_to(std::ostream& out);
+
+    // void read_from(std::istream& in);
 };
 } // namespace SDLAudio

src/Plugins.Win32.SDLAudio/Config_Win32.cpp

@@ -1,8 +1,41 @@
-
 #include "Config_Win32.hpp"
+#include "Main_Win32.hpp"
+#include "Resource.h"
+
+#include <minwindef.h>
+#include <windows.h>
+#include <winuser.h>
 
-namespace SDLAudio {
-    void show_config_win32(HWND parent, Config &config) {
-        
+static __stdcall int config_dlgproc(HWND dialog, UINT msg, WPARAM wparam, LPARAM lparam)
+{
+    switch (msg)
+    {
+    case WM_CLOSE: // "close" button clicked
+        EndDialog(dialog, IDCANCEL);
+        break;
+    case WM_COMMAND: // bottom button clicked
+        switch (LOWORD(wparam))
+        {
+        case IDOK:
+            EndDialog(dialog, IDOK);
+            break;
+        case IDCANCEL:
+            EndDialog(dialog, IDCANCEL);
+            break;
+        default:
+            break;
+        }
+        break;
+    default:
+        break;
     }
-}
+    return FALSE;
+}
+
+namespace SDLAudio
+{
+void show_config_win32(HWND parent, Config &config)
+{
+    DialogBoxW(g_dll_handle, MAKEINTRESOURCE(IDD_CONFIG), parent, config_dlgproc);
+}
+} // namespace SDLAudio

src/Plugins.Win32.SDLAudio/Main_Win32.cpp

@@ -1,16 +1,15 @@
 #include "Main_Win32.hpp"
+#include "Config.hpp"
+#include "Config_Win32.hpp"
 #include <Views.Win32/ViewPlugin.h>
 #include <filesystem>
-#include <libloaderapi.h>
-#include <minwindef.h>
-#include <string>
 #include <vector>
-#include <winnt.h>
+#include <windows.h>
 
-HMODULE g_dll_handle = nullptr;
+HINSTANCE g_dll_handle = nullptr;
 std::filesystem::path g_dll_path {};
 
-BOOL __stdcall DllMain(HMODULE hmod, DWORD reason, LPVOID)
+BOOL __stdcall DllMain(HINSTANCE hmod, DWORD reason, LPVOID)
 {
     if (reason == DLL_PROCESS_ATTACH)
     {
@@ -37,4 +36,9 @@ EXPORT void CALL DllAbout(void *hParent)
                                   L"\n\n"
                                   L"https://github.com/mupen64/mupen64-rr-lua";
     MessageBoxW((HWND)hParent, msg, L"About", 0x00000040L | 0x00000000L);
+}
+
+EXPORT void CALL DllConfig(void* hParent) {
+    SDLAudio::Config cfg {};
+    SDLAudio::show_config_win32((HWND) hParent, cfg);
 }

src/Plugins.Win32.SDLAudio/Main_Win32.hpp

@@ -4,5 +4,5 @@
 #include <filesystem>
 #include "Main.hpp"
 
-extern HMODULE g_dll_handle;
+extern HINSTANCE g_dll_handle;
 extern std::filesystem::path g_dll_path;

src/Plugins.Win32.SDLAudio/Resource.h

@@ -0,0 +1,19 @@
+#pragma once
+
+#define IDD_CONFIG 101
+// #define IDC_AI 1001
+// #define IDC_OLDSYNC 1002
+// #define IDC_VOLUME 1003
+// #define IDC_DISALLOWDS8 1004
+// #define IDC_DISALLOWXA2 1007
+// #define IDC_DEVICE 1017
+// #define IDC_SLIDER_BUFFERFPS 1021
+// #define IDC_SLIDER_BACKFPS 1022
+// #define IDC_BUFFERS 1024
+// #define IDC_BUFFERS_TEXT 1025
+// #define IDC_SLIDER_BACKFPS_TEXT 1026
+// #define IDC_SLIDER_BUFFERFPS_TEXT 1027
+
+#define IDC_SWAP_CHANNELS 1002
+#define IDC_SYNC_AUDIO 1003
+

src/Plugins.Win32.SDLAudio/Resource.rc

@@ -0,0 +1,36 @@
+#include "resource.h"
+#include <Windows.h>
+
+#define IDC_STATIC -1
+
+// VERTICAL LAYOUT DEFINITIONS
+// =====================================================
+
+#define DDX_PLAYBACK_Y 5
+#define DDX_PLAYBACK_IY (DDX_PLAYBACK_Y + 15)
+#define DDX_PLAYBACK_H 52
+
+#define DDX_DBTNS_Y (DDX_PLAYBACK_Y + DDX_PLAYBACK_H + 6)
+#define DDX_DBTNS_H 14
+
+#define DDX_DIALOG_H (DDX_DBTNS_Y + DDX_DBTNS_H + 6)
+
+// DIALOG_DEFINITION
+// =====================================================
+
+IDD_CONFIG DIALOGEX 0, 0, 200, DDX_DIALOG_H
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "SDL Audio Settings"
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+FONT 8, "MS Shell Dlg"
+BEGIN
+    // EDIT "Default"
+    CONTROL "Playback options", IDC_STATIC, BUTTON, BS_GROUPBOX, 10, DDX_PLAYBACK_Y, 180, DDX_PLAYBACK_H
+
+    CONTROL "Swap channels", IDC_SWAP_CHANNELS, BUTTON, BS_AUTOCHECKBOX | WS_TABSTOP, 16, (DDX_PLAYBACK_IY + 0), 116, 9
+    CONTROL "Sync audio", IDC_SYNC_AUDIO, BUTTON, BS_AUTOCHECKBOX | WS_TABSTOP, 16, (DDX_PLAYBACK_IY + 14), 116, 9
+
+
+    PUSHBUTTON "Cancel", IDCANCEL, 87, DDX_DBTNS_Y, 50, DDX_DBTNS_H
+    DEFPUSHBUTTON "&OK", IDOK, 140, DDX_DBTNS_Y, 50, DDX_DBTNS_H
+END