summaryrefslogtreecommitdiffstats
path: root/src/client
diff options
context:
space:
mode:
Diffstat (limited to 'src/client')
-rw-r--r--src/client/BlockModel.cpp14
-rw-r--r--src/client/PluginModel.cpp10
-rw-r--r--src/client/PluginUI.cpp24
3 files changed, 24 insertions, 24 deletions
diff --git a/src/client/BlockModel.cpp b/src/client/BlockModel.cpp
index e3f7d22f..a5f2eef0 100644
--- a/src/client/BlockModel.cpp
+++ b/src/client/BlockModel.cpp
@@ -32,8 +32,8 @@ BlockModel::BlockModel(URIs& uris,
, _plugin_uri(plugin->uri())
, _plugin(plugin)
, _num_values(0)
- , _min_values(0)
- , _max_values(0)
+ , _min_values(nullptr)
+ , _max_values(nullptr)
{
}
@@ -43,8 +43,8 @@ BlockModel::BlockModel(URIs& uris,
: ObjectModel(uris, path)
, _plugin_uri(plugin_uri)
, _num_values(0)
- , _min_values(0)
- , _max_values(0)
+ , _min_values(nullptr)
+ , _max_values(nullptr)
{
}
@@ -94,8 +94,8 @@ BlockModel::clear()
assert(_ports.empty());
delete[] _min_values;
delete[] _max_values;
- _min_values = 0;
- _max_values = 0;
+ _min_values = nullptr;
+ _max_values = nullptr;
}
void
@@ -180,7 +180,7 @@ BlockModel::default_port_value_range(SPtr<const PortModel> port,
_min_values = new float[_num_values];
_max_values = new float[_num_values];
lilv_plugin_get_port_ranges_float(_plugin->lilv_plugin(),
- _min_values, _max_values, 0);
+ _min_values, _max_values, nullptr);
}
if (!std::isnan(_min_values[port->index()]))
diff --git a/src/client/PluginModel.cpp b/src/client/PluginModel.cpp
index 353b0f5c..91bda703 100644
--- a/src/client/PluginModel.cpp
+++ b/src/client/PluginModel.cpp
@@ -35,10 +35,10 @@ using namespace std;
namespace Ingen {
namespace Client {
-LilvWorld* PluginModel::_lilv_world = NULL;
-const LilvPlugins* PluginModel::_lilv_plugins = NULL;
+LilvWorld* PluginModel::_lilv_world = nullptr;
+const LilvPlugins* PluginModel::_lilv_plugins = nullptr;
-Sord::World* PluginModel::_rdf_world = NULL;
+Sord::World* PluginModel::_rdf_world = nullptr;
PluginModel::PluginModel(URIs& uris,
const Raul::URI& uri,
@@ -279,11 +279,11 @@ PluginModel::get_documentation(const LilvNode* subject, bool html) const
LILV_NS_RDFS "comment");
LilvNodes* vals = lilv_world_find_nodes(
- _lilv_world, subject, lv2_documentation, NULL);
+ _lilv_world, subject, lv2_documentation, nullptr);
const bool doc_is_html = vals;
if (!vals) {
vals = lilv_world_find_nodes(
- _lilv_world, subject, rdfs_comment, NULL);
+ _lilv_world, subject, rdfs_comment, nullptr);
}
if (vals) {
diff --git a/src/client/PluginUI.cpp b/src/client/PluginUI.cpp
index d4558ed4..e74b316e 100644
--- a/src/client/PluginUI.cpp
+++ b/src/client/PluginUI.cpp
@@ -28,7 +28,7 @@ using namespace std;
namespace Ingen {
namespace Client {
-SuilHost* PluginUI::ui_host = NULL;
+SuilHost* PluginUI::ui_host = nullptr;
static SPtr<const PortModel>
get_port(PluginUI* ui, uint32_t port_index)
@@ -154,7 +154,7 @@ PluginUI::PluginUI(Ingen::World* world,
const LilvNode* ui_type)
: _world(world)
, _block(block)
- , _instance(NULL)
+ , _instance(nullptr)
, _uis(uis)
, _ui(ui)
, _ui_node(lilv_node_duplicate(lilv_ui_get_uri(ui)))
@@ -165,7 +165,7 @@ PluginUI::PluginUI(Ingen::World* world,
PluginUI::~PluginUI()
{
for (uint32_t i : _subscribed_ports) {
- lv2_ui_unsubscribe(this, i, 0, NULL);
+ lv2_ui_unsubscribe(this, i, 0, nullptr);
}
suil_instance_free(_instance);
lilv_node_free(_ui_node);
@@ -191,8 +191,8 @@ PluginUI::create(Ingen::World* world,
LilvNode* gtk_ui = lilv_new_uri(world->lilv_world(), gtk_ui_uri);
LilvUIs* uis = lilv_plugin_get_uis(plugin);
- const LilvUI* ui = NULL;
- const LilvNode* ui_type = NULL;
+ const LilvUI* ui = nullptr;
+ const LilvNode* ui_type = nullptr;
LILV_FOREACH(uis, u, uis) {
const LilvUI* this_ui = lilv_uis_get(uis, u);
if (lilv_ui_is_supported(this_ui,
@@ -234,11 +234,11 @@ PluginUI::instantiate()
LilvNode* ui_portNotification = lilv_new_uri(lworld, LV2_UI__portNotification);
LilvNode* ui_plugin = lilv_new_uri(lworld, LV2_UI__plugin);
LilvNodes* notes = lilv_world_find_nodes(
- lworld, lilv_ui_get_uri(_ui), ui_portNotification, NULL);
+ lworld, lilv_ui_get_uri(_ui), ui_portNotification, nullptr);
LILV_FOREACH(nodes, n, notes) {
const LilvNode* note = lilv_nodes_get(notes, n);
- const LilvNode* sym = lilv_world_get(lworld, note, uris.lv2_symbol, NULL);
- const LilvNode* plug = lilv_world_get(lworld, note, ui_plugin, NULL);
+ const LilvNode* sym = lilv_world_get(lworld, note, uris.lv2_symbol, nullptr);
+ const LilvNode* plug = lilv_world_get(lworld, note, ui_plugin, nullptr);
if (!plug) {
_world->log().error(fmt("%1% UI %2% notification missing plugin\n")
% plugin_uri % lilv_node_as_string(_ui_node));
@@ -252,7 +252,7 @@ PluginUI::instantiate()
// Notification is valid and for this plugin
uint32_t index = lv2_ui_port_index(this, lilv_node_as_string(sym));
if (index != LV2UI_INVALID_PORT_INDEX) {
- lv2_ui_subscribe(this, index, 0, NULL);
+ lv2_ui_subscribe(this, index, 0, nullptr);
_subscribed_ports.insert(index);
}
}
@@ -263,8 +263,8 @@ PluginUI::instantiate()
const char* bundle_uri = lilv_node_as_uri(lilv_ui_get_bundle_uri(_ui));
const char* binary_uri = lilv_node_as_uri(lilv_ui_get_binary_uri(_ui));
- char* bundle_path = lilv_file_uri_parse(bundle_uri, NULL);
- char* binary_path = lilv_file_uri_parse(binary_uri, NULL);
+ char* bundle_path = lilv_file_uri_parse(bundle_uri, nullptr);
+ char* binary_path = lilv_file_uri_parse(binary_uri, nullptr);
// Instantiate the actual plugin UI via Suil
_instance = suil_instance_new(
@@ -285,7 +285,7 @@ PluginUI::instantiate()
_world->log().error("Failed to instantiate LV2 UI\n");
// Cancel any subscriptions
for (uint32_t i : _subscribed_ports) {
- lv2_ui_unsubscribe(this, i, 0, NULL);
+ lv2_ui_unsubscribe(this, i, 0, nullptr);
}
return false;
}