DarthAffe/Artemis
1
0
Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2025-12-13 05:48:35 +00:00
Code Issues Releases Wiki Activity

Don't render device types that aren't usable

Browse Source
This commit is contained in:
SpoinkyNL 2017-01-19 14:50:58 +01:00
parent 039593c6fe
commit d7bf26a738
5 changed files with 286 additions and 257 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
Artemis/Artemis/Managers/LoopManager.cs
View File

@ -52,8 +52,8 @@ namespace Artemis.Managers
//TODO DarthAffe 14.01.2017: A stop-condition and a real cleanup instead of just aborting might be better //TODO DarthAffe 14.01.2017: A stop-condition and a real cleanup instead of just aborting might be better
while (true) while (true)
{ {
// try try
// { {
long preUpdateTicks = DateTime.Now.Ticks; long preUpdateTicks = DateTime.Now.Ticks;
Render(); Render();
@ -61,11 +61,11 @@ namespace Artemis.Managers
int sleep = (int)(40f - ((DateTime.Now.Ticks - preUpdateTicks) / 10000f)); int sleep = (int)(40f - ((DateTime.Now.Ticks - preUpdateTicks) / 10000f));
if (sleep > 0) if (sleep > 0)
Thread.Sleep(sleep); Thread.Sleep(sleep);
// } }
// catch (Exception e) catch (Exception e)
// { {
// _logger.Warn(e, "Exception in render loop"); _logger.Warn(e, "Exception in render loop");
// } }
} }
// ReSharper disable once FunctionNeverReturns // ReSharper disable once FunctionNeverReturns
} }
@ -157,10 +157,11 @@ namespace Artemis.Managers
var headsets = _deviceManager.HeadsetProviders.Where(m => m.CanUse).ToList(); var headsets = _deviceManager.HeadsetProviders.Where(m => m.CanUse).ToList();
var generics = _deviceManager.GenericProviders.Where(m => m.CanUse).ToList(); var generics = _deviceManager.GenericProviders.Where(m => m.CanUse).ToList();
var mousemats = _deviceManager.MousematProviders.Where(m => m.CanUse).ToList(); var mousemats = _deviceManager.MousematProviders.Where(m => m.CanUse).ToList();
var keyboardOnly = !mice.Any() && !headsets.Any() && !generics.Any() && !mousemats.Any(); var keyboardOnly = !mice.Any() && !headsets.Any() && !generics.Any() && !mousemats.Any();
// Setup the frame for this tick // Setup the frame for this tick
using (var frame = new RenderFrame(_deviceManager.ActiveKeyboard)) using (var frame = new RenderFrame(_deviceManager.ActiveKeyboard, mice.Any(), headsets.Any(), generics.Any(), mousemats.Any()))
{ {
if (renderModule.IsInitialized) if (renderModule.IsInitialized)
renderModule.Render(frame, keyboardOnly); renderModule.Render(frame, keyboardOnly);
@ -202,45 +203,53 @@ namespace Artemis.Managers
public class RenderFrame : IDisposable public class RenderFrame : IDisposable
{ {
public RenderFrame(KeyboardProvider keyboard) public RenderFrame(KeyboardProvider keyboard, bool renderMice, bool renderHeadsets, bool renderGenerics, bool renderMousemats)
{ {
if (keyboard == null) if (keyboard == null)
return; return;
KeyboardBitmap = keyboard.KeyboardBitmap(); KeyboardBitmap = keyboard.KeyboardBitmap();
KeyboardBitmap.SetResolution(96, 96); KeyboardBitmap.SetResolution(96, 96);
MouseBitmap = new Bitmap(10, 10);
MouseBitmap.SetResolution(96, 96);
HeadsetBitmap = new Bitmap(10, 10);
HeadsetBitmap.SetResolution(96, 96);
GenericBitmap = new Bitmap(10, 10);
GenericBitmap.SetResolution(96, 96);
MousematBitmap = new Bitmap(10, 10);
MousematBitmap.SetResolution(96, 96);
using (var g = Graphics.FromImage(KeyboardBitmap)) using (var g = Graphics.FromImage(KeyboardBitmap))
{ {
g.Clear(Color.Black); g.Clear(Color.Black);
} }
using (var g = Graphics.FromImage(MouseBitmap))
if (renderMice)
{ {
g.Clear(Color.Black); MouseBitmap = new Bitmap(10, 10);
MouseBitmap.SetResolution(96, 96);
using (var g = Graphics.FromImage(MouseBitmap))
{
g.Clear(Color.Black);
}
} }
using (var g = Graphics.FromImage(HeadsetBitmap)) if (renderHeadsets)
{ {
g.Clear(Color.Black); HeadsetBitmap = new Bitmap(10, 10);
HeadsetBitmap.SetResolution(96, 96);
using (var g = Graphics.FromImage(HeadsetBitmap))
{
g.Clear(Color.Black);
}
} }
using (var g = Graphics.FromImage(GenericBitmap)) if (renderGenerics)
{ {
g.Clear(Color.Black); GenericBitmap = new Bitmap(10, 10);
GenericBitmap.SetResolution(96, 96);
using (var g = Graphics.FromImage(GenericBitmap))
{
g.Clear(Color.Black);
}
} }
using (var g = Graphics.FromImage(MousematBitmap)) if (renderMousemats)
{ {
g.Clear(Color.Black); MousematBitmap = new Bitmap(10, 10);
MousematBitmap.SetResolution(96, 96);
using (var g = Graphics.FromImage(MousematBitmap))
{
g.Clear(Color.Black);
}
} }
} }

28
Artemis/Artemis/Modules/Abstract/ModuleModel.cs
View File

@ -164,24 +164,36 @@ namespace Artemis.Modules.Abstract
} }
// Render mice layer-by-layer // Render mice layer-by-layer
var devRec = new Rect(0, 0, 10, 10); var devRec = new Rect(0, 0, 10, 10);
using (var g = Graphics.FromImage(frame.MouseBitmap)) if (frame.MouseBitmap != null)
{ {
ProfileModel?.DrawLayers(g, layers, DrawType.Mouse, DataModel, devRec, preview); using (var g = Graphics.FromImage(frame.MouseBitmap))
{
ProfileModel?.DrawLayers(g, layers, DrawType.Mouse, DataModel, devRec, preview);
}
} }
// Render headsets layer-by-layer // Render headsets layer-by-layer
using (var g = Graphics.FromImage(frame.HeadsetBitmap)) if (frame.HeadsetBitmap != null)
{ {
ProfileModel?.DrawLayers(g, layers, DrawType.Headset, DataModel, devRec, preview); using (var g = Graphics.FromImage(frame.HeadsetBitmap))
{
ProfileModel?.DrawLayers(g, layers, DrawType.Headset, DataModel, devRec, preview);
}
} }
// Render generic devices layer-by-layer // Render generic devices layer-by-layer
using (var g = Graphics.FromImage(frame.GenericBitmap)) if (frame.GenericBitmap != null)
{ {
ProfileModel?.DrawLayers(g, layers, DrawType.Generic, DataModel, devRec, preview); using (var g = Graphics.FromImage(frame.GenericBitmap))
{
ProfileModel?.DrawLayers(g, layers, DrawType.Generic, DataModel, devRec, preview);
}
} }
// Render mousemats layer-by-layer // Render mousemats layer-by-layer
using (var g = Graphics.FromImage(frame.MousematBitmap)) if (frame.MousematBitmap != null)
{ {
ProfileModel?.DrawLayers(g, layers, DrawType.Mousemat, DataModel, devRec, preview); using (var g = Graphics.FromImage(frame.MousematBitmap))
{
ProfileModel?.DrawLayers(g, layers, DrawType.Mousemat, DataModel, devRec, preview);
}
} }
// Trace debugging // Trace debugging

17
Artemis/Artemis/Modules/General/GeneralProfile/GeneralProfileModel.cs
View File

@ -75,17 +75,23 @@ namespace Artemis.Modules.General.GeneralProfile
private MMDevice _defaultRecording; private MMDevice _defaultRecording;
private MMDevice _defaultPlayback; private MMDevice _defaultPlayback;
private AudioMeterInformation _recordingInfo;
private AudioMeterInformation _playbackInfo;
private void SetupAudio() private void SetupAudio()
{ {
_defaultPlayback = MMDeviceEnumerator.DefaultAudioEndpoint(DataFlow.Render, Role.Multimedia);
_defaultRecording = MMDeviceEnumerator.DefaultAudioEndpoint(DataFlow.Capture, Role.Multimedia); _defaultRecording = MMDeviceEnumerator.DefaultAudioEndpoint(DataFlow.Capture, Role.Multimedia);
_recordingInfo = AudioMeterInformation.FromDevice(_defaultRecording);
_defaultPlayback = MMDeviceEnumerator.DefaultAudioEndpoint(DataFlow.Render, Role.Multimedia);
_playbackInfo = AudioMeterInformation.FromDevice(_defaultPlayback);
} }
private void AudioDeviceChanged(object sender, AudioDeviceChangedEventArgs e) private void AudioDeviceChanged(object sender, AudioDeviceChangedEventArgs e)
{ {
_defaultRecording = e.DefaultRecording; _defaultRecording = e.DefaultRecording;
_recordingInfo = AudioMeterInformation.FromDevice(_defaultRecording);
_defaultPlayback = e.DefaultPlayback; _defaultPlayback = e.DefaultPlayback;
_playbackInfo = AudioMeterInformation.FromDevice(_defaultPlayback);
} }
private void UpdateAudio(GeneralProfileDataModel dataModel) private void UpdateAudio(GeneralProfileDataModel dataModel)
@ -93,8 +99,8 @@ namespace Artemis.Modules.General.GeneralProfile
// Update microphone, only bother with OverallPeak // Update microphone, only bother with OverallPeak
if (_defaultRecording != null) if (_defaultRecording != null)
{ {
var recording = AudioMeterInformation.FromDevice(_defaultRecording);
dataModel.Audio.Recording.OverallPeak = recording.PeakValue; dataModel.Audio.Recording.OverallPeak = _recordingInfo.PeakValue;
} }
if (_defaultPlayback == null) if (_defaultPlayback == null)
@ -105,9 +111,8 @@ namespace Artemis.Modules.General.GeneralProfile
// Update speakers, only do overall, left and right for now // Update speakers, only do overall, left and right for now
// TODO: When adding list support lets do all channels // TODO: When adding list support lets do all channels
var playback = AudioMeterInformation.FromDevice(_defaultPlayback); var peakValues = _playbackInfo.GetChannelsPeakValues();
var peakValues = playback.GetChannelsPeakValues(); dataModel.Audio.Playback.OverallPeak = _playbackInfo.PeakValue;
dataModel.Audio.Playback.OverallPeak = playback.PeakValue;
dataModel.Audio.Playback.LeftPeak = peakValues[0]; dataModel.Audio.Playback.LeftPeak = peakValues[0];
dataModel.Audio.Playback.LeftPeak = peakValues[1]; dataModel.Audio.Playback.LeftPeak = peakValues[1];
} }

