Small refactorings

This commit is contained in:
Darth Affe 2022-05-01 14:34:12 +02:00
parent dee0c096a6
commit 19080e6ec7
10 changed files with 1031 additions and 1041 deletions

View File

@ -11,8 +11,8 @@ using Vortice.Mathematics;
using MapFlags = Vortice.Direct3D11.MapFlags;
using ResultCode = Vortice.DXGI.ResultCode;
namespace ScreenCapture.NET
{
namespace ScreenCapture.NET;
/// <summary>
/// Represents a ScreenCapture using DirectX 11 desktop duplicaton.
/// https://docs.microsoft.com/en-us/windows/win32/direct3ddxgi/desktop-dup-api
@ -353,12 +353,12 @@ namespace ScreenCapture.NET
List<CaptureZone> captureZones = _captureZones.Keys.ToList();
Dispose();
using IDXGIAdapter1 adapter = _factory.GetAdapter1(Display.GraphicsCard.Index);
using IDXGIAdapter1 adapter = _factory.GetAdapter1(Display.GraphicsCard.Index) ?? throw new ApplicationException("Couldn't create DirectX-Adapter.");
D3D11.D3D11CreateDevice(adapter, DriverType.Unknown, DeviceCreationFlags.None, FEATURE_LEVELS, out _device).CheckError();
_context = _device.ImmediateContext;
_context = _device!.ImmediateContext;
_output = adapter.GetOutput(Display.Index);
_output = adapter.GetOutput(Display.Index) ?? throw new ApplicationException("Couldn't get DirectX-Output.");
using IDXGIOutput5 output = _output.QueryInterface<IDXGIOutput5>();
Texture2DDescription captureTextureDesc = new()
@ -427,4 +427,3 @@ namespace ScreenCapture.NET
#endregion
}
}

View File

@ -2,10 +2,10 @@
using System.Collections.Generic;
using Vortice.DXGI;
namespace ScreenCapture.NET
{
namespace ScreenCapture.NET;
/// <summary>
///
/// Represents a <see cref="IScreenCaptureService"/> using the <see cref="DX11ScreenCapture"/>.
/// </summary>
public class DX11ScreenCaptureService : IScreenCaptureService
{
@ -20,11 +20,11 @@ namespace ScreenCapture.NET
#region Constructors
/// <summary>
///
/// Initializes a new instance of the <see cref="DX11ScreenCaptureService"/> class.
/// </summary>
public DX11ScreenCaptureService()
{
DXGI.CreateDXGIFactory1(out _factory).CheckError();
DXGI.CreateDXGIFactory1(out _factory!).CheckError();
}
#endregion
@ -81,4 +81,3 @@ namespace ScreenCapture.NET
#endregion
}
}

View File

@ -2,8 +2,8 @@
using System;
namespace ScreenCapture.NET
{
namespace ScreenCapture.NET;
/// <inheritdoc />
/// <summary>
/// Represents the information supplied with an <see cref="E:ScreenCapture.IDX11ScreenCapture.Updated" />-event.
@ -32,4 +32,3 @@ namespace ScreenCapture.NET
#endregion
}
}

View File

@ -3,8 +3,8 @@
using System.Runtime.InteropServices;
namespace ScreenCapture.NET
{
namespace ScreenCapture.NET;
/// <summary>
/// Helper-class for DPI-related WIN-API calls.
/// </summary>
@ -39,4 +39,3 @@ namespace ScreenCapture.NET
/// </summary>
public static void Initalize() => SetProcessDpiAwarenessContext((int)DPI_AWARENESS_CONTEXT.DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2);
}
}

View File

@ -1,7 +1,7 @@
using System;
namespace ScreenCapture.NET
{
namespace ScreenCapture.NET;
/// <summary>
/// Represents the duplication of a single display.
/// </summary>
@ -60,4 +60,3 @@ namespace ScreenCapture.NET
/// </summary>
void Restart();
}
}

View File

@ -1,8 +1,8 @@
using System;
using System.Collections.Generic;
namespace ScreenCapture.NET
{
namespace ScreenCapture.NET;
/// <summary>
///
/// </summary>
@ -28,4 +28,3 @@ namespace ScreenCapture.NET
/// <returns>The <see cref="IScreenCapture"/> for the give display.</returns>
IScreenCapture GetScreenCapture(Display display);
}
}

View File

@ -2,8 +2,8 @@
using System;
namespace ScreenCapture.NET
{
namespace ScreenCapture.NET;
/// <summary>
/// Represents the configuration for the detection and removal of black bars around the screen image.
/// </summary>
@ -139,4 +139,3 @@ namespace ScreenCapture.NET
#endregion
}
}

View File

@ -2,8 +2,8 @@
using System;
namespace ScreenCapture.NET
{
namespace ScreenCapture.NET;
/// <summary>
/// Represents a duplicated region on the screen.
/// </summary>
@ -159,4 +159,3 @@ namespace ScreenCapture.NET
#endregion
}
}

View File

@ -1,7 +1,7 @@
// ReSharper disable MemberCanBePrivate.Global
namespace ScreenCapture.NET
{
namespace ScreenCapture.NET;
/// <summary>
/// Represents a display connected to graphics-card.
/// </summary>
@ -90,4 +90,3 @@ namespace ScreenCapture.NET
#endregion
}
}

View File

@ -1,7 +1,7 @@
// ReSharper disable MemberCanBePrivate.Global
namespace ScreenCapture.NET
{
namespace ScreenCapture.NET;
/// <summary>
/// Represents a graphics-card.
/// </summary>
@ -83,4 +83,3 @@ namespace ScreenCapture.NET
#endregion
}
}