summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/libs/gui/Connection.h10
-rw-r--r--src/libs/gui/NodeModule.cpp4
-rw-r--r--src/libs/gui/NodeModule.h2
-rw-r--r--src/libs/gui/PatchCanvas.cpp34
-rw-r--r--src/libs/gui/PatchCanvas.h22
-rw-r--r--src/libs/gui/PatchPortModule.cpp2
-rw-r--r--src/libs/gui/PatchPortModule.h2
-rw-r--r--src/libs/gui/PatchView.cpp4
-rw-r--r--src/libs/gui/Port.cpp4
-rw-r--r--src/libs/gui/Port.h4
10 files changed, 44 insertions, 44 deletions
diff --git a/src/libs/gui/Connection.h b/src/libs/gui/Connection.h
index d4d5c10c..75c988ac 100644
--- a/src/libs/gui/Connection.h
+++ b/src/libs/gui/Connection.h
@@ -33,15 +33,15 @@ namespace GUI {
*
* \ingroup GUI
*/
-class Connection : public LibFlowCanvas::Connection
+class Connection : public FlowCanvas::Connection
{
public:
- Connection(boost::shared_ptr<LibFlowCanvas::FlowCanvas> canvas,
+ Connection(boost::shared_ptr<FlowCanvas::Canvas> canvas,
boost::shared_ptr<ConnectionModel> model,
- boost::shared_ptr<LibFlowCanvas::Connectable> src,
- boost::shared_ptr<LibFlowCanvas::Connectable> dst,
+ boost::shared_ptr<FlowCanvas::Connectable> src,
+ boost::shared_ptr<FlowCanvas::Connectable> dst,
uint32_t color)
- : LibFlowCanvas::Connection(canvas, src, dst, color)
+ : FlowCanvas::Connection(canvas, src, dst, color)
, _connection_model(model)
{}
diff --git a/src/libs/gui/NodeModule.cpp b/src/libs/gui/NodeModule.cpp
index 3c80f5e2..188e3a42 100644
--- a/src/libs/gui/NodeModule.cpp
+++ b/src/libs/gui/NodeModule.cpp
@@ -36,7 +36,7 @@ namespace GUI {
NodeModule::NodeModule(boost::shared_ptr<PatchCanvas> canvas, SharedPtr<NodeModel> node)
-: LibFlowCanvas::Module(canvas, node->path().name()),
+: FlowCanvas::Module(canvas, node->path().name()),
_node(node),
_menu(node)
{
@@ -102,7 +102,7 @@ NodeModule::add_port(SharedPtr<PortModel> port, bool resize_to_fit)
void
NodeModule::remove_port(SharedPtr<PortModel> port)
{
- SharedPtr<LibFlowCanvas::Port> p = Module::remove_port(port->path().name());
+ SharedPtr<FlowCanvas::Port> p = Module::remove_port(port->path().name());
p.reset();
}
diff --git a/src/libs/gui/NodeModule.h b/src/libs/gui/NodeModule.h
index 8e88b34c..66a46503 100644
--- a/src/libs/gui/NodeModule.h
+++ b/src/libs/gui/NodeModule.h
@@ -48,7 +48,7 @@ class Port;
*
* \ingroup GUI
*/
-class NodeModule : public LibFlowCanvas::Module
+class NodeModule : public FlowCanvas::Module
{
public:
static boost::shared_ptr<NodeModule> create (boost::shared_ptr<PatchCanvas> canvas, SharedPtr<NodeModel> node);
diff --git a/src/libs/gui/PatchCanvas.cpp b/src/libs/gui/PatchCanvas.cpp
index 623d0c7c..4808c288 100644
--- a/src/libs/gui/PatchCanvas.cpp
+++ b/src/libs/gui/PatchCanvas.cpp
@@ -16,7 +16,7 @@
*/
#include <cassert>
-#include <flowcanvas/FlowCanvas.h>
+#include <flowcanvas/Canvas.h>
#include "interface/EngineInterface.h"
#include "client/PluginModel.h"
#include "client/PatchModel.h"
@@ -46,7 +46,7 @@ namespace GUI {
PatchCanvas::PatchCanvas(SharedPtr<PatchModel> patch, int width, int height)
-: FlowCanvas(width, height),
+:Canvas(width, height),
_patch(patch),
_last_click_x(0),
_last_click_y(0)
@@ -186,7 +186,7 @@ PatchCanvas::build()
void
PatchCanvas::arrange()
{
- LibFlowCanvas::FlowCanvas::arrange();
+ FlowCanvas::Canvas::arrange();
for (list<boost::shared_ptr<Item> >::iterator i = _items.begin(); i != _items.end(); ++i)
(*i)->store_location();
@@ -249,17 +249,17 @@ PatchCanvas::remove_port(SharedPtr<PortModel> pm)
}
-SharedPtr<LibFlowCanvas::Port>
+SharedPtr<FlowCanvas::Port>
PatchCanvas::get_port_view(SharedPtr<PortModel> port)
{
- SharedPtr<LibFlowCanvas::Port> ret;
- SharedPtr<LibFlowCanvas::Module> module = _views[port];
+ SharedPtr<FlowCanvas::Port> ret;
+ SharedPtr<FlowCanvas::Module> module = _views[port];
// Port on this patch
if (module) {
ret = (PtrCast<PatchPortModule>(module))
? *(PtrCast<PatchPortModule>(module)->ports().begin())
- : PtrCast<LibFlowCanvas::Port>(module);
+ : PtrCast<FlowCanvas::Port>(module);
} else {
module = PtrCast<NodeModule>(_views[port->parent()]);
if (module)
@@ -273,8 +273,8 @@ PatchCanvas::get_port_view(SharedPtr<PortModel> port)
void
PatchCanvas::connection(SharedPtr<ConnectionModel> cm)
{
- const SharedPtr<LibFlowCanvas::Port> src = get_port_view(cm->src_port());
- const SharedPtr<LibFlowCanvas::Port> dst = get_port_view(cm->dst_port());
+ const SharedPtr<FlowCanvas::Port> src = get_port_view(cm->src_port());
+ const SharedPtr<FlowCanvas::Port> dst = get_port_view(cm->dst_port());
if (src && dst)
add_connection(boost::shared_ptr<Connection>(new Connection(shared_from_this(),
@@ -288,8 +288,8 @@ PatchCanvas::connection(SharedPtr<ConnectionModel> cm)
void
PatchCanvas::disconnection(SharedPtr<ConnectionModel> cm)
{
- const SharedPtr<LibFlowCanvas::Port> src = get_port_view(cm->src_port());
- const SharedPtr<LibFlowCanvas::Port> dst = get_port_view(cm->dst_port());
+ const SharedPtr<FlowCanvas::Port> src = get_port_view(cm->src_port());
+ const SharedPtr<FlowCanvas::Port> dst = get_port_view(cm->dst_port());
if (src && dst)
remove_connection(src, dst);
@@ -300,8 +300,8 @@ PatchCanvas::disconnection(SharedPtr<ConnectionModel> cm)
void
-PatchCanvas::connect(boost::shared_ptr<LibFlowCanvas::Connectable> src_port,
- boost::shared_ptr<LibFlowCanvas::Connectable> dst_port)
+PatchCanvas::connect(boost::shared_ptr<FlowCanvas::Connectable> src_port,
+ boost::shared_ptr<FlowCanvas::Connectable> dst_port)
{
const boost::shared_ptr<Ingen::GUI::Port> src
= boost::dynamic_pointer_cast<Ingen::GUI::Port>(src_port);
@@ -343,8 +343,8 @@ PatchCanvas::connect(boost::shared_ptr<LibFlowCanvas::Connectable> src_port,
void
-PatchCanvas::disconnect(boost::shared_ptr<LibFlowCanvas::Connectable> src_port,
- boost::shared_ptr<LibFlowCanvas::Connectable> dst_port)
+PatchCanvas::disconnect(boost::shared_ptr<FlowCanvas::Connectable> src_port,
+ boost::shared_ptr<FlowCanvas::Connectable> dst_port)
{
const boost::shared_ptr<Ingen::GUI::Port> src
= boost::dynamic_pointer_cast<Ingen::GUI::Port>(src_port);
@@ -382,7 +382,7 @@ PatchCanvas::canvas_event(GdkEvent* event)
break;
}
- return FlowCanvas::canvas_event(event);
+ return Canvas::canvas_event(event);
}
@@ -420,7 +420,7 @@ PatchCanvas::copy_selection()
}
}
- for (list<boost::shared_ptr<LibFlowCanvas::Connection> >::iterator c = _selected_connections.begin();
+ for (list<boost::shared_ptr<FlowCanvas::Connection> >::iterator c = _selected_connections.begin();
c != _selected_connections.end(); ++c) {
boost::shared_ptr<Connection> connection = boost::dynamic_pointer_cast<Connection>(*c);
if (connection)
diff --git a/src/libs/gui/PatchCanvas.h b/src/libs/gui/PatchCanvas.h
index 8634b7bf..275d6209 100644
--- a/src/libs/gui/PatchCanvas.h
+++ b/src/libs/gui/PatchCanvas.h
@@ -21,7 +21,7 @@
#include <string>
#include <map>
#include <boost/shared_ptr.hpp>
-#include <flowcanvas/FlowCanvas.h>
+#include <flowcanvas/Canvas.h>
#include <flowcanvas/Module.h>
#include <raul/SharedPtr.h>
#include <raul/Path.h>
@@ -30,9 +30,9 @@
#include "NodeModule.h"
using std::string;
-using namespace LibFlowCanvas;
+using namespace FlowCanvas;
-using LibFlowCanvas::Port;
+using FlowCanvas::Port;
using Ingen::Client::ConnectionModel;
using Ingen::Client::PatchModel;
using Ingen::Client::NodeModel;
@@ -49,7 +49,7 @@ class NodeModule;
*
* \ingroup GUI
*/
-class PatchCanvas : public LibFlowCanvas::FlowCanvas
+class PatchCanvas : public FlowCanvas::Canvas
{
public:
PatchCanvas(SharedPtr<PatchModel> patch, int width, int height);
@@ -58,7 +58,7 @@ public:
/*boost::shared_ptr<NodeModule> find_module(const string& name) {
return boost::dynamic_pointer_cast<NodeModule>(
- FlowCanvas::get_item(name));
+ Canvas::get_item(name));
}*/
void build();
@@ -94,17 +94,17 @@ private:
bool canvas_event(GdkEvent* event);
- SharedPtr<LibFlowCanvas::Port> get_port_view(SharedPtr<PortModel> port);
+ SharedPtr<FlowCanvas::Port> get_port_view(SharedPtr<PortModel> port);
- void connect(boost::shared_ptr<LibFlowCanvas::Connectable> src,
- boost::shared_ptr<LibFlowCanvas::Connectable> dst);
+ void connect(boost::shared_ptr<FlowCanvas::Connectable> src,
+ boost::shared_ptr<FlowCanvas::Connectable> dst);
- void disconnect(boost::shared_ptr<LibFlowCanvas::Connectable> src,
- boost::shared_ptr<LibFlowCanvas::Connectable> dst);
+ void disconnect(boost::shared_ptr<FlowCanvas::Connectable> src,
+ boost::shared_ptr<FlowCanvas::Connectable> dst);
SharedPtr<PatchModel> _patch;
- typedef std::map<SharedPtr<ObjectModel>, SharedPtr<LibFlowCanvas::Module> > Views;
+ typedef std::map<SharedPtr<ObjectModel>, SharedPtr<FlowCanvas::Module> > Views;
Views _views;
int _last_click_x;
diff --git a/src/libs/gui/PatchPortModule.cpp b/src/libs/gui/PatchPortModule.cpp
index 2a812296..6f309324 100644
--- a/src/libs/gui/PatchPortModule.cpp
+++ b/src/libs/gui/PatchPortModule.cpp
@@ -32,7 +32,7 @@ namespace GUI {
PatchPortModule::PatchPortModule(boost::shared_ptr<PatchCanvas> canvas, SharedPtr<PortModel> port)
-: LibFlowCanvas::Module(canvas, port->path().name(), 0, 0, false), // FIXME: coords?
+: FlowCanvas::Module(canvas, port->path().name(), 0, 0, false), // FIXME: coords?
_port(port)
{
/*if (port_model()->polyphonic() && port_model()->parent() != NULL
diff --git a/src/libs/gui/PatchPortModule.h b/src/libs/gui/PatchPortModule.h
index c5c01f50..81bc7b53 100644
--- a/src/libs/gui/PatchPortModule.h
+++ b/src/libs/gui/PatchPortModule.h
@@ -46,7 +46,7 @@ class Port;
*
* \ingroup GUI
*/
-class PatchPortModule : public LibFlowCanvas::Module
+class PatchPortModule : public FlowCanvas::Module
{
public:
static boost::shared_ptr<PatchPortModule> create(boost::shared_ptr<PatchCanvas> canvas,
diff --git a/src/libs/gui/PatchView.cpp b/src/libs/gui/PatchView.cpp
index 7b12fe40..fa0d01a0 100644
--- a/src/libs/gui/PatchView.cpp
+++ b/src/libs/gui/PatchView.cpp
@@ -84,10 +84,10 @@ PatchView::set_patch(SharedPtr<PatchModel> patch)
_refresh_but->signal_clicked().connect(sigc::mem_fun(this, &PatchView::refresh_clicked));
_zoom_normal_but->signal_clicked().connect(sigc::bind(sigc::mem_fun(
- _canvas.get(), &FlowCanvas::set_zoom), 1.0));
+ _canvas.get(), &PatchCanvas::set_zoom), 1.0));
_zoom_full_but->signal_clicked().connect(
- sigc::mem_fun(_canvas.get(), &FlowCanvas::zoom_full));
+ sigc::mem_fun(_canvas.get(), &PatchCanvas::zoom_full));
}
diff --git a/src/libs/gui/Port.cpp b/src/libs/gui/Port.cpp
index 9b21b8be..a03a60d4 100644
--- a/src/libs/gui/Port.cpp
+++ b/src/libs/gui/Port.cpp
@@ -34,8 +34,8 @@ namespace GUI {
/** @param flip Make an input port appear as an output port, and vice versa.
*/
-Port::Port(boost::shared_ptr<LibFlowCanvas::Module> module, SharedPtr<PortModel> pm, bool flip, bool destroyable)
-: LibFlowCanvas::Port(module,
+Port::Port(boost::shared_ptr<FlowCanvas::Module> module, SharedPtr<PortModel> pm, bool flip, bool destroyable)
+: FlowCanvas::Port(module,
pm->path().name(),
flip ? (!pm->is_input()) : pm->is_input(),
App::instance().configuration()->get_port_color(pm.get())),
diff --git a/src/libs/gui/Port.h b/src/libs/gui/Port.h
index b798cbca..507ced21 100644
--- a/src/libs/gui/Port.h
+++ b/src/libs/gui/Port.h
@@ -34,10 +34,10 @@ namespace GUI {
*
* \ingroup GUI
*/
-class Port : public LibFlowCanvas::Port
+class Port : public FlowCanvas::Port
{
public:
- Port(boost::shared_ptr<LibFlowCanvas::Module> module, SharedPtr<PortModel> pm, bool flip = false, bool destroyable = false);
+ Port(boost::shared_ptr<FlowCanvas::Module> module, SharedPtr<PortModel> pm, bool flip = false, bool destroyable = false);
virtual ~Port() {}
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-29 10:04:22 +0000