Added fading out on program close (based on changes by Bl4d3s, pull

request #91, modified by Adam Honse (CalcProgrammer1) to improve
fade-out and clean up coding style)

Author: Bl4d3s

KeyboardVisualizerCommon/Visualizer.cpp

@@ -509,6 +509,7 @@ void Visualizer::Initialize()
 
     settings_changed     = false;
     update_ui            = false;
+    shutdown_flag        = false;
 
     hanning(win_hanning, 256);
     hamming(win_hamming, 256);
@@ -959,6 +960,9 @@ void Visualizer::Update()
 
 void Visualizer::StartThread()
 {
+    //Set application running flag to TRUE before starting threads
+    running = true;
+
 #ifdef WIN32
     _beginthread(thread, 0, this);
     _beginthread(netconthread, 0, this);
@@ -987,6 +991,19 @@ void Visualizer::StartThread()
 #endif
 }
 
+void Visualizer::Shutdown()
+{
+    //Initialize a fade-out by setting shutdown flag to TRUE and resetting timer
+    shutdown_flag = TRUE;
+    background_timer = 0;
+
+    //Wait for fade-out to complete before returning
+    while (running == true)
+    {
+        Sleep(50);
+    }
+}
+
 void DrawSolidColor(int bright, COLORREF color, vis_pixels *pixels)
 {
     bright = (int)(bright * (255.0f / 100.0f));
@@ -1401,7 +1418,7 @@ void Visualizer::NetUpdateThread()
 
 void Visualizer::VisThread()
 {
-    while (1)
+    while (running == true)
     {
         if (!(netmode == NET_MODE_CLIENT && port->connected))
         {
@@ -1420,10 +1437,23 @@ void Visualizer::VisThread()
 
         float brightness = fft_fltr[5];
 
-        if (background_timeout > 0)
+        //If music isn't playing, fade in the single color LEDs after 2 seconds
+        background_timer++;
+
+        if (shutdown_flag == true)
+        {
+            if (background_timer >= background_timeout)
+            {
+                brightness = 0.0f;
+                running = false;
+            }
+            else
+            {
+                brightness = ((background_timeout - background_timer) / (1.0f * background_timeout));
+            }
+        }
+        else if (background_timeout > 0)
         {
-            //If music isn't playing, fade in the single color LEDs after 2 seconds
-            background_timer++;
             for (int i = 0; i < 128; i++)
             {
                 if (fft_fltr[2 * i] >= 0.0001f)

KeyboardVisualizerCommon/Visualizer.h

@@ -119,6 +119,9 @@ class Visualizer
     //Draw Pattern
     void DrawPattern(VISUALIZER_PATTERN pattern, int bright, vis_pixels *pixels);
 
+    //Shut Down
+    void Shutdown();
+
     //Add LED strip
     void AddLEDStrip(char* ledstring);
     void AddLEDStripXmas(char * ledstring);
@@ -224,6 +227,12 @@ class Visualizer
     //Settings Changed Flag
     bool settings_changed;
 
+    //Application Running Flag
+    bool running;
+
+    //Shutting Down Flag
+    bool shutdown_flag;
+
     //Audio Sample Buffer
     unsigned char buffer[256];
 

KeyboardVisualizerVC/KeyboardVisDlg.cpp

@@ -23,6 +23,7 @@ IMPLEMENT_DYNAMIC(KeyboardVisDlg, CDialogEx)
 Visualizer* vis;
 boolean startminimized;
 boolean firstrun;
+NOTIFYICONDATA Tray;
 
 KeyboardVisDlg::KeyboardVisDlg(CWnd* pParent)
 	: CDialogEx(IDD_KEYBOARD_VISUALIZER_DLG, pParent)
@@ -46,7 +47,6 @@ void KeyboardVisDlg::DoDataExchange(CDataExchange* pDX)
 
 BOOL KeyboardVisDlg::OnInitDialog()
 {
-    NOTIFYICONDATA Tray;
     Tray.cbSize = sizeof(Tray);
     Tray.hIcon = (HICON)::LoadImage(GetModuleHandle(0), MAKEINTRESOURCE(IDI_ICON), IMAGE_ICON, 16, 16, LR_SHARED);
     Tray.hWnd = GetSafeHwnd();
@@ -135,16 +135,7 @@ void KeyboardVisDlg::StartMinimized(boolean startmin)
 
 void KeyboardVisDlg::OnDestroy()
 {
-    NOTIFYICONDATA Tray;
-
-    Tray.cbSize = sizeof(Tray);
-    Tray.hIcon = LoadIcon(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDI_ICON));
-    Tray.hWnd = GetSafeHwnd();
-    strcpy(Tray.szTip, "Keyboard Visualizer");
-    Tray.uFlags = NIF_ICON | NIF_TIP | NIF_MESSAGE;
-    Tray.uID = ID_SYSTEMTRAY;
-    Tray.uCallbackMessage = WM_TRAYICON_EVENT;
-
+    vis->Shutdown();
     Shell_NotifyIcon(NIM_DELETE, &Tray);
 }