fix up requested color names everywhere.

[ardour.git] / gtk2_ardour / note_base.h

diff --git a/gtk2_ardour/note_base.h b/gtk2_ardour/note_base.h
index 5e52be0732e7577288e16838163147cde433e258..f76c184a20cc164ffbe43e49cf94eaf7e0aa831c 100644 (file)
--- a/gtk2_ardour/note_base.h
+++ b/gtk2_ardour/note_base.h
@@ -21,8 +21,9 @@
 #define __gtk_ardour_note_base_h__
 
 #include <boost/shared_ptr.hpp>
+
 #include "canvas/types.h"
-#include "ardour/midi_model.h"
+#include "evoral/types.hpp"
 
 #include "rgb_macros.h"
 #include "ardour_ui.h"
@@ -54,7 +55,7 @@ namespace ArdourCanvas {
 class NoteBase : public sigc::trackable
 {
   public:
-       typedef Evoral::Note<ARDOUR::MidiModel::TimeType> NoteType;
+       typedef Evoral::Note<Evoral::MusicalTime> NoteType;
 
        NoteBase (MidiRegionView& region, bool, const boost::shared_ptr<NoteType> note = boost::shared_ptr<NoteType>());
        virtual ~NoteBase ();
@@ -105,25 +106,25 @@ class NoteBase : public sigc::trackable
                 if (selected) {
                         if (vel < 64) {
                                 return UINT_INTERPOLATE(
-                                       ARDOUR_UI::config()->get_canvasvar_SelectedMidiNoteColorBase(),
-                                       ARDOUR_UI::config()->get_canvasvar_SelectedMidiNoteColorMid(),
+                                       ARDOUR_UI::config()->color ("selected midi note color min"),
+                                       ARDOUR_UI::config()->color ("selected midi note color mid"),
                                        (vel / (double)63.0));
                         } else {
                                 return UINT_INTERPOLATE(
-                                       ARDOUR_UI::config()->get_canvasvar_SelectedMidiNoteColorMid(),
-                                       ARDOUR_UI::config()->get_canvasvar_SelectedMidiNoteColorTop(),
+                                       ARDOUR_UI::config()->color ("selected midi note color mid"),
+                                       ARDOUR_UI::config()->color ("selected midi note color max"),
                                        ((vel-64) / (double)63.0));
                         }
                 } else {
                         if (vel < 64) {
                                 return UINT_INTERPOLATE(
-                                       ARDOUR_UI::config()->get_canvasvar_MidiNoteColorBase(),
-                                       ARDOUR_UI::config()->get_canvasvar_MidiNoteColorMid(),
+                                       ARDOUR_UI::config()->color ("midi note color min"),
+                                       ARDOUR_UI::config()->color ("midi note color mid"),
                                        (vel / (double)63.0));
                         } else {
                                 return UINT_INTERPOLATE(
-                                       ARDOUR_UI::config()->get_canvasvar_MidiNoteColorMid(),
-                                       ARDOUR_UI::config()->get_canvasvar_MidiNoteColorTop(),
+                                       ARDOUR_UI::config()->color ("midi note color mid"),
+                                       ARDOUR_UI::config()->color ("midi note color max"),
                                        ((vel-64) / (double)63.0));
                         }
                 }