Fix thinkos in cubasish theme

[ardour.git] / gtk2_ardour / note.cc

diff --git a/gtk2_ardour/note.cc b/gtk2_ardour/note.cc
index dc8decf83776d6a76e1d5abe6705d549f59c377f..7cc1bd6a868bebcb2768af69dca32a3e09fc9f55 100644 (file)
--- a/gtk2_ardour/note.cc
+++ b/gtk2_ardour/note.cc
@@ -1,141 +1,153 @@
 /*
-    Copyright (C) 2007 Paul Davis
-    Author: Dave Robillard
-    Author: Hans Baier
-
-    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.
-*/
-
-#include "evoral/Note.hpp"
-
-#include "canvas/rectangle.h"
+ * Copyright (C) 2013-2018 Paul Davis <paul@linuxaudiosystems.com>
+ * Copyright (C) 2013 John Emmas <john@creativepost.co.uk>
+ *
+ * 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.
+ */
+
+#include "evoral/Note.h"
+
+#include "canvas/note.h"
 #include "canvas/debug.h"
 
 #include "note.h"
-#include "midi_region_view.h"
 #include "public_editor.h"
 
 using namespace ARDOUR;
-using namespace ArdourCanvas;
+using ArdourCanvas::Coord;
+using ArdourCanvas::Duple;
 
 Note::Note (
-       MidiRegionView& region, Item* parent, const boost::shared_ptr<NoteType> note, bool with_events)
+       MidiRegionView& region, ArdourCanvas::Item* parent, const boost::shared_ptr<NoteType> note, bool with_events)
        : NoteBase (region, with_events, note)
-       , _rectangle (new ArdourCanvas::Rectangle (parent))
+       , _note (new ArdourCanvas::Note (parent))
 {
-       CANVAS_DEBUG_NAME (_rectangle, "note");
-       set_item (_rectangle);
+       CANVAS_DEBUG_NAME (_note, "note");
+       set_item (_note);
 }
 
 Note::~Note ()
 {
-       delete _rectangle;
+       delete _note;
 }
 
 void
 Note::move_event (double dx, double dy)
 {
-       _rectangle->set (_rectangle->get().translate (Duple (dx, dy)));
+       _note->set (_note->get().translate (Duple (dx, dy)));
 }
 
 Coord
 Note::x0 () const
 {
-       return _rectangle->x0 ();
+       return _note->x0 ();
 }
 
 Coord
 Note::x1 () const
 {
-       return _rectangle->x1 ();
+       return _note->x1 ();
 }
 
 Coord
 Note::y0 () const
 {
-       return _rectangle->y0 ();
+       return _note->y0 ();
 }
 
 Coord
 Note::y1 () const
 {
-       return _rectangle->y1 ();
+       return _note->y1 ();
 }
 
 void
 Note::set_outline_color (uint32_t color)
 {
-       _rectangle->set_outline_color (color);
+       _note->set_outline_color (color);
 }
 
 void
 Note::set_fill_color (uint32_t color)
 {
-       _rectangle->set_fill_color (color);
+       _note->set_fill_color (color);
 }
 
 void
 Note::show ()
 {
-       _rectangle->show ();
+       _note->show ();
 }
 
 void
 Note::hide ()
 {
-       _rectangle->hide ();
+       _note->hide ();
+}
+
+void
+Note::set (ArdourCanvas::Rect rect)
+{
+       _note->set (rect);
 }
 
 void
 Note::set_x0 (Coord x0)
 {
-       _rectangle->set_x0 (x0);
+       _note->set_x0 (x0);
 }
 
 void
 Note::set_y0 (Coord y0)
 {
-       _rectangle->set_y0 (y0);
+       _note->set_y0 (y0);
 }
 
 void
 Note::set_x1 (Coord x1)
 {
-       _rectangle->set_x1 (x1);
+       _note->set_x1 (x1);
 }
 
 void
 Note::set_y1 (Coord y1)
 {
-       _rectangle->set_y1 (y1);
+       _note->set_y1 (y1);
 }
 
 void
 Note::set_outline_what (ArdourCanvas::Rectangle::What what)
 {
-       _rectangle->set_outline_what (what);
+       _note->set_outline_what (what);
 }
 
 void
 Note::set_outline_all ()
 {
-       _rectangle->set_outline_all ();
+       _note->set_outline_all ();
 }
 
 void
 Note::set_ignore_events (bool ignore)
 {
-       _rectangle->set_ignore_events (ignore);
+       _note->set_ignore_events (ignore);
 }
+
+void
+Note::set_velocity (double fract)
+{
+       _note->set_velocity (fract);
+}
+