diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/Arc.cpp | 33 | ||||
| -rw-r--r-- | src/gui/Arc.hpp | 6 | ||||
| -rw-r--r-- | src/gui/GraphCanvas.cpp | 2 | ||||
| -rw-r--r-- | src/gui/wscript | 1 |
4 files changed, 5 insertions, 37 deletions
diff --git a/src/gui/Arc.cpp b/src/gui/Arc.cpp deleted file mode 100644 index 0289d2b7..00000000 --- a/src/gui/Arc.cpp +++ /dev/null @@ -1,33 +0,0 @@ -/* - This file is part of Ingen. - Copyright 2007-2012 David Robillard <http://drobilla.net/> - - Ingen is free software: you can redistribute it and/or modify it under the - terms of the GNU Affero General Public License as published by the Free - Software Foundation, either version 3 of the License, or any later version. - - Ingen 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 Affero General Public License for details. - - You should have received a copy of the GNU Affero General Public License - along with Ingen. If not, see <http://www.gnu.org/licenses/>. -*/ - -#include "Arc.hpp" - -namespace Ingen { -namespace GUI { - -Arc::Arc(Ganv::Canvas& canvas, - SPtr<const Client::ArcModel> model, - Ganv::Node* src, - Ganv::Node* dst, - uint32_t color) - : Ganv::Edge(canvas, src, dst, color) - , _arc_model(model) -{ -} - -} // namespace GUI -} // namespace Ingen diff --git a/src/gui/Arc.hpp b/src/gui/Arc.hpp index 52a03a23..f7c4692c 100644 --- a/src/gui/Arc.hpp +++ b/src/gui/Arc.hpp @@ -38,8 +38,10 @@ public: Arc(Ganv::Canvas& canvas, SPtr<const Client::ArcModel> model, Ganv::Node* src, - Ganv::Node* dst, - uint32_t color); + Ganv::Node* dst) + : Ganv::Edge(canvas, src, dst) + , _arc_model(model) + {} SPtr<const Client::ArcModel> model() const { return _arc_model; } diff --git a/src/gui/GraphCanvas.cpp b/src/gui/GraphCanvas.cpp index ecd03aff..b06b47b1 100644 --- a/src/gui/GraphCanvas.cpp +++ b/src/gui/GraphCanvas.cpp @@ -369,7 +369,7 @@ GraphCanvas::connection(SPtr<const ArcModel> arc) Ganv::Port* const head = get_port_view(arc->head()); if (tail && head) { - new GUI::Arc(*this, arc, tail, head, tail->get_fill_color()); + new GUI::Arc(*this, arc, tail, head); } else { _app.log().error(fmt("Unable to find ports to connect %1% => %2%\n") % arc->tail_path() % arc->head_path()); diff --git a/src/gui/wscript b/src/gui/wscript index bee63929..ecbf0119 100644 --- a/src/gui/wscript +++ b/src/gui/wscript @@ -43,7 +43,6 @@ def build(bld): obj.source = ''' App.cpp - Arc.cpp BreadCrumbs.cpp ConnectWindow.cpp GraphBox.cpp |