diff --git a/KeyboardAudioVisualizer/Configuration/Settings.cs b/KeyboardAudioVisualizer/Configuration/Settings.cs
index d39e417..554e618 100644
--- a/KeyboardAudioVisualizer/Configuration/Settings.cs
+++ b/KeyboardAudioVisualizer/Configuration/Settings.cs
@@ -88,13 +88,13 @@ namespace KeyboardAudioVisualizer.Configuration
{
case VisualizationIndex.Primary:
SelectedVisualization = VisualizationType.FrequencyBars;
- Gradient = new LinearGradient(new GradientStop(0, Color.FromHSV(300, 1, 1)),
- new GradientStop(0.20, Color.FromHSV(225, 1, 1)),
- new GradientStop(0.35, Color.FromHSV(180, 1, 1)),
- new GradientStop(0.50, Color.FromHSV(135, 1, 1)),
- new GradientStop(0.65, Color.FromHSV(90, 1, 1)),
- new GradientStop(0.80, Color.FromHSV(45, 1, 1)),
- new GradientStop(0.95, Color.FromHSV(0, 1, 1)));
+ Gradient = new LinearGradient(new GradientStop(0, HSVColor.Create(300, 1, 1)),
+ new GradientStop(0.20, HSVColor.Create(225, 1, 1)),
+ new GradientStop(0.35, HSVColor.Create(180, 1, 1)),
+ new GradientStop(0.50, HSVColor.Create(135, 1, 1)),
+ new GradientStop(0.65, HSVColor.Create(90, 1, 1)),
+ new GradientStop(0.80, HSVColor.Create(45, 1, 1)),
+ new GradientStop(0.95, HSVColor.Create(0, 1, 1)));
break;
case VisualizationIndex.Secondary:
diff --git a/KeyboardAudioVisualizer/Controls/ColorSelector.cs b/KeyboardAudioVisualizer/Controls/ColorSelector.cs
index 8fdf0f3..8b1e5ec 100644
--- a/KeyboardAudioVisualizer/Controls/ColorSelector.cs
+++ b/KeyboardAudioVisualizer/Controls/ColorSelector.cs
@@ -320,7 +320,7 @@ namespace KeyboardAudioVisualizer.Controls
private void HSVChanged()
{
- Color color = Color.FromHSV(_a, _hue, _saturation, _value);
+ Color color = HSVColor.Create(_a, _hue, _saturation, _value);
UpdateSelectedColor(color);
SetRGB(color);
UpdateUIColors();
@@ -331,7 +331,7 @@ namespace KeyboardAudioVisualizer.Controls
{
_ignorePropertyChanged = true;
- _a = color.A;
+ _a = color.GetA();
if (_sliderAlpha != null)
_sliderAlpha.Value = _a;
@@ -342,15 +342,15 @@ namespace KeyboardAudioVisualizer.Controls
{
_ignorePropertyChanged = true;
- _r = color.R;
+ _r = color.GetR();
if (_sliderRed != null)
_sliderRed.Value = _r;
- _g = color.G;
+ _g = color.GetG();
if (_sliderGreen != null)
_sliderGreen.Value = _g;
- _b = color.B;
+ _b = color.GetB();
if (_sliderBlue != null)
_sliderBlue.Value = _b;
@@ -361,15 +361,15 @@ namespace KeyboardAudioVisualizer.Controls
{
_ignorePropertyChanged = true;
- _hue = color.Hue;
+ _hue = color.GetHue();
if (_sliderHue != null)
_sliderHue.Value = _hue;
- _saturation = color.Saturation;
+ _saturation = color.GetSaturation();
if (_sliderSaturation != null)
_sliderSaturation.Value = _saturation;
- _value = color.Value;
+ _value = color.GetValue();
if (_sliderValue != null)
_sliderValue.Value = _value;
@@ -411,13 +411,13 @@ namespace KeyboardAudioVisualizer.Controls
private void UpdateUIColors()
{
- Color hueColor = Color.FromHSV(_hue, 1, 1);
+ Color hueColor = HSVColor.Create(_hue, 1, 1);
if (_previewBrush != null)
_previewBrush.Color = WpfColor.FromArgb(_a, _r, _g, _b);
if (_selectorBrush != null)
- _selectorBrush.Color = WpfColor.FromRgb(hueColor.R, hueColor.G, hueColor.B);
+ _selectorBrush.Color = WpfColor.FromRgb(hueColor.GetR(), hueColor.GetG(), hueColor.GetB());
if (_alphaBrush != null)
{
@@ -445,36 +445,36 @@ namespace KeyboardAudioVisualizer.Controls
if (_hueBrush != null)
{
- Color referenceColor1 = Color.FromHSV(0, _saturation, _value);
- Color referenceColor2 = Color.FromHSV(60, _saturation, _value);
- Color referenceColor3 = Color.FromHSV(120, _saturation, _value);
- Color referenceColor4 = Color.FromHSV(180, _saturation, _value);
- Color referenceColor5 = Color.FromHSV(240, _saturation, _value);
- Color referenceColor6 = Color.FromHSV(300, _saturation, _value);
+ Color referenceColor1 = HSVColor.Create(0, _saturation, _value);
+ Color referenceColor2 = HSVColor.Create(60, _saturation, _value);
+ Color referenceColor3 = HSVColor.Create(120, _saturation, _value);
+ Color referenceColor4 = HSVColor.Create(180, _saturation, _value);
+ Color referenceColor5 = HSVColor.Create(240, _saturation, _value);
+ Color referenceColor6 = HSVColor.Create(300, _saturation, _value);
- _hueBrush.GradientStops[0].Color = WpfColor.FromArgb(_a, referenceColor1.R, referenceColor1.G, referenceColor1.B);
- _hueBrush.GradientStops[1].Color = WpfColor.FromArgb(_a, referenceColor2.R, referenceColor2.G, referenceColor2.B);
- _hueBrush.GradientStops[2].Color = WpfColor.FromArgb(_a, referenceColor3.R, referenceColor3.G, referenceColor3.B);
- _hueBrush.GradientStops[3].Color = WpfColor.FromArgb(_a, referenceColor4.R, referenceColor4.G, referenceColor4.B);
- _hueBrush.GradientStops[4].Color = WpfColor.FromArgb(_a, referenceColor5.R, referenceColor5.G, referenceColor5.B);
- _hueBrush.GradientStops[5].Color = WpfColor.FromArgb(_a, referenceColor6.R, referenceColor6.G, referenceColor6.B);
- _hueBrush.GradientStops[6].Color = WpfColor.FromArgb(_a, referenceColor1.R, referenceColor1.G, referenceColor1.B);
+ _hueBrush.GradientStops[0].Color = WpfColor.FromArgb(_a, referenceColor1.GetR(), referenceColor1.GetG(), referenceColor1.GetB());
+ _hueBrush.GradientStops[1].Color = WpfColor.FromArgb(_a, referenceColor2.GetR(), referenceColor2.GetG(), referenceColor2.GetB());
+ _hueBrush.GradientStops[2].Color = WpfColor.FromArgb(_a, referenceColor3.GetR(), referenceColor3.GetG(), referenceColor3.GetB());
+ _hueBrush.GradientStops[3].Color = WpfColor.FromArgb(_a, referenceColor4.GetR(), referenceColor4.GetG(), referenceColor4.GetB());
+ _hueBrush.GradientStops[4].Color = WpfColor.FromArgb(_a, referenceColor5.GetR(), referenceColor5.GetG(), referenceColor5.GetB());
+ _hueBrush.GradientStops[5].Color = WpfColor.FromArgb(_a, referenceColor6.GetR(), referenceColor6.GetG(), referenceColor6.GetB());
+ _hueBrush.GradientStops[6].Color = WpfColor.FromArgb(_a, referenceColor1.GetR(), referenceColor1.GetG(), referenceColor1.GetB());
}
if (_saturationBrush != null)
{
- Color referenceColor = Color.FromHSV(_hue, 1, _value);
+ Color referenceColor = HSVColor.Create(_hue, 1, _value);
_saturationBrush.GradientStops[0].Color = WpfColor.FromArgb(_a, 255, 255, 255);
- _saturationBrush.GradientStops[1].Color = WpfColor.FromArgb(_a, referenceColor.R, referenceColor.G, referenceColor.B);
+ _saturationBrush.GradientStops[1].Color = WpfColor.FromArgb(_a, referenceColor.GetR(), referenceColor.GetG(), referenceColor.GetB());
}
if (_valueBrush != null)
{
- Color referenceColor = Color.FromHSV(_hue, _saturation, 1);
+ Color referenceColor = HSVColor.Create(_hue, _saturation, 1);
_valueBrush.GradientStops[0].Color = WpfColor.FromArgb(_a, 0, 0, 0);
- _valueBrush.GradientStops[1].Color = WpfColor.FromArgb(_a, referenceColor.R, referenceColor.G, referenceColor.B);
+ _valueBrush.GradientStops[1].Color = WpfColor.FromArgb(_a, referenceColor.GetR(), referenceColor.GetG(), referenceColor.GetB());
}
}
diff --git a/KeyboardAudioVisualizer/Controls/GradientEditor.cs b/KeyboardAudioVisualizer/Controls/GradientEditor.cs
index 3bcbd0f..cda585a 100644
--- a/KeyboardAudioVisualizer/Controls/GradientEditor.cs
+++ b/KeyboardAudioVisualizer/Controls/GradientEditor.cs
@@ -167,8 +167,8 @@ namespace KeyboardAudioVisualizer.Controls
private void UpdatePreviewRectangle(Rectangle rect, double referenceWidth, double referenceHeight, double from, double to,
RGB.NET.Core.Color startColor, RGB.NET.Core.Color endColor)
{
- rect.Fill = new LinearGradientBrush(Color.FromArgb(startColor.A, startColor.R, startColor.G, startColor.B),
- Color.FromArgb(endColor.A, endColor.R, endColor.G, endColor.B),
+ rect.Fill = new LinearGradientBrush(Color.FromArgb(startColor.GetA(), startColor.GetR(), startColor.GetG(), startColor.GetB()),
+ Color.FromArgb(endColor.GetA(), endColor.GetR(), endColor.GetG(), endColor.GetB()),
new Point(0, 0.5), new Point(1, 0.5));
//DarthAffe 09.02.2018: Forced rounding to prevent render issues on resize
@@ -212,7 +212,7 @@ namespace KeyboardAudioVisualizer.Controls
private void UpdateGradientStop(ContentControl control, double referenceWidth, double referenceHeight, GradientStop stop)
{
- control.Background = new SolidColorBrush(Color.FromArgb(stop.Color.A, stop.Color.R, stop.Color.G, stop.Color.B));
+ control.Background = new SolidColorBrush(Color.FromArgb(stop.Color.GetA(), stop.Color.GetR(), stop.Color.GetG(), stop.Color.GetB()));
Canvas.SetLeft(control, (referenceWidth * stop.Offset.Clamp(0, 1)) - (control.Width / 2.0));
diff --git a/KeyboardAudioVisualizer/Decorators/BeatDecorator.cs b/KeyboardAudioVisualizer/Decorators/BeatDecorator.cs
index 6e1150a..de456cf 100644
--- a/KeyboardAudioVisualizer/Decorators/BeatDecorator.cs
+++ b/KeyboardAudioVisualizer/Decorators/BeatDecorator.cs
@@ -26,6 +26,6 @@ namespace KeyboardAudioVisualizer.Decorators
#endregion
- public Color ManipulateColor(Rectangle rectangle, BrushRenderTarget renderTarget, Color color) => color.SetAPercent(color.APercent * _visualizationProvider.VisualizationData[0]);
+ public Color ManipulateColor(Rectangle rectangle, BrushRenderTarget renderTarget, Color color) => color.SetA(color.A * _visualizationProvider.VisualizationData[0]);
}
}
diff --git a/KeyboardAudioVisualizer/KeyboardAudioVisualizer.csproj b/KeyboardAudioVisualizer/KeyboardAudioVisualizer.csproj
index 90092b4..069c104 100644
--- a/KeyboardAudioVisualizer/KeyboardAudioVisualizer.csproj
+++ b/KeyboardAudioVisualizer/KeyboardAudioVisualizer.csproj
@@ -56,38 +56,38 @@
..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll
-
- ..\packages\RGB.NET.Brushes.0.1.14\lib\net45\RGB.NET.Brushes.dll
+
+ ..\packages\RGB.NET.Brushes.0.1.23\lib\net45\RGB.NET.Brushes.dll
-
- ..\packages\RGB.NET.Core.0.1.14\lib\net45\RGB.NET.Core.dll
+
+ ..\packages\RGB.NET.Core.0.1.23\lib\net45\RGB.NET.Core.dll
-
- ..\packages\RGB.NET.Decorators.0.1.14\lib\net45\RGB.NET.Decorators.dll
+
+ ..\packages\RGB.NET.Decorators.0.1.23\lib\net45\RGB.NET.Decorators.dll
-
- ..\packages\RGB.NET.Devices.Asus.0.1.14\lib\net45\RGB.NET.Devices.Asus.dll
+
+ ..\packages\RGB.NET.Devices.Asus.0.1.23\lib\net45\RGB.NET.Devices.Asus.dll
-
- ..\packages\RGB.NET.Devices.CoolerMaster.0.1.14\lib\net45\RGB.NET.Devices.CoolerMaster.dll
+
+ ..\packages\RGB.NET.Devices.CoolerMaster.0.1.23\lib\net45\RGB.NET.Devices.CoolerMaster.dll
-
- ..\packages\RGB.NET.Devices.Corsair.0.1.14\lib\net45\RGB.NET.Devices.Corsair.dll
+
+ ..\packages\RGB.NET.Devices.Corsair.0.1.23\lib\net45\RGB.NET.Devices.Corsair.dll
-
- ..\packages\RGB.NET.Devices.Logitech.0.1.14\lib\net45\RGB.NET.Devices.Logitech.dll
+
+ ..\packages\RGB.NET.Devices.Logitech.0.1.23\lib\net45\RGB.NET.Devices.Logitech.dll
..\packages\RGB.NET.Devices.Msi.0.0.1.41\lib\net45\RGB.NET.Devices.Msi.dll
-
- ..\packages\RGB.NET.Devices.Novation.0.1.14\lib\net45\RGB.NET.Devices.Novation.dll
+
+ ..\packages\RGB.NET.Devices.Novation.0.1.23\lib\net45\RGB.NET.Devices.Novation.dll
-
- ..\packages\RGB.NET.Devices.Razer.0.1.14\lib\net45\RGB.NET.Devices.Razer.dll
+
+ ..\packages\RGB.NET.Devices.Razer.0.1.23\lib\net45\RGB.NET.Devices.Razer.dll
-
- ..\packages\RGB.NET.Groups.0.1.14\lib\net45\RGB.NET.Groups.dll
+
+ ..\packages\RGB.NET.Groups.0.1.23\lib\net45\RGB.NET.Groups.dll
..\packages\Sanford.Multimedia.Midi.6.6.0\lib\net20\Sanford.Multimedia.Midi.dll
@@ -335,16 +335,16 @@
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/KeyboardAudioVisualizer/Legacy/ConfigurationUpdates.cs b/KeyboardAudioVisualizer/Legacy/ConfigurationUpdates.cs
index 83ab13d..51a0d73 100644
--- a/KeyboardAudioVisualizer/Legacy/ConfigurationUpdates.cs
+++ b/KeyboardAudioVisualizer/Legacy/ConfigurationUpdates.cs
@@ -16,13 +16,13 @@ namespace KeyboardAudioVisualizer.Legacy
private static void UpdateTo1(Configuration.Settings settings)
{
- settings.Visualizations[VisualizationIndex.Primary].Gradient = new LinearGradient(new GradientStop(0, Color.FromHSV(300, 1, 1)),
- new GradientStop(0.20, Color.FromHSV(225, 1, 1)),
- new GradientStop(0.35, Color.FromHSV(180, 1, 1)),
- new GradientStop(0.50, Color.FromHSV(135, 1, 1)),
- new GradientStop(0.65, Color.FromHSV(90, 1, 1)),
- new GradientStop(0.80, Color.FromHSV(45, 1, 1)),
- new GradientStop(0.95, Color.FromHSV(0, 1, 1)));
+ settings.Visualizations[VisualizationIndex.Primary].Gradient = new LinearGradient(new GradientStop(0, HSVColor.Create(300, 1, 1)),
+ new GradientStop(0.20, HSVColor.Create(225, 1, 1)),
+ new GradientStop(0.35, HSVColor.Create(180, 1, 1)),
+ new GradientStop(0.50, HSVColor.Create(135, 1, 1)),
+ new GradientStop(0.65, HSVColor.Create(90, 1, 1)),
+ new GradientStop(0.80, HSVColor.Create(45, 1, 1)),
+ new GradientStop(0.95, HSVColor.Create(0, 1, 1)));
settings.Visualizations[VisualizationIndex.Secondary].Gradient = new LinearGradient(new GradientStop(0.5, new Color(255, 255, 255)));
diff --git a/KeyboardAudioVisualizer/UI/Visualization/BeatVisualizer.cs b/KeyboardAudioVisualizer/UI/Visualization/BeatVisualizer.cs
index 8ade753..ae294a9 100644
--- a/KeyboardAudioVisualizer/UI/Visualization/BeatVisualizer.cs
+++ b/KeyboardAudioVisualizer/UI/Visualization/BeatVisualizer.cs
@@ -116,7 +116,7 @@ namespace KeyboardAudioVisualizer.UI.Visualization
GradientStopCollection gradientStops = new GradientStopCollection();
foreach (RGB.NET.Brushes.Gradients.GradientStop stop in _gradient.GradientStops)
- gradientStops.Add(new System.Windows.Media.GradientStop(System.Windows.Media.Color.FromArgb(stop.Color.A, stop.Color.R, stop.Color.G, stop.Color.B), stop.Offset));
+ gradientStops.Add(new System.Windows.Media.GradientStop(System.Windows.Media.Color.FromArgb(stop.Color.GetA(), stop.Color.GetR(), stop.Color.GetG(), stop.Color.GetB()), stop.Offset));
Brush = new LinearGradientBrush(gradientStops, new System.Windows.Point(0, 0.5), new System.Windows.Point(1, 0.5));
}
diff --git a/KeyboardAudioVisualizer/UI/Visualization/FrequencyBarsVisualizer.cs b/KeyboardAudioVisualizer/UI/Visualization/FrequencyBarsVisualizer.cs
index 4b58646..59de3f4 100644
--- a/KeyboardAudioVisualizer/UI/Visualization/FrequencyBarsVisualizer.cs
+++ b/KeyboardAudioVisualizer/UI/Visualization/FrequencyBarsVisualizer.cs
@@ -151,7 +151,7 @@ namespace KeyboardAudioVisualizer.UI.Visualization
for (int i = 0; i < _bars.Length; i++)
{
RGB.NET.Core.Color color = _gradient.GetColor((double)i / _bars.Length);
- _bars[i].Fill = new SolidColorBrush(Color.FromRgb(color.R, color.G, color.B));
+ _bars[i].Fill = new SolidColorBrush(Color.FromRgb(color.GetR(), color.GetG(), color.GetB()));
}
}
diff --git a/KeyboardAudioVisualizer/UI/Visualization/LevelVisualizer.cs b/KeyboardAudioVisualizer/UI/Visualization/LevelVisualizer.cs
index 00ad810..c95dadb 100644
--- a/KeyboardAudioVisualizer/UI/Visualization/LevelVisualizer.cs
+++ b/KeyboardAudioVisualizer/UI/Visualization/LevelVisualizer.cs
@@ -113,7 +113,7 @@ namespace KeyboardAudioVisualizer.UI.Visualization
GradientStopCollection gradientStops = new GradientStopCollection();
foreach (GradientStop stop in _gradient.GradientStops)
- gradientStops.Add(new System.Windows.Media.GradientStop(Color.FromArgb(stop.Color.A, stop.Color.R, stop.Color.G, stop.Color.B), stop.Offset));
+ gradientStops.Add(new System.Windows.Media.GradientStop(Color.FromArgb(stop.Color.GetA(), stop.Color.GetR(), stop.Color.GetG(), stop.Color.GetB()), stop.Offset));
BrushLeft = new LinearGradientBrush(gradientStops, new Point(1, 0.5), new Point(0, 0.5));
BrushRight = new LinearGradientBrush(gradientStops, new Point(0, 0.5), new Point(1, 0.5));
diff --git a/KeyboardAudioVisualizer/packages.config b/KeyboardAudioVisualizer/packages.config
index d40c6ce..59a2878 100644
--- a/KeyboardAudioVisualizer/packages.config
+++ b/KeyboardAudioVisualizer/packages.config
@@ -6,24 +6,24 @@
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
+