From: Toni Wilen <twilen@winuae.net>
Date: Sun, 1 Jan 2023 16:24:23 +0000 (+0200)
Subject: 41010b1
X-Git-Tag: 41010~33
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=3edcde16d4969e0f6715019753563187888d32c4;p=francis%2Fwinuae.git

41010b1
---

diff --git a/include/options.h b/include/options.h
index 7df16000..151ba120 100644
--- a/include/options.h
+++ b/include/options.h
@@ -16,7 +16,7 @@
 
 #define UAEMAJOR 4
 #define UAEMINOR 10
-#define UAESUBREV 0
+#define UAESUBREV 1
 
 #define MAX_AMIGADISPLAYS 4
 
diff --git a/od-win32/resources/winuae.rc b/od-win32/resources/winuae.rc
index c9f5903b..4eabe042 100644
--- a/od-win32/resources/winuae.rc
+++ b/od-win32/resources/winuae.rc
@@ -553,7 +553,7 @@ BEGIN
     COMBOBOX        IDC_PORT1_JOYSMODE,136,86,106,130,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "Remap / Test [] Remap or test Port 2 configuration.",IDC_PORT1_REMAP,310,86,78,14
     PUSHBUTTON      "Swap ports [] Swap ports 1 and 2.",IDC_SWAP,45,112,78,14
-    CONTROL         "Mouse/Joystick autoswitching [] Press button to automatically insert inactive input device in to joystick/mouse port",IDC_PORT_AUTOSWITCH,
+    CONTROL         "Mouse/Joystick autoswitching [] Press button to automatically insert inactive input device in to joystick/mouse port. Joy button 1 = joy port, button 2 = mouse port. Mouse button 1 = mouse port, mouse button 2 = joy port. Long press swaps port selection.",IDC_PORT_AUTOSWITCH,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,136,114,172,11
     LTEXT           "Emulated parallel port joystick adapter",IDC_STATIC,10,136,179,15,SS_CENTERIMAGE
     COMBOBOX        IDC_PORT2_JOYS,45,154,342,130,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
@@ -1435,7 +1435,7 @@ BEGIN
             VALUE "FileDescription", "WinUAE"
             VALUE "FileVersion", "4.10.0.0"
             VALUE "InternalName", "WinUAE"
-            VALUE "LegalCopyright", "© 1996-2022 under the GNU Public License (GPL)"
+            VALUE "LegalCopyright", "© 1996-2023 under the GNU Public License (GPL)"
             VALUE "OriginalFilename", "WinUAE.exe"
             VALUE "ProductName", "WinUAE"
             VALUE "ProductVersion", "4.10.0.0"
diff --git a/od-win32/win32.cpp b/od-win32/win32.cpp
index 50370840..09b5846f 100644
--- a/od-win32/win32.cpp
+++ b/od-win32/win32.cpp
@@ -3599,7 +3599,7 @@ void logging_init (void)
 		SystemInfo.wProcessorArchitecture, SystemInfo.wProcessorLevel, SystemInfo.wProcessorRevision,
 		SystemInfo.dwNumberOfProcessors, filedate, os_touch);
 	write_log (_T("\n(c) 1995-2001 Bernd Schmidt   - Core UAE concept and implementation.")
-		_T("\n(c) 1998-2022 Toni Wilen      - Win32 port, core code updates.")
+		_T("\n(c) 1998-2023 Toni Wilen      - Win32 port, core code updates.")
 		_T("\n(c) 1996-2001 Brian King      - Win32 port, Picasso96 RTG, and GUI.")
 		_T("\n(c) 1996-1999 Mathias Ortmann - Win32 port and bsdsocket support.")
 		_T("\n(c) 2000-2001 Bernd Meyer     - JIT engine.")
@@ -4467,7 +4467,7 @@ static const TCHAR *obsolete[] = {
 	_T("file_path"), _T("iconified_nospeed"), _T("activepriority"), _T("magic_mouse"),
 	_T("filesystem_codepage"), _T("aspi"), _T("no_overlay"), _T("soundcard_exclusive"),
 	_T("specialkey"), _T("sound_speed_tweak"), _T("sound_lag"),
-	0
+	NULL
 };
 
 static int target_parse_option_hardware(struct uae_prefs *p, const TCHAR *option, const TCHAR *value)
diff --git a/od-win32/win32.h b/od-win32/win32.h
index 4e317629..9284d2f5 100644
--- a/od-win32/win32.h
+++ b/od-win32/win32.h
@@ -15,17 +15,17 @@
 #define GETBDM(x) (((x) - ((x / 10000) * 10000)) / 100)
 #define GETBDD(x) ((x) % 100)
 
-#define WINUAEPUBLICBETA 0
+#define WINUAEPUBLICBETA 1
 #define LANG_DLL 1
 #define LANG_DLL_FULL_VERSION_MATCH 1
 
 #if WINUAEPUBLICBETA
-#define WINUAEBETA _T("Beta 0")
+#define WINUAEBETA _T("Beta 1")
 #else
 #define WINUAEBETA _T("")
 #endif
 
-#define WINUAEDATE MAKEBD(2022, 12, 18)
+#define WINUAEDATE MAKEBD(2023, 1, 1)
 
 //#define WINUAEEXTRA _T("AmiKit Preview")
 //#define WINUAEEXTRA _T("Amiga Forever Edition")
diff --git a/uaelib.cpp b/uaelib.cpp
index 945a7f70..3e790b31 100644
--- a/uaelib.cpp
+++ b/uaelib.cpp
@@ -56,7 +56,7 @@ static uae_u32 emulib_Reset (void)
 */
 static uae_u32 emulib_EnableSound (uae_u32 val)
 {
-	if (!sound_available || currprefs.produce_sound == 2)
+	if (!sound_available || currprefs.produce_sound >= 2)
 		return 0;
 
 	currprefs.produce_sound = val;