20
Artemis/Artemis/Profiles/Layers/Types/Audio/AudioType.cs
View File

@ -75,41 +75,41 @@ namespace Artemis.Profiles.Layers.Types.Audio
var direction = ((AudioPropertiesModel) layerModel.Properties).Direction; var direction = ((AudioPropertiesModel) layerModel.Properties).Direction;
// Create a geometry that will be formed by all the bars // Create a geometry that will be formed by all the bars
Geometry barGeometry = new RectangleGeometry(); GeometryGroup barGeometry = new GeometryGroup();
switch (direction) switch (direction)
{ {
case Direction.TopToBottom: case Direction.TopToBottom:
for (var index = 0; index < _lineValues.Count; index++) for (var index = 0; index < _lineValues.Count; index++)
{ {
var clipRect = new Rect((parentX + index)*4, parentY*4, 4, _lineValues[index]*4); var clipRect = new Rect((parentX + index) * 4, parentY * 4, 4, _lineValues[index] * 4);
var barRect = new RectangleGeometry(clipRect); var barRect = new RectangleGeometry(clipRect);
barGeometry = Geometry.Combine(barGeometry, barRect, CombineMode, Transform.Identity); barGeometry.Children.Add(barRect);
} }
break; break;
case Direction.BottomToTop: case Direction.BottomToTop:
for (var index = 0; index < _lineValues.Count; index++) for (var index = 0; index < _lineValues.Count; index++)
{ {
var clipRect = new Rect((parentX + index)*4, parentY*4, 4, _lineValues[index]*4); var clipRect = new Rect((parentX + index) * 4, parentY * 4, 4, _lineValues[index] * 4);
clipRect.Y = clipRect.Y + layerModel.Height*4 - clipRect.Height; clipRect.Y = clipRect.Y + layerModel.Height * 4 - clipRect.Height;
var barRect = new RectangleGeometry(clipRect); var barRect = new RectangleGeometry(clipRect);
barGeometry = Geometry.Combine(barGeometry, barRect, CombineMode, Transform.Identity); barGeometry.Children.Add(barRect);
} }
break; break;
case Direction.LeftToRight: case Direction.LeftToRight:
for (var index = 0; index < _lineValues.Count; index++) for (var index = 0; index < _lineValues.Count; index++)
{ {
var clipRect = new Rect((parentX + index)*4, parentY*4, 4, _lineValues[index]*4); var clipRect = new Rect((parentX + index) * 4, parentY * 4, 4, _lineValues[index] * 4);
var barRect = new RectangleGeometry(clipRect); var barRect = new RectangleGeometry(clipRect);
barGeometry = Geometry.Combine(barGeometry, barRect, CombineMode, Transform.Identity); barGeometry.Children.Add(barRect);
} }
break; break;
default: default:
for (var index = 0; index < _lineValues.Count; index++) for (var index = 0; index < _lineValues.Count; index++)
{ {
var clipRect = new Rect((parentX + index)*4, parentY*4, 4, _lineValues[index]*4); var clipRect = new Rect((parentX + index) * 4, parentY * 4, 4, _lineValues[index] * 4);
var barRect = new RectangleGeometry(clipRect); var barRect = new RectangleGeometry(clipRect);
barGeometry = Geometry.Combine(barGeometry, barRect, CombineMode, Transform.Identity); barGeometry.Children.Add(barRect);
} }
break; break;
} }

