summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/App.cpp9
-rw-r--r--src/gui/Arc.cpp4
-rw-r--r--src/gui/ConnectWindow.cpp5
-rw-r--r--src/gui/GraphBox.cpp7
-rw-r--r--src/gui/GraphCanvas.cpp7
-rw-r--r--src/gui/GraphPortModule.cpp3
-rw-r--r--src/gui/GraphTreeWindow.cpp4
-rw-r--r--src/gui/NodeMenu.hpp3
-rw-r--r--src/gui/NodeModule.cpp7
-rw-r--r--src/gui/Port.cpp17
-rw-r--r--src/gui/PortMenu.cpp13
-rw-r--r--src/gui/SubgraphModule.cpp5
-rw-r--r--src/gui/WindowFactory.cpp3
-rw-r--r--src/gui/ingen_gui.cpp4
-rw-r--r--src/gui/ingen_gui_lv2.cpp3
15 files changed, 58 insertions, 36 deletions
diff --git a/src/gui/App.cpp b/src/gui/App.cpp
index e62a35e2..49ac2cae 100644
--- a/src/gui/App.cpp
+++ b/src/gui/App.cpp
@@ -55,6 +55,7 @@
#include <cassert>
#include <fstream>
+#include <memory>
#include <string>
#include <utility>
@@ -217,11 +218,11 @@ App::request_plugins_if_necessary()
SPtr<SigClientInterface>
App::sig_client()
{
- SPtr<QueuedInterface> qi = dynamic_ptr_cast<QueuedInterface>(_client);
+ SPtr<QueuedInterface> qi = std::dynamic_pointer_cast<QueuedInterface>(_client);
if (qi) {
- return dynamic_ptr_cast<SigClientInterface>(qi->sink());
+ return std::dynamic_pointer_cast<SigClientInterface>(qi->sink());
}
- return dynamic_ptr_cast<SigClientInterface>(_client);
+ return std::dynamic_pointer_cast<SigClientInterface>(_client);
}
SPtr<Serialiser>
@@ -427,7 +428,7 @@ App::gtk_main_iteration()
return false;
}
} else {
- dynamic_ptr_cast<QueuedInterface>(_client)->emit();
+ std::dynamic_pointer_cast<QueuedInterface>(_client)->emit();
}
_enable_signal = true;
diff --git a/src/gui/Arc.cpp b/src/gui/Arc.cpp
index b436dd26..02136770 100644
--- a/src/gui/Arc.cpp
+++ b/src/gui/Arc.cpp
@@ -19,6 +19,8 @@
#include "ingen/client/ArcModel.hpp"
#include "ingen/client/BlockModel.hpp"
+#include <memory>
+
#define NS_INTERNALS "http://drobilla.net/ns/ingen-internals#"
namespace ingen {
@@ -32,7 +34,7 @@ Arc::Arc(Ganv::Canvas& canvas,
{
SPtr<const client::ObjectModel> tparent = model->tail()->parent();
SPtr<const client::BlockModel> tparent_block;
- if ((tparent_block = dynamic_ptr_cast<const client::BlockModel>(tparent))) {
+ if ((tparent_block = std::dynamic_pointer_cast<const client::BlockModel>(tparent))) {
if (tparent_block->plugin_uri() == NS_INTERNALS "BlockDelay") {
g_object_set(_gobj, "dash-length", 4.0, nullptr);
set_constraining(false);
diff --git a/src/gui/ConnectWindow.cpp b/src/gui/ConnectWindow.cpp
index 65cb1c7d..2f13e522 100644
--- a/src/gui/ConnectWindow.cpp
+++ b/src/gui/ConnectWindow.cpp
@@ -38,6 +38,7 @@
#include <gtkmm/stock.h>
#include <limits>
+#include <memory>
#include <string>
#include <utility>
@@ -230,7 +231,7 @@ ConnectWindow::connect(bool existing)
if (existing) {
uri_str = world.interface()->uri();
_connect_stage = 1;
- SPtr<client::SocketClient> client = dynamic_ptr_cast<client::SocketClient>(
+ SPtr<client::SocketClient> client = std::dynamic_pointer_cast<client::SocketClient>(
world.interface());
if (client) {
_app->attach(client->respondee());
@@ -527,7 +528,7 @@ ConnectWindow::gtk_callback()
next_stage();
} else if (_connect_stage == 4) {
if (!_app->store()->empty()) {
- SPtr<const GraphModel> root = dynamic_ptr_cast<const GraphModel>(
+ SPtr<const GraphModel> root = std::dynamic_pointer_cast<const GraphModel>(
_app->store()->object(Raul::Path("/")));
if (root) {
set_connected_to(_app->interface());
diff --git a/src/gui/GraphBox.cpp b/src/gui/GraphBox.cpp
index e457dfd8..0905a967 100644
--- a/src/gui/GraphBox.cpp
+++ b/src/gui/GraphBox.cpp
@@ -47,6 +47,7 @@
#endif
#include <cassert>
+#include <memory>
#include <sstream>
#include <string>
@@ -255,7 +256,7 @@ GraphBox::set_graph_from_path(const Raul::Path& path,
assert(view->graph()->path() == path);
_app->window_factory()->present_graph(view->graph(), _window, view);
} else {
- SPtr<const GraphModel> model = dynamic_ptr_cast<const GraphModel>(
+ SPtr<const GraphModel> model = std::dynamic_pointer_cast<const GraphModel>(
_app->store()->object(path));
if (model) {
_app->window_factory()->present_graph(model, _window);
@@ -814,7 +815,9 @@ GraphBox::event_arrange()
void
GraphBox::event_parent_activated()
{
- SPtr<client::GraphModel> parent = dynamic_ptr_cast<client::GraphModel>(_graph->parent());
+ SPtr<client::GraphModel> parent =
+ std::dynamic_pointer_cast<client::GraphModel>(_graph->parent());
+
if (parent) {
_app->window_factory()->present_graph(parent, _window);
}
diff --git a/src/gui/GraphCanvas.cpp b/src/gui/GraphCanvas.cpp
index b6a8e5a2..47d69475 100644
--- a/src/gui/GraphCanvas.cpp
+++ b/src/gui/GraphCanvas.cpp
@@ -50,6 +50,7 @@
#include <algorithm>
#include <cassert>
#include <map>
+#include <memory>
#include <set>
#include <string>
@@ -236,7 +237,7 @@ GraphCanvas::build()
// Create modules for blocks
for (Store::const_iterator i = kids.first; i != kids.second; ++i) {
- SPtr<BlockModel> block = dynamic_ptr_cast<BlockModel>(i->second);
+ SPtr<BlockModel> block = std::dynamic_pointer_cast<BlockModel>(i->second);
if (block && block->parent() == _graph) {
add_block(block);
}
@@ -249,7 +250,7 @@ GraphCanvas::build()
// Create arcs
for (const auto& a : _graph->arcs()) {
- connection(dynamic_ptr_cast<ArcModel>(a.second));
+ connection(std::dynamic_pointer_cast<ArcModel>(a.second));
}
}
@@ -324,7 +325,7 @@ GraphCanvas::remove_plugin(const URI& uri)
void
GraphCanvas::add_block(const SPtr<const BlockModel>& bm)
{
- SPtr<const GraphModel> pm = dynamic_ptr_cast<const GraphModel>(bm);
+ SPtr<const GraphModel> pm = std::dynamic_pointer_cast<const GraphModel>(bm);
NodeModule* module = nullptr;
if (pm) {
module = SubgraphModule::create(*this, pm, _human_names);
diff --git a/src/gui/GraphPortModule.cpp b/src/gui/GraphPortModule.cpp
index 27babbfd..cf9858a3 100644
--- a/src/gui/GraphPortModule.cpp
+++ b/src/gui/GraphPortModule.cpp
@@ -31,6 +31,7 @@
#include "ingen/client/GraphModel.hpp"
#include <cassert>
+#include <memory>
#include <string>
#include <utility>
@@ -48,7 +49,7 @@ GraphPortModule::GraphPortModule(GraphCanvas& canvas,
{
assert(model);
- assert(dynamic_ptr_cast<const GraphModel>(model->parent()));
+ assert(std::dynamic_pointer_cast<const GraphModel>(model->parent()));
set_stacked(model->polyphonic());
if (model->is_input() && !model->is_numeric()) {
diff --git a/src/gui/GraphTreeWindow.cpp b/src/gui/GraphTreeWindow.cpp
index 2179c964..ff4e5f70 100644
--- a/src/gui/GraphTreeWindow.cpp
+++ b/src/gui/GraphTreeWindow.cpp
@@ -24,6 +24,8 @@
#include "ingen/client/GraphModel.hpp"
#include "raul/Path.hpp"
+#include <memory>
+
namespace ingen {
using namespace client;
@@ -76,7 +78,7 @@ GraphTreeWindow::init(App& app, ClientStore& store)
void
GraphTreeWindow::new_object(const SPtr<ObjectModel>& object)
{
- SPtr<GraphModel> graph = dynamic_ptr_cast<GraphModel>(object);
+ SPtr<GraphModel> graph = std::dynamic_pointer_cast<GraphModel>(object);
if (graph) {
add_graph(graph);
}
diff --git a/src/gui/NodeMenu.hpp b/src/gui/NodeMenu.hpp
index 2a3268b4..8bc820e8 100644
--- a/src/gui/NodeMenu.hpp
+++ b/src/gui/NodeMenu.hpp
@@ -26,6 +26,7 @@
#include <gtkmm/menu.h>
#include <gtkmm/menushell.h>
+#include <memory>
#include <string>
namespace ingen {
@@ -50,7 +51,7 @@ public:
protected:
SPtr<const client::BlockModel> block() const {
- return dynamic_ptr_cast<const client::BlockModel>(_object);
+ return std::dynamic_pointer_cast<const client::BlockModel>(_object);
}
void add_preset(const URI& uri, const std::string& label);
diff --git a/src/gui/NodeModule.cpp b/src/gui/NodeModule.cpp
index 7cecfd46..1c62dd10 100644
--- a/src/gui/NodeModule.cpp
+++ b/src/gui/NodeModule.cpp
@@ -41,6 +41,7 @@
#include <gtkmm/eventbox.h>
#include <cassert>
+#include <memory>
#include <string>
namespace ingen {
@@ -137,7 +138,7 @@ NodeModule::create(GraphCanvas& canvas,
SPtr<const BlockModel> block,
bool human)
{
- SPtr<const GraphModel> graph = dynamic_ptr_cast<const GraphModel>(block);
+ SPtr<const GraphModel> graph = std::dynamic_pointer_cast<const GraphModel>(block);
NodeModule* ret = (graph)
? new SubgraphModule(canvas, graph)
@@ -429,13 +430,13 @@ NodeModule::on_event(GdkEvent* ev)
return on_double_click(&ev->button);
} else if (ev->type == GDK_ENTER_NOTIFY) {
GraphBox* const box = app().window_factory()->graph_box(
- dynamic_ptr_cast<const GraphModel>(_block->parent()));
+ std::dynamic_pointer_cast<const GraphModel>(_block->parent()));
if (box) {
box->object_entered(_block.get());
}
} else if (ev->type == GDK_LEAVE_NOTIFY) {
GraphBox* const box = app().window_factory()->graph_box(
- dynamic_ptr_cast<const GraphModel>(_block->parent()));
+ std::dynamic_pointer_cast<const GraphModel>(_block->parent()));
if (box) {
box->object_left(_block.get());
}
diff --git a/src/gui/Port.cpp b/src/gui/Port.cpp
index 73ad837a..4282343e 100644
--- a/src/gui/Port.cpp
+++ b/src/gui/Port.cpp
@@ -35,6 +35,7 @@
#include "ingen/client/PortModel.hpp"
#include <cassert>
+#include <memory>
#include <string>
using namespace ingen::client;
@@ -125,7 +126,7 @@ Port::port_label(App& app, SPtr<const PortModel> pm)
label = name.ptr<char>();
} else {
const SPtr<const BlockModel> parent(
- dynamic_ptr_cast<const BlockModel>(pm->parent()));
+ std::dynamic_pointer_cast<const BlockModel>(pm->parent()));
if (parent && parent->plugin_model()) {
label = parent->plugin_model()->port_human_name(pm->index());
}
@@ -150,7 +151,7 @@ Port::update_metadata()
{
SPtr<const PortModel> pm = _port_model.lock();
if (pm && _app.can_control(pm.get()) && pm->is_numeric()) {
- SPtr<const BlockModel> parent = dynamic_ptr_cast<const BlockModel>(pm->parent());
+ SPtr<const BlockModel> parent = std::dynamic_pointer_cast<const BlockModel>(pm->parent());
if (parent) {
float min = 0.0f;
float max = 1.0f;
@@ -230,7 +231,7 @@ Port::on_scale_point_activated(float f)
Gtk::Menu*
Port::build_enum_menu()
{
- SPtr<const BlockModel> block = dynamic_ptr_cast<BlockModel>(model()->parent());
+ SPtr<const BlockModel> block = std::dynamic_pointer_cast<BlockModel>(model()->parent());
Gtk::Menu* menu = Gtk::manage(new Gtk::Menu());
PluginModel::ScalePoints points = block->plugin_model()->port_scale_points(
@@ -259,7 +260,7 @@ Gtk::Menu*
Port::build_uri_menu()
{
World& world = _app.world();
- SPtr<const BlockModel> block = dynamic_ptr_cast<BlockModel>(model()->parent());
+ SPtr<const BlockModel> block = std::dynamic_pointer_cast<BlockModel>(model()->parent());
Gtk::Menu* menu = Gtk::manage(new Gtk::Menu());
// Get the port designation, which should be a rdf:Property
@@ -373,10 +374,10 @@ Port::activity(const Atom& value)
GraphBox*
Port::get_graph_box() const
{
- SPtr<const GraphModel> graph = dynamic_ptr_cast<const GraphModel>(model()->parent());
+ SPtr<const GraphModel> graph = std::dynamic_pointer_cast<const GraphModel>(model()->parent());
GraphBox* box = _app.window_factory()->graph_box(graph);
if (!box) {
- graph = dynamic_ptr_cast<const GraphModel>(model()->parent()->parent());
+ graph = std::dynamic_pointer_cast<const GraphModel>(model()->parent()->parent());
box = _app.window_factory()->graph_box(graph);
}
return box;
@@ -514,7 +515,9 @@ Port::on_selected(gboolean b)
if (b) {
SPtr<const PortModel> pm = _port_model.lock();
if (pm) {
- SPtr<const BlockModel> block = dynamic_ptr_cast<const BlockModel>(pm->parent());
+ SPtr<const BlockModel> block =
+ std::dynamic_pointer_cast<const BlockModel>(pm->parent());
+
GraphWindow* win = _app.window_factory()->parent_graph_window(block);
if (win && win->documentation_is_visible() && block->plugin_model()) {
bool html = false;
diff --git a/src/gui/PortMenu.cpp b/src/gui/PortMenu.cpp
index ff3d2571..2fc8ec2e 100644
--- a/src/gui/PortMenu.cpp
+++ b/src/gui/PortMenu.cpp
@@ -24,6 +24,7 @@
#include "ingen/client/PortModel.hpp"
#include "ingen/types.hpp"
+#include <memory>
#include <string>
namespace ingen {
@@ -65,7 +66,7 @@ PortMenu::init(App& app, SPtr<const PortModel> port, bool internal_graph_port)
sigc::mem_fun(this, &PortMenu::on_menu_expose));
const bool is_control(app.can_control(port.get()) && port->is_numeric());
- const bool is_on_graph(dynamic_ptr_cast<GraphModel>(port->parent()));
+ const bool is_on_graph(std::dynamic_pointer_cast<GraphModel>(port->parent()));
const bool is_input(port->is_input());
if (!is_on_graph) {
@@ -108,7 +109,7 @@ void
PortMenu::on_menu_set_min()
{
const URIs& uris = _app->uris();
- SPtr<const PortModel> model = dynamic_ptr_cast<const PortModel>(_object);
+ SPtr<const PortModel> model = std::dynamic_pointer_cast<const PortModel>(_object);
const Atom& value = model->get_property(uris.ingen_value);
if (value.is_valid()) {
_app->set_property(_object->uri(), uris.lv2_minimum, value);
@@ -119,7 +120,7 @@ void
PortMenu::on_menu_set_max()
{
const URIs& uris = _app->uris();
- SPtr<const PortModel> model = dynamic_ptr_cast<const PortModel>(_object);
+ SPtr<const PortModel> model = std::dynamic_pointer_cast<const PortModel>(_object);
const Atom& value = model->get_property(uris.ingen_value);
if (value.is_valid()) {
_app->set_property(_object->uri(), uris.lv2_maximum, value);
@@ -130,7 +131,7 @@ void
PortMenu::on_menu_reset_range()
{
const URIs& uris = _app->uris();
- SPtr<const PortModel> model = dynamic_ptr_cast<const PortModel>(_object);
+ SPtr<const PortModel> model = std::dynamic_pointer_cast<const PortModel>(_object);
// Remove lv2:minimum and lv2:maximum properties
Properties remove;
@@ -143,8 +144,8 @@ void
PortMenu::on_menu_expose()
{
const URIs& uris = _app->uris();
- SPtr<const PortModel> port = dynamic_ptr_cast<const PortModel>(_object);
- SPtr<const BlockModel> block = dynamic_ptr_cast<const BlockModel>(port->parent());
+ SPtr<const PortModel> port = std::dynamic_pointer_cast<const PortModel>(_object);
+ SPtr<const BlockModel> block = std::dynamic_pointer_cast<const BlockModel>(port->parent());
const std::string label = block->label() + " " + block->port_label(port);
const Raul::Path path = Raul::Path(block->path() + Raul::Symbol("_" + port->symbol()));
diff --git a/src/gui/SubgraphModule.cpp b/src/gui/SubgraphModule.cpp
index 52c37787..999e06a2 100644
--- a/src/gui/SubgraphModule.cpp
+++ b/src/gui/SubgraphModule.cpp
@@ -27,6 +27,7 @@
#include "ingen/client/GraphModel.hpp"
#include <cassert>
+#include <memory>
#include <utility>
namespace ingen {
@@ -48,7 +49,7 @@ SubgraphModule::on_double_click(GdkEventButton* event)
{
assert(_graph);
- SPtr<GraphModel> parent = dynamic_ptr_cast<GraphModel>(_graph->parent());
+ SPtr<GraphModel> parent = std::dynamic_pointer_cast<GraphModel>(_graph->parent());
GraphWindow* const preferred = ( (parent && (event->state & GDK_SHIFT_MASK))
? nullptr
@@ -84,7 +85,7 @@ SubgraphModule::browse_to_graph()
{
assert(_graph->parent());
- SPtr<GraphModel> parent = dynamic_ptr_cast<GraphModel>(_graph->parent());
+ SPtr<GraphModel> parent = std::dynamic_pointer_cast<GraphModel>(_graph->parent());
GraphWindow* const preferred = (parent)
? app().window_factory()->graph_window(parent)
diff --git a/src/gui/WindowFactory.cpp b/src/gui/WindowFactory.cpp
index d85987f0..43a2110c 100644
--- a/src/gui/WindowFactory.cpp
+++ b/src/gui/WindowFactory.cpp
@@ -29,6 +29,7 @@
#include "ingen/client/GraphModel.hpp"
#include <cassert>
+#include <memory>
#include <stdexcept>
#include <string>
#include <utility>
@@ -127,7 +128,7 @@ WindowFactory::parent_graph_window(SPtr<const BlockModel> block)
return nullptr;
}
- return graph_window(dynamic_ptr_cast<GraphModel>(block->parent()));
+ return graph_window(std::dynamic_pointer_cast<GraphModel>(block->parent()));
}
/** Present a GraphWindow for a Graph.
diff --git a/src/gui/ingen_gui.cpp b/src/gui/ingen_gui.cpp
index 4504d3fe..c26bd205 100644
--- a/src/gui/ingen_gui.cpp
+++ b/src/gui/ingen_gui.cpp
@@ -21,6 +21,8 @@
#include "App.hpp"
+#include <memory>
+
namespace ingen {
namespace gui {
@@ -32,7 +34,7 @@ struct GUIModule : public Module {
if (!world.interface()) {
world.set_interface(
world.new_interface(URI(uri), make_client(world)));
- } else if (!dynamic_ptr_cast<SigClientInterface>(
+ } else if (!std::dynamic_pointer_cast<SigClientInterface>(
world.interface()->respondee())) {
world.interface()->set_respondee(make_client(world));
}
diff --git a/src/gui/ingen_gui_lv2.cpp b/src/gui/ingen_gui_lv2.cpp
index e1c1eef7..ce33f2ac 100644
--- a/src/gui/ingen_gui_lv2.cpp
+++ b/src/gui/ingen_gui_lv2.cpp
@@ -45,6 +45,7 @@
#include <cstdint>
#include <cstring>
+#include <memory>
#define INGEN_LV2_UI_URI INGEN_NS "GraphUIGtk2"
@@ -168,7 +169,7 @@ instantiate(const LV2UI_Descriptor* descriptor,
// Create a GraphBox for the root and set as the UI widget
SPtr<const ingen::client::GraphModel> root =
- ingen::dynamic_ptr_cast<const ingen::client::GraphModel>(
+ std::dynamic_pointer_cast<const ingen::client::GraphModel>(
ui->app->store()->object(Raul::Path("/")));
ui->view = ingen::gui::GraphBox::create(*ui->app, root);
ui->view->unparent();
generated by cgit v1.2.1 (git 2.18.0) at 2025-05-05 04:28:17 +0000