Merge branch 'release/2.2.0'

lx-s · Nov 28, 2022 · ac92ba9 · ac92ba9
2 parents 53d17e0 + 87af95d
commit ac92ba9
Show file tree

Hide file tree

Showing 41 changed files with 29 additions and 2,078 deletions.
diff --git a/Dist/InnoSetup/winmute-setup.iss b/Dist/InnoSetup/winmute-setup.iss
@@ -1,5 +1,5 @@
 #define MyAppName "WinMute"
-#define MyAppVersion "2.1.2.0"
+#define MyAppVersion "2.2.0.0"
 #define MyAppPublisher "LX-Systems"
 #define MyAppURL "https://www.lx-s.de/winmute"
 #define MyAppExeName "WinMute.exe"
@@ -46,9 +46,6 @@ Source: "..\bin\changelog.txt"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\bin\license.txt"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\bin\liesmich.html"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\bin\readme.html"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\bin\ScreensaverNotify.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\bin\ScreensaverNotify32.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\bin\ScreensaverProxy32.exe"; DestDir: "{app}"; Flags: ignoreversion
 
 [Icons]
 Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"

diff --git a/Dist/bin/changelog.txt b/Dist/bin/changelog.txt
@@ -1,3 +1,7 @@
+Version 2.2.0 (2022-11-28)
+ * Removed screensaver detection as it caused problems with
+   anti-cheat software of current games (e.g. Overwatch 2, Darktide).
+
 Version 2.1.2 (2022-08-25)
  * Changed bluetooth detection logic, so that muting 
    the workstation doesn't happen, when scanning for new

diff --git a/Dist/bin/liesmich.html b/Dist/bin/liesmich.html
@@ -18,14 +18,14 @@
    </style>
 </head>
 <body>
-   <h1>WinMute 2.1.2</h1>
+   <h1>WinMute 2.2.0</h1>
    <p class="copyright">&copy; Copyright 2022, Alexander Steinh&ouml;fer - <a href="http://www.lx-s.de">www.lx-s.de</a></p>
 
    <h2>Über</h2>
    <p>WinMute kann Windows automatisch stumm schalten, sobald</p>
    <ol>
     <li>Sie den PC sperren.</li>
-    <li>sich der Bildschirmschoner aktiviert.</li>
+    <li>sich der Bildschirm ausschaltet.</li>
     <li>der PC heruntergefahren wird.</li>
     <li>Sie sich Abmelden.</li>
     <li>der PC in den Ruhezustand geht.</li>
@@ -63,22 +63,17 @@ <h2>Installation</h2>
 
    <h2>Deinstallation</h2>
    <p>
-      Einfach die Dateien <code>WinMute.exe</code>, <code>ScreensaverNotify.dll</code><sub>*</sub>,
-      <code>ScreensaverNotify32.dll</code><sub>*</sub> und <code>ScreensaverProxy32.exe</code> l&ouml;schen.
+      Einfach die Dateien <code>WinMute.exe</code> l&ouml;schen.
       Zusätzlich legt WinMute in der Registry (<code>regedit.exe</code>) im Schlüssel <code>HKEY_CURRENT_USER\Software\lx-systems\WinMute</code>
       ab. Sollten sie die von WinMute  Einstellungen nichtmehr benötigen, können sie diese einfach entfernen.
    </p>
-   <p>
-    <sub>* Es kann sein, dass sich die DLL-Dateien nicht sofort löschen lassen. Bei einem Fehler probieren sie es einfach
-      spätestens nach dem nächsten Neustart erneut. Diese Unannehmlichkeit ist leider eine Windows Limitierung.</sub>
-   </p>
 
    <h2>Benutzung</h2>
    <p>Einfach starten - und fertig!</p>
    <p>
       Sobald das Programm l&auml;uft, wird die
       Lautst&auml;rke automatisch auf 0 gedreht, sobald Sie den PC sperren
