Mercurial > hg > dmlib

changeset 1555:813244726b32

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove useless dmCol() calls.
author Matti Hamalainen <ccr@tnsp.org>
date Sun, 13 May 2018 05:58:41 +0300
parents 7ed25973dbcb
children 8f06c23e197d
files tools/ppl.c
diffstat 1 files changed, 22 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/tools/ppl.c	Sun May 13 05:28:51 2018 +0300
+++ b/tools/ppl.c	Sun May 13 05:58:41 2018 +0300
@@ -38,7 +38,12 @@
 
 struct
 {
-    Uint32 boxBg, inboxBg, box1, box2, viewDiv, activeRow, activeChannel;
+    Uint32
+        boxBg, inboxBg,
+        box1, box2,
+        viewDiv,
+        activeRow, activeChannel,
+        scope, muted, black, red;
 } col;
 
 
@@ -195,13 +200,17 @@
         return FALSE;
     }
 
-    col.inboxBg    = dmCol(0.6, 0.5, 0.2);
-    col.boxBg      = dmCol(0.7, 0.6, 0.3);
-    col.box1       = dmCol(1.0, 0.9, 0.6);
-    col.box2       = dmCol(0.3, 0.3, 0.15);
-    col.viewDiv    = dmCol(0,0,0);
-    col.activeRow  = dmCol(0.5,0.4,0.1);
-    col.activeChannel = dmCol(0.6, 0.8, 0.2);
+    col.black          = dmCol(0  , 0  , 0);
+    col.inboxBg        = dmCol(0.6, 0.5, 0.2);
+    col.boxBg          = dmCol(0.7, 0.6, 0.3);
+    col.box1           = dmCol(1.0, 0.9, 0.6);
+    col.box2           = dmCol(0.3, 0.3, 0.15);
+    col.viewDiv        = dmCol(0  , 0  , 0);
+    col.activeRow      = dmCol(0.5, 0.4, 0.1);
+    col.activeChannel  = dmCol(0.6, 0.8, 0.2);
+    col.muted          = dmCol(0.3, 0.1, 0.1);
+    col.scope          = dmCol(0  , 0.8, 0);
+    col.red            = dmCol(1  , 0  , 0);
 
     return TRUE;
 }
@@ -222,15 +231,14 @@
     int pitch = screen->pitch / sizeof(Uint32);
     int len = FP_GETH32(chn->chSize);
     DMFixedPoint offs = chn->chPos;
-    Uint32 coln = dmCol(0.0, 0.8, 0.0), colx = dmCol(1.0, 0, 0);
     Uint32 *pix = screen->pixels;
     Sint16 *data = chn->chData;
 
 
     dmFillBox3D(screen, x0, y0, x1, y1,
-        (chn->chMute ? dmCol(0.3,0.1,0.1) : dmCol(0,0,0)),
-        nchannel == engine.actChannel ? colx : col.box2,
-        nchannel == engine.actChannel ? colx : col.box1);
+        (chn->chMute ? col.muted : col.black),
+        nchannel == engine.actChannel ? col.red : col.box2,
+        nchannel == engine.actChannel ? col.red : col.box1);
 
     if (chn->chData == NULL || !chn->chPlaying)
         return;
@@ -242,7 +250,7 @@
             if (FP_GETH32(offs) >= len)
                 break;
             Sint16 val = ym + (data[FP_GETH32(offs)] * yh * vol) / (65535 * 255);
-            pix[xc + val * pitch] = coln;
+            pix[xc + val * pitch] = col.scope;
             FP_ADD(offs, chn->chDeltaO);
         }
     }
@@ -253,7 +261,7 @@
             if (FP_GETH32(offs) < 0)
                 break;
             Sint16 val = ym + (data[FP_GETH32(offs)] * yh * vol) / (65535 * 255);
-            pix[xc + val * pitch] = coln;
+            pix[xc + val * pitch] = col.scope;
             FP_SUB(offs, chn->chDeltaO);
         }
     }