Skip to content

Commit a1b8f56

Browse files
author
Sascha Lange
committed
- Fix wrong sound volume control
- Upgraded to .NET Framework 4.8 - Test Application with x64 support
1 parent 0166955 commit a1b8f56

13 files changed

+71
-30
lines changed

‎Source/DirectShow/MediaPlayers/BaseClasses.cs

+15-4
Original file line numberDiff line numberDiff line change
@@ -391,8 +391,16 @@ public virtual double Volume
391391
m_basicAudio.get_Volume(out dShowVolume);
392392

393393
/* Do calulations to convert to a base of 0 for silence */
394-
dShowVolume -= DSHOW_VOLUME_SILENCE;
395-
return (double)dShowVolume / -DSHOW_VOLUME_SILENCE;
394+
if (dShowVolume <= DSHOW_VOLUME_SILENCE)
395+
return 0.0;
396+
else if (dShowVolume >= DSHOW_VOLUME_MAX)
397+
return 1.0;
398+
else
399+
{
400+
return Math.Pow(10, ((double)dShowVolume / 20 / 100));
401+
}
402+
403+
396404
}
397405
set
398406
{
@@ -413,7 +421,10 @@ public virtual double Volume
413421
* for silence and DSHOW_VOLUME_MAX for full volume
414422
* so we calculate that here based off an input of 0 of silence and 1.0
415423
* for full audio */
416-
int dShowVolume = (int)((1 - value) * DSHOW_VOLUME_SILENCE);
424+
425+
//int dShowVolume = (int)((1 - value) * DSHOW_VOLUME_SILENCE);
426+
427+
int dShowVolume = (int)(20 * Math.Log10(value) * 100);
417428
m_basicAudio.put_Volume(dShowVolume);
418429
}
419430
}
@@ -857,7 +868,7 @@ private IBaseFilter CreateEnhancedVideoRenderer(IGraphBuilder graph, int streamC
857868
{
858869
var evr = new EnhancedVideoRenderer();
859870
filter = evr as IBaseFilter;
860-
871+
861872
int hr = graph.AddFilter(filter, string.Format("Renderer: {0}", VideoRendererType.EnhancedVideoRenderer));
862873
DsError.ThrowExceptionForHR(hr);
863874

‎Source/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
[assembly: AssemblyConfiguration("")]
99
[assembly: AssemblyCompany("WPF MediaKit Team")]
1010
[assembly: AssemblyProduct("WPF MediaKit")]
11-
[assembly: AssemblyCopyright("Copyright © 2015-2017 by WPF MediaKit Team")]
11+
[assembly: AssemblyCopyright("Copyright © 2015-2024 by WPF MediaKit Team")]
1212
[assembly: AssemblyTrademark("")]
1313
[assembly: AssemblyCulture("")]
1414

@@ -25,4 +25,4 @@
2525

2626

2727

28-
[assembly: AssemblyVersion("2.2.0")]
28+
[assembly: AssemblyVersion("2.3.0")]

‎Source/Properties/Resources.Designer.cs

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Source/Properties/Settings.Designer.cs

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Source/WPF MediaKit.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>WPFMediaKit</RootNamespace>
1111
<AssemblyName>WPFMediaKit</AssemblyName>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1515
<WarningLevel>4</WarningLevel>

‎Test Application/EVRPresenter32.dll

3 KB
Binary file not shown.

‎Test Application/EVRPresenter64.dll

53 KB
Binary file not shown.

‎Test Application/Properties/AssemblyInfo.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
[assembly: AssemblyConfiguration("")]
1313
[assembly: AssemblyCompany("")]
1414
[assembly: AssemblyProduct("Test Application")]
15-
[assembly: AssemblyCopyright("Copyright © 2015")]
15+
[assembly: AssemblyCopyright("Copyright © 2024")]
1616
[assembly: AssemblyTrademark("")]
1717
[assembly: AssemblyCulture("")]
1818

‎Test Application/Properties/Resources.Designer.cs

+8-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Test Application/Properties/Settings.Designer.cs

+5-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Test Application/Test Application.csproj

+32-2
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,29 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>Test_Application</RootNamespace>
1111
<AssemblyName>Test Application</AssemblyName>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1515
<WarningLevel>4</WarningLevel>
1616
<TargetFrameworkProfile />
17+
<PublishUrl>publish\</PublishUrl>
18+
<Install>true</Install>
19+
<InstallFrom>Disk</InstallFrom>
20+
<UpdateEnabled>false</UpdateEnabled>
21+
<UpdateMode>Foreground</UpdateMode>
22+
<UpdateInterval>7</UpdateInterval>
23+
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
24+
<UpdatePeriodically>false</UpdatePeriodically>
25+
<UpdateRequired>false</UpdateRequired>
26+
<MapFileExtensions>true</MapFileExtensions>
27+
<ApplicationRevision>0</ApplicationRevision>
28+
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
29+
<IsWebBootstrapper>false</IsWebBootstrapper>
30+
<UseApplicationTrust>false</UseApplicationTrust>
31+
<BootstrapperEnabled>true</BootstrapperEnabled>
1732
</PropertyGroup>
1833
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
19-
<PlatformTarget>x86</PlatformTarget>
34+
<PlatformTarget>AnyCPU</PlatformTarget>
2035
<DebugSymbols>true</DebugSymbols>
2136
<DebugType>full</DebugType>
2237
<Optimize>false</Optimize>
@@ -106,6 +121,21 @@
106121
<Content Include="EVRPresenter32.dll">
107122
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
108123
</Content>
124+
<Content Include="EVRPresenter64.dll">
125+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
126+
</Content>
127+
</ItemGroup>
128+
<ItemGroup>
129+
<BootstrapperPackage Include=".NETFramework,Version=v4.8">
130+
<Visible>False</Visible>
131+
<ProductName>Microsoft .NET Framework 4.8 %28x86 und x64%29</ProductName>
132+
<Install>true</Install>
133+
</BootstrapperPackage>
134+
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
135+
<Visible>False</Visible>
136+
<ProductName>.NET Framework 3.5 SP1</ProductName>
137+
<Install>false</Install>
138+
</BootstrapperPackage>
109139
</ItemGroup>
110140
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
111141
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

‎Test Application/app.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
3+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>

‎nuget/Package.nuspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
<package >
33
<metadata>
44
<id>WPFMediaKit</id>
5-
<version>2.2.0</version>
5+
<version>2.3.0</version>
66
<authors>WPF MediaKit Team</authors>
77
<owners>WPF MediaKit Team</owners>
88
<licenseUrl>https://github.com/Sascha-L/WPF-MediaKit/blob/master/License.txt</licenseUrl>
99
<projectUrl>https://github.com/Sascha-L/WPF-MediaKit</projectUrl>
1010
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1111
<description>A library to quickly build DirectShow and MediaFoundation media player controls in WPF. The kit comes with a MediaElement replacement, a VideoCaptureElement for web cams and a DVDPlayerElement that plays DVDs and supports interactive menus.</description>
1212
<releaseNotes>Some bugfixes and performance improvements.</releaseNotes>
13-
<copyright>Copyright © 2015-2017 by WPF MediaKit Team</copyright>
13+
<copyright>Copyright © 2015-2024 by WPF MediaKit Team</copyright>
1414
<tags>wpf video directshow evr dvd player media MediaFoundation</tags>
1515
</metadata>
1616
<files>

0 commit comments

Comments
 (0)