diff --git a/gtk2_ardour/lollipop.cc b/gtk2_ardour/lollipop.cc deleted file mode 100644 index 76c1b1a91b..0000000000 --- a/gtk2_ardour/lollipop.cc +++ /dev/null @@ -1,109 +0,0 @@ -/* - * Copyright (C) 2023 Paul Davis - * - * 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/lollipop.h" -#include "canvas/debug.h" - -#include "lollipop.h" -#include "public_editor.h" - -using namespace ARDOUR; -using ArdourCanvas::Coord; -using ArdourCanvas::Duple; - -Lollipop::Lollipop ( - MidiRegionView& region, ArdourCanvas::Item* parent, const boost::shared_ptr note, bool with_events) - : NoteBase (region, with_events, note) - , _lollipop (new ArdourCanvas::Lollipop (parent)) -{ - CANVAS_DEBUG_NAME (_lollipop, "note"); - set_item (_lollipop); -} - -Lollipop::~Lollipop () -{ - delete _lollipop; -} - -void -Lollipop::move_event (double dx, double dy) -{ - _lollipop->set (Duple (_lollipop->x0(), _lollipop->y0()).translate (Duple (dx, dy)), _lollipop->length(), _lollipop->radius()); -} - -void -Lollipop::set_outline_color (uint32_t color) -{ - _lollipop->set_outline_color (color); -} - -void -Lollipop::set_fill_color (uint32_t color) -{ - _lollipop->set_fill_color (color); -} - -void -Lollipop::show () -{ - _lollipop->show (); -} - -void -Lollipop::hide () -{ - _lollipop->hide (); -} - -void -Lollipop::set (ArdourCanvas::Duple const & d, ArdourCanvas::Coord len, ArdourCanvas::Coord radius) -{ - _lollipop->set (d, len, radius); -} - -void -Lollipop::set_x (Coord x) -{ - _lollipop->set_x (x); -} - -void -Lollipop::set_len (Coord l) -{ - _lollipop->set_length (l); -} - -void -Lollipop::set_outline_what (ArdourCanvas::Rectangle::What what) -{ - // _lollipop->set_outline_what (what); -} - -void -Lollipop::set_outline_all () -{ - // _lollipop->set_outline_all (); -} - -void -Lollipop::set_ignore_events (bool ignore) -{ - _lollipop->set_ignore_events (ignore); -} diff --git a/gtk2_ardour/lollipop.h b/gtk2_ardour/lollipop.h deleted file mode 100644 index cace4ddf57..0000000000 --- a/gtk2_ardour/lollipop.h +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright (C) 2023 Paul Davis - * - * 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_lollipop_h__ -#define __gtk_ardour_lollipop_h__ - -#include - -#include "canvas/rectangle.h" - -#include "note_base.h" -#include "midi_util.h" - -namespace ArdourCanvas { - class Container; - class Lollipop; -} - -class Lollipop : public NoteBase -{ -public: - typedef Evoral::Note NoteType; - - Lollipop (MidiRegionView& region, - ArdourCanvas::Item* parent, - const boost::shared_ptr note = boost::shared_ptr(), - bool with_events = true); - - ~Lollipop (); - - void set (ArdourCanvas::Duple const &, ArdourCanvas::Coord, ArdourCanvas::Coord); - void set_x (ArdourCanvas::Coord); - void set_len (ArdourCanvas::Coord); - - void set_outline_what (ArdourCanvas::Rectangle::What); - void set_outline_all (); - - void set_outline_color (uint32_t); - void set_fill_color (uint32_t); - - void show (); - void hide (); - - void set_ignore_events (bool); - - void move_event (double dx, double dy); - -private: - ArdourCanvas::Lollipop* _lollipop; -}; - -#endif /* __gtk_ardour_lollipop_h__ */