add option to select audio device

also update miniaudio to v0.10.4
Gargaj · Apr 28, 2020 · b107cce · b107cce
1 parent c9f5594
commit b107cce
Show file tree

Hide file tree

Showing 12 changed files with 37,323 additions and 24,650 deletions.
diff --git a/README.md b/README.md
@@ -29,11 +29,14 @@ You can configure Bonzomatic by creating a `config.json` and placing it next to
 The file can have the following contents: (all fields are optional)
 ``` javascript
 {
-  "window":{ // default window size / state, if there's a setup dialog, it will override it
+  "window":{ // default window size / state; if there's a setup dialog, it will override it
     "width":1920,
     "height":1080,
     "fullscreen":true,
   },
+  "audio":{ // default audio device settings; if there's a setup dialog, it will override it
+    "useInput":false, // if true, use line-in/mic/...; if false, attempt to create a loopback device and use stereo out
+  },
   "font":{ // all paths in the file are also relative to the binary, but again, can be absolute paths if that's more convenient
     "file":"Input-Regular_(InputMono-Medium).ttf",
     "size":16,
@@ -80,7 +83,7 @@ The file can have the following contents: (all fields are optional)
     "builtin": "44FF88",
     "preprocessor": "C0C0C0",
     "selection": "C06699CC", // background color when selecting text
-    "charBackground":   "C0000000", // if set, this value will be used (instead of gui opacity) behind characters
+    "charBackground": "C0000000", // if set, this value will be used (instead of gui opacity) behind characters
   },
   "postExitCmd":"copy_to_dropbox.bat" // this command gets ran when you quit Bonzomatic, and the shader filename gets passed to it as first parameter. Use this to take regular backups.
 }

diff --git a/data/windows/SetupDialog.rc b/data/windows/SetupDialog.rc
@@ -1,29 +1,45 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include <windows.h>
 #include "resource.h"
 
-#define IDC_STATIC                        -1
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// Neutral resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+#pragma code_page(1250)
 
 /////////////////////////////////////////////////////////////////////////////
 //
 // Dialog
 //
 
-IDD_SETUP DIALOGEX 0, 0, 186, 92
+IDD_SETUP DIALOGEX 0, 0, 186, 104
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "�mla�t design"
 FONT 8, "Tahoma", 0, 0, 0x0
 BEGIN
-    DEFPUSHBUTTON   "Run",IDOK,60,66,116,14
-    PUSHBUTTON      "Cancel",IDCANCEL,6,66,50,14
+    DEFPUSHBUTTON   "Run",IDOK,60,84,116,14
+    PUSHBUTTON      "Cancel",IDCANCEL,6,84,50,14
     RTEXT           "Resolution:",IDC_STATIC,7,22,65,10
     COMBOBOX        IDC_RESOLUTION,83,20,91,125,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     RTEXT           "Fullscreen:",IDC_STATIC,7,36,65,10
     CONTROL         "",IDC_FULLSCREEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,83,36,9,10
     CTEXT           "BONZOMATIC",IDC_STATIC,5,8,175,10
     RTEXT           "Vertical sync:",IDC_STATIC,7,50,65,10
     CONTROL         "",IDC_VSYNC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,83,50,9,10
+    RTEXT           "Audio source:",IDC_STATIC,6,64,65,10
+    COMBOBOX        IDC_AUDIOSOURCE,82,62,91,125,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
 
@@ -37,11 +53,21 @@ GUIDELINES DESIGNINFO
 BEGIN
     IDD_SETUP, DIALOG
     BEGIN
-        BOTTOMMARGIN, 77
+        BOTTOMMARGIN, 89
     END
 END
 #endif    // APSTUDIO_INVOKED
 
+#endif    // Neutral resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+/////////////////////////////////////////////////////////////////////////////
+// Hungarian (Hungary) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_HUN)
+LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
+#pragma code_page(1250)
 
 #ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
@@ -76,8 +102,8 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDI_APPLICATION             ICON                    "icon.ico"
-
+IDI_APPLICATION         ICON                    "icon.ico"
+#endif    // Hungarian (Hungary) resources
 /////////////////////////////////////////////////////////////////////////////