use new action map API instead of ActionManager::get_action

[ardour.git] / gtk2_ardour / midi_util.h

diff --git a/gtk2_ardour/midi_util.h b/gtk2_ardour/midi_util.h
index d56f1680e092c14e397a297b20f3484292d68cbf..8b812695242aa0f25bd295b11227eb29a0e60224 100644 (file)
--- a/gtk2_ardour/midi_util.h
+++ b/gtk2_ardour/midi_util.h
@@ -1,6 +1,6 @@
 /*
-    Copyright (C) 2007 Paul Davis 
-    Author: Dave Robillard
+    Copyright (C) 2007 Paul Davis
+    Author: David Robillard
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -20,47 +20,13 @@
 #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_MidiNoteFillMin.get(),
-                               ARDOUR_UI::config()->canvasvar_MidiNoteFillMid.get(),
-                               (vel / (double)63.0));
-       } else {
-               return UINT_INTERPOLATE(
-                               ARDOUR_UI::config()->canvasvar_MidiNoteFillMid.get(),
-                               ARDOUR_UI::config()->canvasvar_MidiNoteFillMax.get(),
-                               ((vel-64) / (double)63.0));
-       }
-}
-
-inline static void clamp_0_to_127(uint8_t &val)
-{
-       if( (127 < val) && (val < 192) ) {
+       if ((127 < val) && (val < 192)) {
                val = 127;
-       } else if( (192 <= val) && (val < 255) ) {
+       } else if ((192 <= val) && (val < 255)) {
                val = 0;
-       } 
+       }
 }
 
 #endif /* __gtk_ardour_midi_util_h__ */