1
0
mirror of https://github.com/Artemis-RGB/Artemis synced 2025-12-13 05:48:35 +00:00

Added enum to allow the selection of ScreenCapturing-Modes

This commit is contained in:
Darth Affe 2016-11-01 14:53:40 +01:00
parent 447adfedc4
commit 3f306ed86d
3 changed files with 43 additions and 8 deletions

View File

@ -417,6 +417,7 @@
<Compile Include="Profiles\Layers\Types\AmbientLight\Model\Extensions\EnumExtension.cs" />
<Compile Include="Profiles\Layers\Types\AmbientLight\Model\Extensions\PixelDataExtension.cs" />
<Compile Include="Profiles\Layers\Types\AmbientLight\Model\FlipMode.cs" />
<Compile Include="Profiles\Layers\Types\AmbientLight\Model\ScreenCaptureMode.cs" />
<Compile Include="Profiles\Layers\Types\AmbientLight\Model\SmoothMode.cs" />
<Compile Include="Profiles\Layers\Types\AmbientLight\ScreenCapturing\DX9ScreenCapture.cs" />
<Compile Include="Profiles\Layers\Types\AmbientLight\ScreenCapturing\IScreenCapture.cs" />

View File

@ -0,0 +1,10 @@
using System.ComponentModel;
namespace Artemis.Profiles.Layers.Types.AmbientLight.Model
{
public enum ScreenCaptureMode
{
[Description("DirectX 9")]
DirectX9
}
}

View File

@ -1,7 +1,9 @@
using System;
using System.ComponentModel;
using System.Diagnostics;
using System.Threading;
using System.Windows.Media;
using Artemis.Profiles.Layers.Types.AmbientLight.Model;
namespace Artemis.Profiles.Layers.Types.AmbientLight.ScreenCapturing
{
@ -14,8 +16,12 @@ namespace Artemis.Profiles.Layers.Types.AmbientLight.ScreenCapturing
private static volatile byte[] _lastScreenCapture;
private static volatile bool _isRunning = false;
private static ScreenCaptureMode? _lastScreenCaptureMode = null;
private static IScreenCapture _screenCapture;
public static double StandByTime { get; set; } = 3;
public static double UpdateRate { get; set; } = 1f / 20f; // DarthAffe 29.10.2016: I think 20 FPS should be enough as default
public static ScreenCaptureMode ScreenCaptureMode { get; set; } = ScreenCaptureMode.DirectX9;
public static int LastCaptureWidth { get; private set; }
public static int LastCaptureHeight { get; private set; }
@ -27,10 +33,27 @@ namespace Artemis.Profiles.Layers.Types.AmbientLight.ScreenCapturing
private static IScreenCapture GetScreenCapture()
{
return new DX9ScreenCapture();
if (_lastScreenCaptureMode == ScreenCaptureMode)
return _screenCapture;
DisposeScreenCapture();
_lastScreenCaptureMode = ScreenCaptureMode;
switch (ScreenCaptureMode)
{
case ScreenCaptureMode.DirectX9: return _screenCapture = new DX9ScreenCapture();
default: throw new InvalidEnumArgumentException();
}
}
private static void Update(IScreenCapture screenCapture)
private static void DisposeScreenCapture()
{
_screenCapture?.Dispose();
_screenCapture = null;
_lastScreenCapture = null;
}
private static void Update()
{
try
{
@ -39,7 +62,7 @@ namespace Artemis.Profiles.Layers.Types.AmbientLight.ScreenCapturing
DateTime lastCapture = DateTime.Now;
try
{
CaptureScreen(screenCapture);
CaptureScreen();
}
catch (Exception ex)
{
@ -53,13 +76,15 @@ namespace Artemis.Profiles.Layers.Types.AmbientLight.ScreenCapturing
}
finally
{
screenCapture.Dispose();
DisposeScreenCapture();
_isRunning = false;
}
}
private static void CaptureScreen(IScreenCapture screenCapture)
private static void CaptureScreen()
{
IScreenCapture screenCapture = GetScreenCapture();
_lastScreenCapture = screenCapture.CaptureScreen();
LastCaptureWidth = screenCapture.Width;
LastCaptureHeight = screenCapture.Height;
@ -68,14 +93,13 @@ namespace Artemis.Profiles.Layers.Types.AmbientLight.ScreenCapturing
private static void StartLoop()
{
IScreenCapture screenCapture = GetScreenCapture();
if (_isRunning) return;
// DarthAffe 31.10.2016: _lastScreenCapture should be always initialized!
CaptureScreen(screenCapture);
CaptureScreen();
_isRunning = true;
_worker = new Thread(() => Update(screenCapture));
_worker = new Thread(Update);
_worker.Start();
}