-      oder sich der Bildschirmschoner aktiviert.
+      oder sich der Bildschirmschoner ausschaltet.
       Wenn Sie wieder an den PC zurückkehren, wird die Lautst&auml;rke auf den
       urspr&uuml;nglichen Wert zur&uuml;ckgestellt.
    </p><p>

diff --git a/Dist/bin/readme.html b/Dist/bin/readme.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
    <meta charset="utf-8">
-   <title>WinMute 2.1.2 - Readme</title>
+   <title>WinMute 2.2.0 - Readme</title>
 
    <style type="text/css">
    <!--
@@ -18,14 +18,14 @@
    </style>
 </head>
 <body>
-   <h1>WinMute 2.1.2</h1>
+   <h1>WinMute 2.2.0</h1>
    <p class="copyright">&copy; Copyright 2022, by Alexander Steinh&ouml;fer - <a href="http://www.lx-s.de">www.lx-s.de</a></p>
 
    <h2>About</h2>
    <p>WinMute can automatically mute your volume when</p>
    <ol>
     <li>You lock your PC.</li>
-    <li>The screensaver turns on.</li>
+    <li>Your screen turns off.</li>
     <li>Your PC shuts down</li>
     <li>You log off</li>
     <li>Your PC goes to sleep</li>
@@ -62,23 +62,16 @@ <h2>Installation</h2>
 
    <h2>Uninstalling WinMute</h2>
    <p>
-      Just delete the <code>WinMute.exe</code>, <code>ScreensaverNotify.dll</code><sub>*</sub>,
-      <code>ScreensaverNotify32.dll</code><sub>*</sub> und <code>ScreensaverProxy32.exe</code>
-      files from your hard drive.
+      Just delete the file <code>WinMute.exe</code> from your hard drive.
       If you want to also remove your personal WinMute settings, then open
       the registry (<code>regedit.exe</code>) and delete the key
       <code>HKEY_CURRENT_USER\Software\lx-systems\WinMute.</code>
    </p>
-   <p>
-    <sub>* It can happen, that you cannot remove these DLL-files file right away.
-      If you get an error trying to remove it, just wait until your next reboot
-      and delete it afterwards. This is unfortunately a windows limitation.</sub>
-   </p>
 
    <h2>Usage</h2>
    <p>Start it and that's it!</p>
    <p>
-      Whenever you lock your screen from now on or the screensaver starts,
+      Whenever you lock your screen from now on or your screen goes into standby,
       WinMute will automatically mute your windows volume, and unmute it
       right away when you come back to your pc.<br>
       If you want to change the behaviour or explore all the other options,

diff --git a/Dist/chocolatey/WinMute.nuspec b/Dist/chocolatey/WinMute.nuspec
@@ -3,7 +3,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2015/06/nuspec.xsd">
 	<metadata>
 		<id>winmute</id>
-		<version>2.1.2.20220825</version>
+		<version>2.2.0.20221128</version>
 		<title>WinMute</title>
 		<authors>Alexander Steinhöfer</authors>
 		<owners>Alexander Steinhöfer</owners>
@@ -25,9 +25,6 @@
 		<file src="tools\**" target="tools" />
 		<file src="..\bin\WinMute.exe" target="bin" />
 		<file src="..\bin\WinMute.exe.gui" target="bin" />
-		<file src="..\bin\ScreensaverProxy32.exe" target="bin" />
-		<file src="..\bin\ScreensaverNotify.dll" target="bin" />
-		<file src="..\bin\ScreensaverNotify32.dll" target="bin" />
 		<file src="..\bin\changelog.txt" target="bin" />
 		<file src="..\bin\license.txt" target="bin" />
 		<file src="..\bin\liesmich.html" target="bin" />

diff --git a/Dist/screenshots/app.png b/Dist/screenshots/app.png
diff --git a/Dist/screenshots/settings_general.png b/Dist/screenshots/settings_general.png
diff --git a/ScreensaverNotify/ScreensaverNotify.cpp b/ScreensaverNotify/ScreensaverNotify.cpp
diff --git a/ScreensaverNotify/ScreensaverNotify.h b/ScreensaverNotify/ScreensaverNotify.h