Removed CD audio OSD led flicker

diff --git a/od-win32/win32gui.cpp b/od-win32/win32gui.cpp
index f0d0d93a1ce874a92b185e1272703cb8128d2461..7d91b7824c2f517d69776e677e7682ccc6145fe2 100644 (file)
--- a/od-win32/win32gui.cpp
+++ b/od-win32/win32gui.cpp
@@ -23971,7 +23971,7 @@ static void gui_flicker_led2 (int led, int unitnum, int status)
        }
 #endif
        *p = status;
-       resetcounter[led] = 4;
+       resetcounter[led] = 15;
        if (old != *p)
                gui_led (led, *p, -1);
 }

diff --git a/statusline.cpp b/statusline.cpp
index c174dfae81baa10c62a12b229c569787cfac5d8f..26aeb6d0010ebb01b36459ba9d517936ebb54339 100644 (file)
--- a/statusline.cpp
+++ b/statusline.cpp
@@ -230,10 +230,12 @@ void draw_status_line_single(int monid, uae_u8 *buf, int bpp, int y, int totalwi
                        pos = 6;
                        if (gui_data.cd >= 0) {
                                on = gui_data.cd & (LED_CD_AUDIO | LED_CD_ACTIVE);
-                               on_rgb = (on & LED_CD_AUDIO) ? 0x00cc00 : 0x0000cc;
-                               if ((gui_data.cd & LED_CD_ACTIVE2) && !(gui_data.cd & LED_CD_AUDIO)) {
-                                       on_rgb &= 0xfefefe;
-                                       on_rgb >>= 1;
+                               if (on & LED_CD_AUDIO) {
+                                       on_rgb = 0x009900;
+                               } else if (on == LED_CD_ACTIVE) {
+                                       on_rgb = 0x000099;
+                               } else {
+                                       on = 0;
                                }
                                off_rgb = 0x000033;
                                num1 = -1;