X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmidi_util.h;h=2c158b17674a96fbca7a0075140544484feff340;hb=fddb3778120e25b3b8e8134084e260dac07c1365;hp=475fbe3105abcfb4ebfd5920bf5cc4aaa369681e;hpb=c1b73d4a41390baed56b4af352f427fde7a2826b;p=ardour.git

diff --git a/gtk2_ardour/midi_util.h b/gtk2_ardour/midi_util.h
index 475fbe3105..2c158b1767 100644
--- a/gtk2_ardour/midi_util.h
+++ b/gtk2_ardour/midi_util.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2007 Paul Davis 
+    Copyright (C) 2007 Paul Davis
     Author: Dave Robillard
 
     This program is free software; you can redistribute it and/or modify
@@ -20,37 +20,12 @@
 #ifndef __gtk_ardour_midi_util_h__
 #define __gtk_ardour_midi_util_h__
 
-#include "rgb_macros.h"
-#include "ardour_ui.h"
-#include "ui_config.h"
-
-inline static uint32_t note_outline_color(uint8_t vel)
-{
-	if (vel < 64) {
-		return UINT_INTERPOLATE(
-				ARDOUR_UI::config()->canvasvar_MidiNoteOutlineMin.get(),
-				ARDOUR_UI::config()->canvasvar_MidiNoteOutlineMid.get(),
-				(vel / (double)63.0));
-	} else {
-		return UINT_INTERPOLATE(
-				ARDOUR_UI::config()->canvasvar_MidiNoteOutlineMid.get(),
-				ARDOUR_UI::config()->canvasvar_MidiNoteOutlineMax.get(),
-				((vel-64) / (double)63.0));
-	}
-}
-
-inline static uint32_t note_fill_color(uint8_t vel)
+inline static void clamp_to_0_127(uint8_t &val)
 {
-	if (vel < 64) {
-		return UINT_INTERPOLATE(
-				ARDOUR_UI::config()->canvasvar_MidiNoteOutlineMin.get(),
-				ARDOUR_UI::config()->canvasvar_MidiNoteOutlineMid.get(),
-				(vel / (double)63.0));
-	} else {
-		return UINT_INTERPOLATE(
-				ARDOUR_UI::config()->canvasvar_MidiNoteOutlineMid.get(),
-				ARDOUR_UI::config()->canvasvar_MidiNoteOutlineMax.get(),
-				((vel-64) / (double)63.0));
+	if ((127 < val) && (val < 192)) {
+		val = 127;
+	} else if ((192 <= val) && (val < 255)) {
+		val = 0;
 	}
 }