Use labs() for long instead of abs()

[ardour.git] / gtk2_ardour / midi_util.h

diff --git a/gtk2_ardour/midi_util.h b/gtk2_ardour/midi_util.h
index 451fc55ea1d689fbb5f70e888ed69d169e036426..bbd2800920dab5fe6a0243df408e033ec866e76a 100644 (file)
--- a/gtk2_ardour/midi_util.h
+++ b/gtk2_ardour/midi_util.h
@@ -1,56 +1,31 @@
 /*
-    Copyright (C) 2007 Paul Davis 
-    Author: Dave 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
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
+ * Copyright (C) 2007-2011 David Robillard <d@drobilla.net>
+ * Copyright (C) 2008 Hans Baier <hansfbaier@googlemail.com>
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
 #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));
+       if ((127 < val) && (val < 192)) {
+               val = 127;
+       } else if ((192 <= val) && (val < 255)) {
+               val = 0;
        }
 }