From fd04fe7efcf0434a3c6a35fd2a65c775fb383bd0 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Tue, 6 Dec 2011 21:01:38 +0000 Subject: FlowCanvas's successor is hereby dubbed Ganv. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3820 a436a847-0d15-0410-975c-d299462d15a1 --- src/gui/PatchCanvas.cpp | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) (limited to 'src/gui/PatchCanvas.cpp') diff --git a/src/gui/PatchCanvas.cpp b/src/gui/PatchCanvas.cpp index a25acac3..a759d94f 100644 --- a/src/gui/PatchCanvas.cpp +++ b/src/gui/PatchCanvas.cpp @@ -20,8 +20,8 @@ #include #include #include "raul/log.hpp" -#include "flowcanvas/Canvas.hpp" -#include "flowcanvas/Circle.hpp" +#include "ganv/Canvas.hpp" +#include "ganv/Circle.hpp" #include "ingen/ServerInterface.hpp" #include "ingen/shared/LV2URIMap.hpp" #include "ingen/shared/Builder.hpp" @@ -305,11 +305,11 @@ PatchCanvas::build() } static void -show_module_human_names(FlowCanvasNode* node, void* data) +show_module_human_names(GanvNode* node, void* data) { bool b = *(bool*)data; - if (FLOW_CANVAS_IS_MODULE(node)) { - FlowCanvas::Module* module = Glib::wrap(FLOW_CANVAS_MODULE(node)); + if (GANV_IS_MODULE(node)) { + Ganv::Module* module = Glib::wrap(GANV_MODULE(node)); NodeModule* nmod = dynamic_cast(module); if (nmod) nmod->show_human_names(b); @@ -333,7 +333,7 @@ PatchCanvas::show_port_names(bool b) #if 0 _show_port_names = b; FOREACH_ITEM(i, items()) { - FlowCanvas::Module* m = dynamic_cast(*i); + Ganv::Module* m = dynamic_cast(*i); if (m) m->set_show_port_labels(b); } @@ -445,17 +445,17 @@ PatchCanvas::remove_port(SharedPtr pm) assert(_views.find(pm) == _views.end()); } -FlowCanvas::Port* +Ganv::Port* PatchCanvas::get_port_view(SharedPtr port) { - FlowCanvas::Module* module = _views[port]; + Ganv::Module* module = _views[port]; // Port on this patch if (module) { PatchPortModule* ppm = dynamic_cast(module); return ppm ? *ppm->begin() - : dynamic_cast(module); + : dynamic_cast(module); } else { module = dynamic_cast(_views[port->parent()]); if (module) { @@ -476,8 +476,8 @@ PatchCanvas::connection(SharedPtr cm) { assert(cm); - FlowCanvas::Port* const src = get_port_view(cm->src_port()); - FlowCanvas::Port* const dst = get_port_view(cm->dst_port()); + Ganv::Port* const src = get_port_view(cm->src_port()); + Ganv::Port* const dst = get_port_view(cm->dst_port()); if (src && dst) { new GUI::Connection(*this, cm, src, dst, @@ -491,8 +491,8 @@ PatchCanvas::connection(SharedPtr cm) void PatchCanvas::disconnection(SharedPtr cm) { - FlowCanvas::Port* const src = get_port_view(cm->src_port()); - FlowCanvas::Port* const dst = get_port_view(cm->dst_port()); + Ganv::Port* const src = get_port_view(cm->src_port()); + Ganv::Port* const dst = get_port_view(cm->dst_port()); if (src && dst) remove_edge(src, dst); @@ -502,8 +502,8 @@ PatchCanvas::disconnection(SharedPtr cm) } void -PatchCanvas::connect(FlowCanvas::Node* src_port, - FlowCanvas::Node* dst_port) +PatchCanvas::connect(Ganv::Node* src_port, + Ganv::Node* dst_port) { const Ingen::GUI::Port* const src = dynamic_cast(src_port); @@ -518,8 +518,8 @@ PatchCanvas::connect(FlowCanvas::Node* src_port, } void -PatchCanvas::disconnect(FlowCanvas::Node* src_port, - FlowCanvas::Node* dst_port) +PatchCanvas::disconnect(Ganv::Node* src_port, + Ganv::Node* dst_port) { const Ingen::GUI::Port* const src = dynamic_cast(src_port); @@ -606,19 +606,19 @@ PatchCanvas::clear_selection() win->hide_documentation(); } - FlowCanvas::Canvas::clear_selection(); + Ganv::Canvas::clear_selection(); } static void -destroy_module(FlowCanvasNode* node, void* data) +destroy_module(GanvNode* node, void* data) { - if (!FLOW_CANVAS_IS_MODULE(node)) { + if (!GANV_IS_MODULE(node)) { return; } - App* app = (App*)data; - FlowCanvas::Module* module = Glib::wrap(FLOW_CANVAS_MODULE(node)); - NodeModule* node_module = dynamic_cast(module); + App* app = (App*)data; + Ganv::Module* module = Glib::wrap(GANV_MODULE(node)); + NodeModule* node_module = dynamic_cast(module); if (node_module) { app->engine()->del(node_module->node()->path()); -- cgit v1.2.1