- Fix wrong sound volume control

- Upgraded to .NET Framework 4.8
- Test Application with x64 support

Author: Sascha Lange

Source/DirectShow/MediaPlayers/BaseClasses.cs

@@ -391,8 +391,16 @@ public virtual double Volume
                 m_basicAudio.get_Volume(out dShowVolume);
 
                 /* Do calulations to convert to a base of 0 for silence */
-                dShowVolume -= DSHOW_VOLUME_SILENCE;
-                return (double)dShowVolume / -DSHOW_VOLUME_SILENCE;
+                if (dShowVolume <= DSHOW_VOLUME_SILENCE)
+                    return 0.0;
+                else if (dShowVolume >= DSHOW_VOLUME_MAX)
+                    return 1.0;
+                else
+                {
+                    return Math.Pow(10, ((double)dShowVolume / 20 / 100));
+                }
+
+
             }
             set
             {
@@ -413,7 +421,10 @@ public virtual double Volume
                      * for silence and DSHOW_VOLUME_MAX for full volume
                      * so we calculate that here based off an input of 0 of silence and 1.0
                      * for full audio */
-                    int dShowVolume = (int)((1 - value) * DSHOW_VOLUME_SILENCE);
+
+                    //int dShowVolume = (int)((1 - value) * DSHOW_VOLUME_SILENCE);
+
+                    int dShowVolume = (int)(20 * Math.Log10(value) * 100);
                     m_basicAudio.put_Volume(dShowVolume);
                 }
             }
@@ -857,7 +868,7 @@ private IBaseFilter CreateEnhancedVideoRenderer(IGraphBuilder graph, int streamC
             {
                 var evr = new EnhancedVideoRenderer();
                 filter = evr as IBaseFilter;
-                
+
                 int hr = graph.AddFilter(filter, string.Format("Renderer: {0}", VideoRendererType.EnhancedVideoRenderer));
                 DsError.ThrowExceptionForHR(hr);
 

Source/Properties/AssemblyInfo.cs

@@ -8,7 +8,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("WPF MediaKit Team")]
 [assembly: AssemblyProduct("WPF MediaKit")]
-[assembly: AssemblyCopyright("Copyright © 2015-2017 by WPF MediaKit Team")]
+[assembly: AssemblyCopyright("Copyright © 2015-2024 by WPF MediaKit Team")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -25,4 +25,4 @@
 
 
 
-[assembly: AssemblyVersion("2.2.0")]
+[assembly: AssemblyVersion("2.3.0")]

Source/Properties/Resources.Designer.cs

@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>WPFMediaKit</RootNamespace>
     <AssemblyName>WPFMediaKit</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>

Source/Properties/Settings.Designer.cs

@@ -12,7 +12,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("Test Application")]
-[assembly: AssemblyCopyright("Copyright ©  2015")]
+[assembly: AssemblyCopyright("Copyright ©  2024")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]