summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/ConnectWindow.cpp2
-rw-r--r--src/gui/GraphCanvas.cpp20
-rw-r--r--src/gui/GraphCanvas.hpp4
-rw-r--r--src/gui/GraphPortModule.cpp2
-rw-r--r--src/gui/GraphView.cpp2
-rw-r--r--src/gui/LoadGraphWindow.cpp2
-rw-r--r--src/gui/LoadGraphWindow.hpp6
-rw-r--r--src/gui/LoadPluginWindow.cpp4
-rw-r--r--src/gui/LoadPluginWindow.hpp6
-rw-r--r--src/gui/NewSubgraphWindow.cpp6
-rw-r--r--src/gui/NewSubgraphWindow.hpp6
-rw-r--r--src/gui/NodeMenu.cpp2
-rw-r--r--src/gui/NodeModule.cpp2
-rw-r--r--src/gui/PortMenu.cpp2
-rw-r--r--src/gui/RenameWindow.cpp2
-rw-r--r--src/gui/ThreadedLoader.cpp10
-rw-r--r--src/gui/ThreadedLoader.hpp10
-rw-r--r--src/gui/WindowFactory.cpp8
-rw-r--r--src/gui/WindowFactory.hpp4
-rw-r--r--src/gui/ingen_gui_lv2.cpp4
20 files changed, 52 insertions, 52 deletions
diff --git a/src/gui/ConnectWindow.cpp b/src/gui/ConnectWindow.cpp
index 73874449..97ffe03e 100644
--- a/src/gui/ConnectWindow.cpp
+++ b/src/gui/ConnectWindow.cpp
@@ -412,7 +412,7 @@ ConnectWindow::gtk_callback()
}
}
} else if (_connect_stage == 2) {
- _app->interface()->get(GraphObject::root_uri());
+ _app->interface()->get(Node::root_uri());
if (_widgets_loaded)
_progress_label->set_text(string("Requesting root graph..."));
++_connect_stage;
diff --git a/src/gui/GraphCanvas.cpp b/src/gui/GraphCanvas.cpp
index e6fe3db7..d6c4d01b 100644
--- a/src/gui/GraphCanvas.cpp
+++ b/src/gui/GraphCanvas.cpp
@@ -724,13 +724,13 @@ GraphCanvas::paste()
uris.ingen_Graph));
props.insert(make_pair(uris.ingen_polyphony,
_app.forge().make(int32_t(_graph->internal_poly()))));
- clipboard.put(GraphObject::root_uri(), props);
+ clipboard.put(Node::root_uri(), props);
size_t first_slash;
while (to_create != "/" && !to_create.empty()
&& (first_slash = to_create.find("/")) != string::npos) {
created += to_create.substr(0, first_slash);
assert(Raul::Path::is_valid(created));
- clipboard.put(GraphObject::path_to_uri(Raul::Path(created)), props);
+ clipboard.put(Node::path_to_uri(Raul::Path(created)), props);
to_create = to_create.substr(first_slash + 1);
}
@@ -753,14 +753,14 @@ GraphCanvas::paste()
if (_graph->path().is_root() && i->first.is_root())
continue;
- GraphObject::Properties& props = i->second->properties();
+ Node::Properties& props = i->second->properties();
- GraphObject::Properties::iterator x = props.find(uris.ingen_canvasX);
+ Node::Properties::iterator x = props.find(uris.ingen_canvasX);
if (x != i->second->properties().end())
x->second = _app.forge().make(
x->second.get_float() + (20.0f * _paste_count));
- GraphObject::Properties::iterator y = props.find(uris.ingen_canvasY);
+ Node::Properties::iterator y = props.find(uris.ingen_canvasY);
if (y != i->second->properties().end())
y->second = _app.forge().make(
y->second.get_float() + (20.0f * _paste_count));
@@ -818,7 +818,7 @@ GraphCanvas::menu_add_port(const string& sym_base, const string& name_base,
_app.forge().make(int32_t(_graph->num_ports()))));
props.insert(make_pair(uris.lv2_name,
_app.forge().alloc(name.c_str())));
- _app.interface()->put(GraphObject::path_to_uri(path), props);
+ _app.interface()->put(Node::path_to_uri(path), props);
}
void
@@ -840,11 +840,11 @@ GraphCanvas::load_plugin(WeakPtr<PluginModel> weak_plugin)
const Raul::Path path = _graph->path().child(symbol);
// FIXME: polyphony?
- GraphObject::Properties props = get_initial_data();
+ Node::Properties props = get_initial_data();
props.insert(make_pair(uris.rdf_type, uris.ingen_Block));
props.insert(make_pair(uris.ingen_prototype,
uris.forge.alloc_uri(plugin->uri())));
- _app.interface()->put(GraphObject::path_to_uri(path), props);
+ _app.interface()->put(Node::path_to_uri(path), props);
}
/** Try to guess a suitable location for a new module.
@@ -859,10 +859,10 @@ GraphCanvas::get_new_module_location(double& x, double& y)
y = scroll_y + 20;
}
-GraphObject::Properties
+Node::Properties
GraphCanvas::get_initial_data(Resource::Graph ctx)
{
- GraphObject::Properties result;
+ Node::Properties result;
const URIs& uris = _app.uris();
result.insert(
make_pair(uris.ingen_canvasX,
diff --git a/src/gui/GraphCanvas.hpp b/src/gui/GraphCanvas.hpp
index 9144518a..5151476e 100644
--- a/src/gui/GraphCanvas.hpp
+++ b/src/gui/GraphCanvas.hpp
@@ -31,7 +31,7 @@
#include "raul/Path.hpp"
#include "NodeModule.hpp"
-#include "ingen/GraphObject.hpp"
+#include "ingen/Node.hpp"
#include "ingen/client/EdgeModel.hpp"
namespace Ingen {
@@ -113,7 +113,7 @@ private:
const LV2Children& children,
std::set<const char*>& ancestors);
- GraphObject::Properties get_initial_data(Resource::Graph ctx=Resource::DEFAULT);
+ Node::Properties get_initial_data(Resource::Graph ctx=Resource::DEFAULT);
Ganv::Port* get_port_view(SharedPtr<Client::PortModel> port);
diff --git a/src/gui/GraphPortModule.cpp b/src/gui/GraphPortModule.cpp
index 38735088..443626dc 100644
--- a/src/gui/GraphPortModule.cpp
+++ b/src/gui/GraphPortModule.cpp
@@ -69,7 +69,7 @@ GraphPortModule::create(GraphCanvas& canvas,
ret->set_port(port);
- for (GraphObject::Properties::const_iterator m = model->properties().begin();
+ for (Resource::Properties::const_iterator m = model->properties().begin();
m != model->properties().end(); ++m)
ret->property_changed(m->first, m->second);
diff --git a/src/gui/GraphView.cpp b/src/gui/GraphView.cpp
index 119438e6..9a755ffe 100644
--- a/src/gui/GraphView.cpp
+++ b/src/gui/GraphView.cpp
@@ -83,7 +83,7 @@ GraphView::set_graph(SharedPtr<const GraphModel> graph)
_poly_spin->set_increments(1, 4);
_poly_spin->set_value(graph->internal_poly());
- for (GraphObject::Properties::const_iterator i = graph->properties().begin();
+ for (Node::Properties::const_iterator i = graph->properties().begin();
i != graph->properties().end(); ++i)
property_changed(i->first, i->second);
diff --git a/src/gui/LoadGraphWindow.cpp b/src/gui/LoadGraphWindow.cpp
index 9f4dde5c..b5297c86 100644
--- a/src/gui/LoadGraphWindow.cpp
+++ b/src/gui/LoadGraphWindow.cpp
@@ -96,7 +96,7 @@ LoadGraphWindow::LoadGraphWindow(BaseObjectType* cobject,
void
LoadGraphWindow::present(SharedPtr<const GraphModel> graph,
bool import,
- GraphObject::Properties data)
+ Node::Properties data)
{
_import = import;
set_graph(graph);
diff --git a/src/gui/LoadGraphWindow.hpp b/src/gui/LoadGraphWindow.hpp
index 2af8e9d2..64ebe99b 100644
--- a/src/gui/LoadGraphWindow.hpp
+++ b/src/gui/LoadGraphWindow.hpp
@@ -27,7 +27,7 @@
#include "raul/SharedPtr.hpp"
-#include "ingen/GraphObject.hpp"
+#include "ingen/Node.hpp"
namespace Ingen {
@@ -53,7 +53,7 @@ public:
void present(SharedPtr<const Client::GraphModel> graph,
bool import,
- GraphObject::Properties data);
+ Node::Properties data);
protected:
void on_show();
@@ -71,7 +71,7 @@ private:
App* _app;
- GraphObject::Properties _initial_data;
+ Node::Properties _initial_data;
SharedPtr<const Client::GraphModel> _graph;
diff --git a/src/gui/LoadPluginWindow.cpp b/src/gui/LoadPluginWindow.cpp
index c3e5b580..bc41352c 100644
--- a/src/gui/LoadPluginWindow.cpp
+++ b/src/gui/LoadPluginWindow.cpp
@@ -116,7 +116,7 @@ LoadPluginWindow::LoadPluginWindow(BaseObjectType* cobject,
void
LoadPluginWindow::present(SharedPtr<const GraphModel> graph,
- GraphObject::Properties data)
+ Node::Properties data)
{
set_graph(graph);
_initial_data = data;
@@ -350,7 +350,7 @@ LoadPluginWindow::load_plugin(const Gtk::TreeModel::iterator& iter)
_app->forge().alloc_uri(plugin->uri())));
props.insert(make_pair(uris.ingen_polyphonic,
_app->forge().make(polyphonic)));
- _app->interface()->put(GraphObject::path_to_uri(path), props);
+ _app->interface()->put(Node::path_to_uri(path), props);
if (_selection->get_selected_rows().size() == 1) {
_name_offset = (_name_offset == 0) ? 2 : _name_offset + 1;
diff --git a/src/gui/LoadPluginWindow.hpp b/src/gui/LoadPluginWindow.hpp
index ba574f12..7ed00cb5 100644
--- a/src/gui/LoadPluginWindow.hpp
+++ b/src/gui/LoadPluginWindow.hpp
@@ -28,7 +28,7 @@
#include "raul/SharedPtr.hpp"
-#include "ingen/GraphObject.hpp"
+#include "ingen/Node.hpp"
#include "ingen/client/ClientStore.hpp"
#include "ingen_config.h"
@@ -61,7 +61,7 @@ public:
void add_plugin(SharedPtr<const Client::PluginModel> plugin);
void present(SharedPtr<const Client::GraphModel> graph,
- GraphObject::Properties data);
+ Node::Properties data);
protected:
void on_show();
@@ -126,7 +126,7 @@ private:
void load_plugin(const Gtk::TreeModel::iterator& iter);
- GraphObject::Properties _initial_data;
+ Node::Properties _initial_data;
SharedPtr<const Client::GraphModel> _graph;
diff --git a/src/gui/NewSubgraphWindow.cpp b/src/gui/NewSubgraphWindow.cpp
index 0cc8da7a..ef24be89 100644
--- a/src/gui/NewSubgraphWindow.cpp
+++ b/src/gui/NewSubgraphWindow.cpp
@@ -50,7 +50,7 @@ NewSubgraphWindow::NewSubgraphWindow(BaseObjectType* cobject,
void
NewSubgraphWindow::present(SharedPtr<const Client::GraphModel> graph,
- GraphObject::Properties data)
+ Node::Properties data)
{
set_graph(graph);
_initial_data = data;
@@ -98,12 +98,12 @@ NewSubgraphWindow::ok_clicked()
props.insert(make_pair(_app->uris().rdf_type, _app->uris().ingen_Graph));
props.insert(make_pair(_app->uris().ingen_polyphony, _app->forge().make(int32_t(poly))));
props.insert(make_pair(_app->uris().ingen_enabled, _app->forge().make(bool(true))));
- _app->interface()->put(GraphObject::path_to_uri(path), props, Resource::INTERNAL);
+ _app->interface()->put(Node::path_to_uri(path), props, Resource::INTERNAL);
// Set external (block perspective) properties
props = _initial_data;
props.insert(make_pair(_app->uris().rdf_type, _app->uris().ingen_Graph));
- _app->interface()->put(GraphObject::path_to_uri(path), _initial_data, Resource::EXTERNAL);
+ _app->interface()->put(Node::path_to_uri(path), _initial_data, Resource::EXTERNAL);
hide();
}
diff --git a/src/gui/NewSubgraphWindow.hpp b/src/gui/NewSubgraphWindow.hpp
index 721a0916..4fef4831 100644
--- a/src/gui/NewSubgraphWindow.hpp
+++ b/src/gui/NewSubgraphWindow.hpp
@@ -25,7 +25,7 @@
#include "raul/SharedPtr.hpp"
-#include "ingen/GraphObject.hpp"
+#include "ingen/Node.hpp"
#include "Window.hpp"
@@ -50,14 +50,14 @@ public:
void set_graph(SharedPtr<const Client::GraphModel> graph);
void present(SharedPtr<const Client::GraphModel> graph,
- GraphObject::Properties data);
+ Node::Properties data);
private:
void name_changed();
void ok_clicked();
void cancel_clicked();
- GraphObject::Properties _initial_data;
+ Node::Properties _initial_data;
SharedPtr<const Client::GraphModel> _graph;
Gtk::Entry* _name_entry;
diff --git a/src/gui/NodeMenu.cpp b/src/gui/NodeMenu.cpp
index fe01c713..484a8af7 100644
--- a/src/gui/NodeMenu.cpp
+++ b/src/gui/NodeMenu.cpp
@@ -201,7 +201,7 @@ NodeMenu::on_preset_activated(const std::string& uri)
const LilvNode* val = lilv_nodes_get_first(values);
const LilvNode* sym = lilv_nodes_get_first(symbols);
_app->interface()->set_property(
- GraphObject::path_to_uri(
+ Node::path_to_uri(
block->path().child(Raul::Symbol(lilv_node_as_string(sym)))),
_app->uris().ingen_value,
_app->forge().make(lilv_node_as_float(val)));
diff --git a/src/gui/NodeModule.cpp b/src/gui/NodeModule.cpp
index 5be945ce..462ac94b 100644
--- a/src/gui/NodeModule.cpp
+++ b/src/gui/NodeModule.cpp
@@ -108,7 +108,7 @@ NodeModule::create(GraphCanvas& canvas,
? new SubgraphModule(canvas, graph)
: new NodeModule(canvas, block);
- for (GraphObject::Properties::const_iterator m = block->properties().begin();
+ for (Resource::Properties::const_iterator m = block->properties().begin();
m != block->properties().end(); ++m)
ret->property_changed(m->first, m->second);
diff --git a/src/gui/PortMenu.cpp b/src/gui/PortMenu.cpp
index 3b51976f..18e16aa3 100644
--- a/src/gui/PortMenu.cpp
+++ b/src/gui/PortMenu.cpp
@@ -162,7 +162,7 @@ PortMenu::on_menu_expose()
r.set_property(uris.ingen_canvasX, _app->forge().make(block_x + x_off));
r.set_property(uris.ingen_canvasY, _app->forge().make(block_y + y_off));
- _app->interface()->put(GraphObject::path_to_uri(path), r.properties());
+ _app->interface()->put(Node::path_to_uri(path), r.properties());
if (port->is_input()) {
_app->interface()->connect(path, _object->path());
diff --git a/src/gui/RenameWindow.cpp b/src/gui/RenameWindow.cpp
index 25528df1..da9fb2c6 100644
--- a/src/gui/RenameWindow.cpp
+++ b/src/gui/RenameWindow.cpp
@@ -125,7 +125,7 @@ RenameWindow::ok_clicked()
}
if (!label.empty() && (!name_atom.is_valid() || label != name_atom.get_string())) {
- _app->interface()->set_property(GraphObject::path_to_uri(path),
+ _app->interface()->set_property(Node::path_to_uri(path),
uris.lv2_name,
_app->forge().alloc(label));
}
diff --git a/src/gui/ThreadedLoader.cpp b/src/gui/ThreadedLoader.cpp
index cec9a4c9..9575734b 100644
--- a/src/gui/ThreadedLoader.cpp
+++ b/src/gui/ThreadedLoader.cpp
@@ -74,11 +74,11 @@ ThreadedLoader::_run()
}
void
-ThreadedLoader::load_graph(bool merge,
- const Glib::ustring& document_uri,
- optional<Raul::Path> engine_parent,
- optional<Raul::Symbol> engine_symbol,
- optional<GraphObject::Properties> engine_data)
+ThreadedLoader::load_graph(bool merge,
+ const Glib::ustring& document_uri,
+ optional<Raul::Path> engine_parent,
+ optional<Raul::Symbol> engine_symbol,
+ optional<Node::Properties> engine_data)
{
_mutex.lock();
diff --git a/src/gui/ThreadedLoader.hpp b/src/gui/ThreadedLoader.hpp
index 162e7cc7..afca29a9 100644
--- a/src/gui/ThreadedLoader.hpp
+++ b/src/gui/ThreadedLoader.hpp
@@ -52,11 +52,11 @@ public:
~ThreadedLoader();
- void load_graph(bool merge,
- const Glib::ustring& document_uri,
- boost::optional<Raul::Path> engine_parent,
- boost::optional<Raul::Symbol> engine_symbol,
- boost::optional<GraphObject::Properties> engine_data);
+ void load_graph(bool merge,
+ const Glib::ustring& document_uri,
+ boost::optional<Raul::Path> engine_parent,
+ boost::optional<Raul::Symbol> engine_symbol,
+ boost::optional<Node::Properties> engine_data);
void save_graph(SharedPtr<const Client::GraphModel> model,
const std::string& filename);
diff --git a/src/gui/WindowFactory.cpp b/src/gui/WindowFactory.cpp
index 884313fd..717f1f63 100644
--- a/src/gui/WindowFactory.cpp
+++ b/src/gui/WindowFactory.cpp
@@ -189,7 +189,7 @@ WindowFactory::remove_graph_window(GraphWindow* win, GdkEventAny* ignored)
void
WindowFactory::present_load_plugin(SharedPtr<const GraphModel> graph,
- GraphObject::Properties data)
+ Node::Properties data)
{
GraphWindowMap::iterator w = _graph_windows.find(graph->path());
@@ -210,7 +210,7 @@ WindowFactory::present_load_plugin(SharedPtr<const GraphModel> graph,
void
WindowFactory::present_load_graph(SharedPtr<const GraphModel> graph,
- GraphObject::Properties data)
+ Node::Properties data)
{
GraphWindowMap::iterator w = _graph_windows.find(graph->path());
@@ -222,7 +222,7 @@ WindowFactory::present_load_graph(SharedPtr<const GraphModel> graph,
void
WindowFactory::present_load_subgraph(SharedPtr<const GraphModel> graph,
- GraphObject::Properties data)
+ Node::Properties data)
{
GraphWindowMap::iterator w = _graph_windows.find(graph->path());
@@ -234,7 +234,7 @@ WindowFactory::present_load_subgraph(SharedPtr<const GraphModel> graph,
void
WindowFactory::present_new_subgraph(SharedPtr<const GraphModel> graph,
- GraphObject::Properties data)
+ Node::Properties data)
{
GraphWindowMap::iterator w = _graph_windows.find(graph->path());
diff --git a/src/gui/WindowFactory.hpp b/src/gui/WindowFactory.hpp
index 46c8b39a..bdeac89d 100644
--- a/src/gui/WindowFactory.hpp
+++ b/src/gui/WindowFactory.hpp
@@ -19,7 +19,7 @@
#include <map>
-#include "ingen/GraphObject.hpp"
+#include "ingen/Node.hpp"
#include "raul/SharedPtr.hpp"
namespace Ingen {
@@ -64,7 +64,7 @@ public:
GraphWindow* preferred = NULL,
SharedPtr<GraphView> view = SharedPtr<GraphView>());
- typedef GraphObject::Properties Properties;
+ typedef Node::Properties Properties;
void present_load_plugin(SharedPtr<const Client::GraphModel> graph, Properties data=Properties());
void present_load_graph(SharedPtr<const Client::GraphModel> graph, Properties data=Properties());
diff --git a/src/gui/ingen_gui_lv2.cpp b/src/gui/ingen_gui_lv2.cpp
index d66405fb..49795a83 100644
--- a/src/gui/ingen_gui_lv2.cpp
+++ b/src/gui/ingen_gui_lv2.cpp
@@ -139,7 +139,7 @@ instantiate(const LV2UI_Descriptor* descriptor,
Ingen::Resource::Properties props;
props.insert(std::make_pair(ui->app->uris().rdf_type,
ui->app->uris().ingen_Graph));
- ui->app->store()->put(Ingen::GraphObject::root_uri(), props);
+ ui->app->store()->put(Ingen::Node::root_uri(), props);
// Create a GraphBox for the root and set as the UI widget
SharedPtr<const Ingen::Client::GraphModel> root = PtrCast<const Ingen::Client::GraphModel>(
@@ -149,7 +149,7 @@ instantiate(const LV2UI_Descriptor* descriptor,
*widget = ui->view->gobj();
// Request the actual root graph
- ui->world->interface()->get(Ingen::GraphObject::root_uri());
+ ui->world->interface()->get(Ingen::Node::root_uri());
return ui;
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-28 02:55:20 +0000