diff options
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | atom_inspector_nk.c | 14 | ||||
| -rw-r--r-- | midi_inspector_nk.c | 15 | ||||
| -rw-r--r-- | osc_inspector_nk.c | 15 | ||||
| -rw-r--r-- | sherlock_nk.c | 14 | ||||
| -rw-r--r-- | sherlock_nk.h | 10 |
6 files changed, 29 insertions, 41 deletions
@@ -1 +1 @@ -0.11.2637 +0.11.2639 diff --git a/atom_inspector_nk.c b/atom_inspector_nk.c index 22cbf57..a104f0c 100644 --- a/atom_inspector_nk.c +++ b/atom_inspector_nk.c @@ -16,23 +16,11 @@ */ #include <ctype.h> +#include <inttypes.h> #include <sherlock.h> #include <sherlock_nk.h> -#define ful 0xff -#define one 0xbb -#define two 0x66 -#define non 0x0 -static const struct nk_color white = {.r = one, .g = one, .b = one, .a = ful}; -static const struct nk_color gray = {.r = two, .g = two, .b = two, .a = ful}; -static const struct nk_color yellow = {.r = one, .g = one, .b = non, .a = ful}; -static const struct nk_color magenta = {.r = one, .g = two, .b = one, .a = ful}; -static const struct nk_color green = {.r = non, .g = one, .b = non, .a = ful}; -static const struct nk_color blue = {.r = non, .g = one, .b = one, .a = ful}; -static const struct nk_color orange = {.r = one, .g = two, .b = non, .a = ful}; -static const struct nk_color violet = {.r = two, .g = two, .b = one, .a = ful}; - #define NS_RDF (const uint8_t*)"http://www.w3.org/1999/02/22-rdf-syntax-ns#" #define NS_RDFS (const uint8_t*)"http://www.w3.org/2000/01/rdf-schema#" #define NS_XSD (const uint8_t*)"http://www.w3.org/2001/XMLSchema#" diff --git a/midi_inspector_nk.c b/midi_inspector_nk.c index b3d586b..6bfd123 100644 --- a/midi_inspector_nk.c +++ b/midi_inspector_nk.c @@ -15,22 +15,11 @@ * http://www.perlfoundation.org/artistic_license_2_0. */ +#include <inttypes.h> + #include <sherlock.h> #include <sherlock_nk.h> -#define ful 0xff -#define one 0xbb -#define two 0x66 -#define non 0x0 -static const struct nk_color white = {.r = one, .g = one, .b = one, .a = ful}; -static const struct nk_color gray = {.r = two, .g = two, .b = two, .a = ful}; -static const struct nk_color yellow = {.r = one, .g = one, .b = non, .a = ful}; -static const struct nk_color magenta = {.r = one, .g = two, .b = one, .a = ful}; -static const struct nk_color green = {.r = non, .g = one, .b = non, .a = ful}; -static const struct nk_color blue = {.r = non, .g = one, .b = one, .a = ful}; -static const struct nk_color orange = {.r = one, .g = two, .b = non, .a = ful}; -static const struct nk_color violet = {.r = two, .g = two, .b = one, .a = ful}; - typedef struct _midi_msg_t midi_msg_t; struct _midi_msg_t { diff --git a/osc_inspector_nk.c b/osc_inspector_nk.c index 7e2d669..f5cd54b 100644 --- a/osc_inspector_nk.c +++ b/osc_inspector_nk.c @@ -17,26 +17,13 @@ #include <time.h> #include <math.h> +#include <inttypes.h> #include <sherlock.h> #include <sherlock_nk.h> #include <osc.lv2/util.h> -#define ful 0xff -#define one 0xbb -#define two 0x66 -#define non 0x0 -static const struct nk_color white = {.r = one, .g = one, .b = one, .a = ful}; -static const struct nk_color gray = {.r = two, .g = two, .b = two, .a = ful}; -static const struct nk_color yellow = {.r = one, .g = one, .b = non, .a = ful}; -static const struct nk_color magenta = {.r = one, .g = two, .b = one, .a = ful}; -static const struct nk_color green = {.r = non, .g = one, .b = non, .a = ful}; -static const struct nk_color blue = {.r = non, .g = one, .b = one, .a = ful}; -static const struct nk_color orange = {.r = one, .g = two, .b = non, .a = ful}; -static const struct nk_color violet = {.r = two, .g = two, .b = one, .a = ful}; -static const struct nk_color red = {.r = one, .g = non, .b = non, .a = ful}; - typedef struct _mem_t mem_t; struct _mem_t { diff --git a/sherlock_nk.c b/sherlock_nk.c index 852bc20..61fbb75 100644 --- a/sherlock_nk.c +++ b/sherlock_nk.c @@ -26,6 +26,20 @@ #define NK_PUGL_IMPLEMENTATION #include <sherlock_nk.h> +#define ful 0xff +#define one 0xbb +#define two 0x66 +#define non 0x0 +const struct nk_color white = {.r = one, .g = one, .b = one, .a = ful}; +const struct nk_color gray = {.r = two, .g = two, .b = two, .a = ful}; +const struct nk_color yellow = {.r = one, .g = one, .b = non, .a = ful}; +const struct nk_color magenta = {.r = one, .g = two, .b = one, .a = ful}; +const struct nk_color green = {.r = non, .g = one, .b = non, .a = ful}; +const struct nk_color blue = {.r = non, .g = one, .b = one, .a = ful}; +const struct nk_color orange = {.r = one, .g = two, .b = non, .a = ful}; +const struct nk_color violet = {.r = two, .g = two, .b = one, .a = ful}; +const struct nk_color red = {.r = one, .g = non, .b = non, .a = ful}; + const char *max_items [5] = { "1k", "2k", "4k", "8k", "16k" }; diff --git a/sherlock_nk.h b/sherlock_nk.h index 66982c8..53c67a0 100644 --- a/sherlock_nk.h +++ b/sherlock_nk.h @@ -72,6 +72,16 @@ struct _plughandle_t { extern const char *max_items [5]; extern const int32_t max_values [5]; +extern const struct nk_color white; +extern const struct nk_color gray; +extern const struct nk_color yellow; +extern const struct nk_color magenta; +extern const struct nk_color green; +extern const struct nk_color blue; +extern const struct nk_color orange; +extern const struct nk_color violet; +extern const struct nk_color red; + void _midi_inspector_expose(struct nk_context *ctx, struct nk_rect wbounds, void *data); |