jkocon/archived-g-helper
1
0
Fork 0
mirror of https://github.com/jkocon/g-helper.git synced 2026-02-23 13:00:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Animatrix clock fix

Browse Source
This commit is contained in:
Serge
2023-05-22 21:57:21 +02:00
parent 8c557344db
commit a34cc1cb03
3 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
app/AnimeMatrix/AniMatrix.cs
View File

@@ -10,23 +10,23 @@ namespace GHelper.AnimeMatrix
public class AniMatrix
{
static System.Timers.Timer matrixTimer = default!;
static AnimeMatrixDevice mat;
System.Timers.Timer matrixTimer = default!;
AnimeMatrixDevice mat;
static double[] AudioValues;
static WasapiCapture AudioDevice;
double[] AudioValues;
WasapiCapture AudioDevice;
public static bool IsValid => mat != null;
public bool IsValid => mat != null;
private static long lastPresent;
private static List<double> maxes = new List<double>();
private long lastPresent;
private List<double> maxes = new List<double>();
public AniMatrix()
{
try
{
mat = new AnimeMatrixDevice();
Task.Run(mat.WakeUp);
//Task.Run(mat.WakeUp);
matrixTimer = new System.Timers.Timer(100);
matrixTimer.Elapsed += MatrixTimer_Elapsed;
}
@@ -78,8 +78,7 @@ namespace GHelper.AnimeMatrix
SetMatrixPicture(AppConfig.getConfigString("matrix_picture"));
break;
case 3:
StartMatrixTimer(1000);
Logger.WriteLine("Matrix Clock");
SetMatrixClock();
break;
case 4:
SetMatrixAudio();
@@ -95,21 +94,21 @@ namespace GHelper.AnimeMatrix
}
}
private static void StartMatrixTimer(int interval = 100)
private void StartMatrixTimer(int interval = 100)
{
matrixTimer.Interval = interval;
matrixTimer.Enabled = true;
matrixTimer.Start();
}
private static void StopMatrixTimer()
private void StopMatrixTimer()
{
matrixTimer.Enabled = false;
matrixTimer.Stop();
}
private static void MatrixTimer_Elapsed(object? sender, ElapsedEventArgs e)
private void MatrixTimer_Elapsed(object? sender, ElapsedEventArgs e)
{
if (!IsValid) return;
//if (!IsValid) return;
switch (AppConfig.getConfig("matrix_running"))
{
@@ -123,6 +122,14 @@ namespace GHelper.AnimeMatrix
}
public void SetMatrixClock()
{
mat.SetBuiltInAnimation(false);
StartMatrixTimer(1000);
Logger.WriteLine("Matrix Clock");
}
public void Dispose()
{
StopMatrixAudio();

4
app/Program.cs
View File

@@ -44,7 +44,7 @@ namespace GHelper
Thread.CurrentThread.CurrentUICulture = CultureInfo.CurrentUICulture;
Debug.WriteLine(CultureInfo.CurrentUICulture);
//Thread.CurrentThread.CurrentUICulture = CultureInfo.CreateSpecificCulture("uk");
//Thread.CurrentThread.CurrentUICulture = CultureInfo.CreateSpecificCulture("zh");
CheckProcesses();
@@ -65,7 +65,7 @@ namespace GHelper
}
Logger.WriteLine("------------");
Logger.WriteLine("App launched: " + AppConfig.GetModel() + " :" + Assembly.GetExecutingAssembly().GetName().Version.ToString() + CultureInfo.CurrentUICulture + (IsUserAdministrator() ? "A" : ""));
Logger.WriteLine("App launched: " + AppConfig.GetModel() + " :" + Assembly.GetExecutingAssembly().GetName().Version.ToString() + CultureInfo.CurrentUICulture + (IsUserAdministrator() ? "." : ""));
Application.EnableVisualStyles();

2
app/Settings.cs
View File

@@ -721,7 +721,7 @@ namespace GHelper
matrix = new AniMatrix();
if (!AniMatrix.IsValid)
if (!matrix.IsValid)
{
panelMatrix.Visible = false;
return;