25
Artemis/Artemis/ViewModels/DebugViewModel.cs
View File

@ -6,20 +6,19 @@ using System.Windows.Media;
using Artemis.Managers; using Artemis.Managers;
using Artemis.Utilities; using Artemis.Utilities;
using Caliburn.Micro; using Caliburn.Micro;
using Action = System.Action;
namespace Artemis.ViewModels namespace Artemis.ViewModels
{ {
public class DebugViewModel : Screen public class DebugViewModel : Screen
{ {
private readonly DeviceManager _deviceManager; private readonly DeviceManager _deviceManager;
private DrawingImage _generic;
private DrawingImage _razerDisplay; private DrawingImage _headset;
private DrawingImage _keyboard; private DrawingImage _keyboard;
private DrawingImage _mouse; private DrawingImage _mouse;
private DrawingImage _headset;
private DrawingImage _mousemat; private DrawingImage _mousemat;
private DrawingImage _generic;
private DrawingImage _razerDisplay;
public DebugViewModel(DeviceManager deviceManager) public DebugViewModel(DeviceManager deviceManager)
{ {
@ -116,8 +115,8 @@ namespace Artemis.ViewModels
{ {
dc.PushClip(new RectangleGeometry(new Rect(0, 0, 22, 6))); dc.PushClip(new RectangleGeometry(new Rect(0, 0, 22, 6)));
for (var y = 0; y < 6; y++) for (var y = 0; y < 6; y++)
for (var x = 0; x < 22; x++) for (var x = 0; x < 22; x++)
dc.DrawRectangle(new SolidColorBrush(colors[y, x]), null, new Rect(x, y, 1, 1)); dc.DrawRectangle(new SolidColorBrush(colors[y, x]), null, new Rect(x, y, 1, 1));
} }
var drawnDisplay = new DrawingImage(visual.Drawing); var drawnDisplay = new DrawingImage(visual.Drawing);
drawnDisplay.Freeze(); drawnDisplay.Freeze();
@ -137,10 +136,14 @@ namespace Artemis.ViewModels
Keyboard = ImageUtilities.BitmapToDrawingImage(frame.KeyboardBitmap, rect); Keyboard = ImageUtilities.BitmapToDrawingImage(frame.KeyboardBitmap, rect);
} }
Mouse = ImageUtilities.BitmapToDrawingImage(frame.MouseBitmap, new Rect(0, 0, 10, 10)); if (frame.MouseBitmap != null)
Headset = ImageUtilities.BitmapToDrawingImage(frame.HeadsetBitmap, new Rect(0, 0, 10, 10)); Mouse = ImageUtilities.BitmapToDrawingImage(frame.MouseBitmap, new Rect(0, 0, 10, 10));
Mousemat = ImageUtilities.BitmapToDrawingImage(frame.MousematBitmap, new Rect(0, 0, 10, 10)); if (frame.HeadsetBitmap != null)
Generic = ImageUtilities.BitmapToDrawingImage(frame.GenericBitmap, new Rect(0, 0, 10, 10)); Headset = ImageUtilities.BitmapToDrawingImage(frame.HeadsetBitmap, new Rect(0, 0, 10, 10));
if (frame.MousematBitmap != null)
Mousemat = ImageUtilities.BitmapToDrawingImage(frame.MousematBitmap, new Rect(0, 0, 10, 10));
if (frame.GenericBitmap != null)
Generic = ImageUtilities.BitmapToDrawingImage(frame.GenericBitmap, new Rect(0, 0, 10, 10));
} }
} }
} }