Added ShowLeadingZero toggle

Author: LumKitty

Clock.cs

@@ -1,3 +1,4 @@
+using CppSharp.AST;
 using Microsoft.VisualBasic;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
@@ -14,13 +15,19 @@ namespace StreamStartingTimer {
     public partial class Clock : Form {
         public int SecondsToGo { get; set; }
         private Binding bndTestTime;
-        private ClockSpout ImageClock;
+        private ClockSpout ImageClock = null;
         private Task ImageClockUpdaterTask;
         public bool TimerRunning;
 
         private void TimeSpanToString(object sender, ConvertEventArgs cevent) {
+            string TimeText;
             if (cevent.DesiredType != typeof(string)) return;
-            cevent.Value = ((TimeSpan)cevent.Value).ToString(Shared.TimeFormat);
+            TimeText = ((TimeSpan)cevent.Value).ToString(Shared.TimeFormat);
+            if (!Shared.CurSettings.ShowLeadingZero && TimeText[0] == '0') {
+                TimeText = ' ' + TimeText.Substring(1);
+            }
+
+            cevent.Value = TimeText;
         }
 
         public Clock(int StartTime, string EventsFile) {
@@ -35,7 +42,7 @@ public Clock(int StartTime, string EventsFile) {
             lblCountdown.DataBindings.Add(bndTestTime);
 
             if (StartTime > 0) {
-                StartTimer(StartTime);
+                SecondsToGo = StartTime;
                 QuitWhenDone = true;
             } else {
                 QuitWhenDone = false;
@@ -123,7 +130,11 @@ public void StartCountdown(int CountdownTime) {
         }
 
         private void UpdateClock(TimeSpan SecondsToGo) {
-            lblCountdown.Text = SecondsToGo.ToString(Shared.TimeFormat);
+            string TimeText = SecondsToGo.ToString(Shared.TimeFormat);
+            if (!Shared.CurSettings.ShowLeadingZero && TimeText[0] == '0') {
+                TimeText = ' ' + TimeText.Substring(1);
+            }
+            lblCountdown.Text = TimeText;
             if (Shared.CurSettings.SpoutEnabled) { ImageClock.UpdateTexture(); }
         }
         private void UpdateClock(int SecondsToGo) {
@@ -241,6 +252,10 @@ private void btnAdd60s_Click(object sender, EventArgs e) {
 
         private void Clock_Shown(object sender, EventArgs e) {
             Connect();
+            OpenGLHandler.InitGL();
+            if (SecondsToGo > 0) {
+                StartTimer(SecondsToGo);
+            }
         }
 
         private void btnConfig_Click(object sender, EventArgs e) {
@@ -264,7 +279,8 @@ private void btnConfig_Click(object sender, EventArgs e) {
         }
 
         private void Clock_FormClosing(object sender, FormClosingEventArgs e) {
-            ImageClock.Dispose();
+            if (ImageClock != null) { ImageClock.Dispose(); }
+            OpenGLHandler.CloseGL();
             GC.Collect();
             GC.WaitForPendingFinalizers();
         }

ClockSpout.cs

@@ -1,10 +1,12 @@
-using Silk.NET.Core.Contexts;
-using Silk.NET.Core.Loader;
-using Silk.NET.Maths;
+//using Silk.NET.Core.Contexts;
+//using Silk.NET.Core.Loader;
+//using TerraFX.Interop.Windows;
+//using static TerraFX.Interop.Windows.Windows;
 using Spout.Interop;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Diagnostics.Eventing.Reader;
 using System.Drawing;
 using System.Drawing.Imaging;
 using System.Drawing.Text;
@@ -17,31 +19,38 @@
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using System.Xml.Linq;
-using TerraFX.Interop.DirectX;
-using TerraFX.Interop.Windows;
 using static System.Net.Mime.MediaTypeNames;
 using static System.Runtime.InteropServices.JavaScript.JSType;
 using static System.Windows.Forms.VisualStyles.VisualStyleElement;
-using static TerraFX.Interop.Windows.Windows;
+
 
 
 
 namespace StreamStartingTimer {
 
-    public static class OpenGLHandler {
+    /*public static class OpenGLHandler {
         static bool GLInitialised = false;
         static IntPtr Handle = Process.GetCurrentProcess().MainWindowHandle;
+        static HDC dc;
+        static HGLRC gctx;
+        static Silk.NET.OpenGL.GL gl;
 
         public static void InitGL() {
-            if (GLInitialised) return; 
+            if (GLInitialised) return;
             GLInitialised = true;
             SetOpenglPixelFormat((HWND)Handle);
-            var dc = GetDC((HWND)Handle);
-            var gctx = wglCreateContext(dc);
+            dc = GetDC((HWND)Handle);
+            gctx = wglCreateContext(dc);
             wglMakeCurrent(dc, gctx);
             ReleaseDC((HWND)Handle, dc);
-            var gl = new Silk.NET.OpenGL.GL(new WindowsGlNativeContext());
+            gl = new Silk.NET.OpenGL.GL(new WindowsGlNativeContext());
+        }
+
+        public static void CloseGL() {
+            if (!GLInitialised) return;
+            gl.Dispose();
         }
+
         static unsafe void SetOpenglPixelFormat(HWND window) {
             // Contains desired pixel format characteristics
             PIXELFORMATDESCRIPTOR pfd = new();
@@ -114,6 +123,21 @@ public unsafe bool TryGetProcAddress(string proc, out nint addr, int? slot = nul
                 return false;
             }
         }
+    }*/
+
+    public static class OpenGLHandler {
+        static bool GLInitialised = false;
+        static OpenTK.GLControl.GLControl GL;
+        public static void InitGL() {
+            if (GLInitialised) { return; }
+            GL = new OpenTK.GLControl.GLControl();
+            GL.MakeCurrent();
+            GLInitialised = true;
+        }
+        public static void CloseGL() {
+            if (!GLInitialised) { return; }
+            GL.Dispose();
+        }
     }
 
     public class ClockSpout : IDisposable {
@@ -142,11 +166,12 @@ public void GetImageFromTime(int SecondsToGo, nint pClockTexture) {
             ColonFix = 0;
 
             for (int Digit = 0; Digit < 5; Digit++) {
-                if (Digit == 2) {
+                if (!Shared.CurSettings.ShowLeadingZero && (Digit == 0) && (CurTime[Digit]=='0')) {
+                    CurDigit = 11;
+                } else if (Digit == 2) {
                     ColonFix = ColonWidth - NumberWidth;
                     CurDigit = 10;
-                } else { }
-                if (CurTime[Digit] == ' ') {
+                } else if (CurTime[Digit] == ' ') {
                     CurDigit = 11;
                 } else {
                     CurDigit = CurTime[Digit] - 48;
@@ -164,7 +189,6 @@ public void GetImageFromTime(int SecondsToGo, nint pClockTexture) {
 
                 }
             }
-            //return ClockTexture;
         }
 
         public ClockSpout(string FontDir) {
@@ -188,17 +212,10 @@ public ClockSpout(string FontDir) {
             ClockArraySize = (ClockWidth * NumberHeight) * 4;
 
             pClockTexture = Marshal.AllocHGlobal(ClockArraySize);
-
-            OpenGLHandler.InitGL();
-            spoutSender = new SpoutSender();
-            spoutSender.CreateSender(Shared.CurSettings.SpoutName, (uint)ClockWidth, (uint)NumberHeight, 0);
-        }
-        
-        public unsafe async void UpdateTexture() {
-
             Int32[] TempLine = new Int32[ColonWidth];
             UInt32 TempPixel;
 
+            // Add the : to the clock texture now. It never needs copying again
             for (int y = 0; y < NumberHeight; y++) {
                 for (int x = 0; x < ColonWidth; x++) {
                     TempPixel = (UInt32)ClockFont[10].GetPixel(x, y).ToArgb();
@@ -208,6 +225,13 @@ public unsafe async void UpdateTexture() {
                 Marshal.Copy(TempLine, 0, pClockTexture + (y * ClockWidth * 4) + (((2 * NumberWidth)) * 4), ColonWidth);
             }
 
+            OpenGLHandler.InitGL();
+            spoutSender = new SpoutSender();
+            spoutSender.CreateSender(Shared.CurSettings.SpoutName, (uint)ClockWidth, (uint)NumberHeight, 0);
+        }
+        
+        public unsafe void UpdateTexture() {
+
             int i = 0;
             GetImageFromTime(Shared.frmClock.SecondsToGo, pClockTexture);
             Console.WriteLine($"Sending (i = {i})");
@@ -219,7 +243,8 @@ public unsafe async void UpdateTexture() {
         }
 
         public void Dispose() {
-            if (spoutSender != null) { 
+            if (spoutSender != null) {
+                spoutSender.ReleaseSender();
                 spoutSender.Dispose();
                 Marshal.FreeHGlobal(pClockTexture);
             }

Program.cs

@@ -22,8 +22,9 @@ namespace StreamStartingTimer
     public static class Shared {
         public static CSettings CurSettings = new CSettings();
         public static List<TimerEvent> TimerEvents = new();
-        public const string Version = "v0.3";
+        public const string Version = "v0.5";
         public const string TimeFormat = @"mm\:ss";
+        public const string MutexName = "uk.lum.streamstartingtimer";
         public static bool VNyanConnected = false;
         public static bool MixItUpConnected = false;
 
@@ -32,6 +33,7 @@ public static class Shared {
         public static HttpClient client = new HttpClient();
         public static ConcurrentDictionary<String, String> miuCommands = new ConcurrentDictionary<string, string>();
         public static Clock frmClock;
+        public static Mutex Mutex;
 
         public static bool InitMIU(string URL) {
             miuCommands.Clear();
@@ -131,6 +133,16 @@ void OnTimerElapsed(object state) {
             [System.Runtime.InteropServices.DllImport("user32.dll", CharSet = System.Runtime.InteropServices.CharSet.Auto)]
             static extern IntPtr SendMessage(IntPtr hWnd, UInt32 Msg, IntPtr wParam, IntPtr lParam);
         }
+        public static bool IsSingleInstance() {
+            try {
+                Mutex.OpenExisting(Shared.MutexName);
+            } catch {
+                Shared.Mutex = new Mutex(true, Shared.MutexName);
+                return true;
+            }
+            // More than one instance.
+            return false;
+        }
     }
 
     class Options {
@@ -152,6 +164,10 @@ static void Main(string[] args) {
             // To customize application configuration such as set high DPI settings or default font,
             // see https://aka.ms/applicationconfiguration.
             ApplicationConfiguration.Initialize();
+            while (!Shared.IsSingleInstance()) {
+                MessageBox.Show("Another copy of this program is already running", "Mutex Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
             int StartTime = 0;
             string ConfigFile = Application.StartupPath + "DefaultConfig.json";
             string EventsFile = Application.StartupPath + "DefaultEvents.json";

Settings.cs

@@ -20,6 +20,7 @@ static class Defaults {
         public static readonly Color FGCol = Color.Black;
         public static readonly Color BGCol = Color.Lime;
         public static readonly Font Font = new Font("Arial", 128);
+        public const bool ShowLeadingZero = true;
         public static readonly TimeSpan TestTime = TimeSpan.FromMinutes(5);
         public static readonly Size Dimensions = new Size(600, 300);
         public static readonly Point Location = new Point((Screen.PrimaryScreen.Bounds.Size.Width  - Dimensions.Width)  / 2 + Screen.PrimaryScreen.Bounds.X ,
@@ -53,6 +54,10 @@ public class Settings {
         [DisplayName("Text alignment")]
         public virtual ContentAlignment Alignment { get; set; }
 
+        [CategoryAttribute("Clock Appearance"), DescriptionAttribute("Display 04:20 or   4:20")]
+        [DisplayName("Show Leading Zero")]
+        public virtual bool ShowLeadingZero { get; set; }
+
         [Browsable(false)]
         public virtual Point Location { get; set; }
 
@@ -89,6 +94,7 @@ private void Init() {
             BGCol = Defaults.BGCol;
             FGCol = Defaults.FGCol;
             Alignment = Defaults.Alignment;
+            ShowLeadingZero = Defaults.ShowLeadingZero;
             VNyanURL = Defaults.VNyanURL;
             MixItUpURL = Defaults.MixItUpURL;
             MixItUpPlatform = Defaults.MixItUpPlatform;
@@ -118,6 +124,7 @@ public void LoadConfig(string ConfigFile) {
                 try { FGCol = ColorTranslator.FromHtml((string)Config.ForegroundColor);                                } catch { }
                 try { Alignment = (ContentAlignment)Enum.Parse(typeof(ContentAlignment), (string)Config.Alignment);    } catch { }
                 try { Font = new Font((string)Config.FontName, (int)Config.FontSize, (FontStyle)Config.FontStyle);     } catch { }
+                try { ShowLeadingZero = Config.ShowLeadingZero; } catch { }
                 try { VNyanURL = Config.VNyanURL;                                                                      } catch { }
                 try { MixItUpURL = Config.MixItUpURL;                                                                  } catch { }
                 try { MixItUpPlatform = (MIUPlatforms)Enum.Parse(typeof(MIUPlatforms), (string)Config.MixItUpPlatform);} catch { }
@@ -140,6 +147,7 @@ public void SaveConfig(string ConfigFile, Point Location, Size Dimensions) {
                 new JProperty("Y", Location.Y),
                 new JProperty("Width", Dimensions.Width),
                 new JProperty("Height", Dimensions.Height),
+                new JProperty("ShowLeadingZero", ShowLeadingZero),
                 new JProperty("VNyanURL", VNyanURL),
                 new JProperty("MixItUpURL", MixItUpURL),
                 new JProperty("MixItUpPlatform", MixItUpPlatform.ToString()),
@@ -218,6 +226,14 @@ public override Color BGCol {
                 RaisePropertyChanged("BGCol");
             }
         }
+        public override bool ShowLeadingZero {
+            get { return _Settings.ShowLeadingZero; }
+            set {
+                if (_Settings.ShowLeadingZero == value) return;
+                _Settings.ShowLeadingZero = value;
+                RaisePropertyChanged("BGCol");
+            }
+        }
         public override ContentAlignment Alignment {
             get { return _Settings.Alignment; }
             set {

StreamStartingTimer.csproj

@@ -13,9 +13,8 @@
   <ItemGroup>
     <PackageReference Include="CommandLineParser" Version="2.9.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="Silk.NET.OpenGL" Version="2.22.0" />
+    <PackageReference Include="OpenTK.GLControl" Version="4.0.2" />
     <PackageReference Include="Spout.NETCore" Version="2.7.16" />
-    <PackageReference Include="TerraFX.Interop.Windows" Version="10.0.26100.2" />
     <PackageReference Include="WatsonWebsocket" Version="4.1.5" />
   </ItemGroup>