summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/App.cpp8
-rw-r--r--src/gui/GraphBox.cpp7
-rw-r--r--src/gui/GraphCanvas.cpp6
-rw-r--r--src/gui/GraphTreeWindow.cpp4
-rw-r--r--src/gui/NodeMenu.cpp2
-rw-r--r--src/gui/NodeModule.cpp4
-rw-r--r--src/gui/PropertiesWindow.cpp6
-rw-r--r--src/gui/Style.cpp2
-rw-r--r--src/gui/WidgetFactory.cpp4
9 files changed, 21 insertions, 22 deletions
diff --git a/src/gui/App.cpp b/src/gui/App.cpp
index e64465ea..5a04ebf6 100644
--- a/src/gui/App.cpp
+++ b/src/gui/App.cpp
@@ -241,7 +241,7 @@ App::property_change(const Raul::URI& subject,
{
if (subject == uris().ingen_engine && key == uris().ingen_sampleRate) {
if (value.type() == forge().Int) {
- log().info(Raul::fmt("Sample rate: %1%\n") % uris().forge.str(value));
+ log().info(fmt("Sample rate: %1%\n") % uris().forge.str(value));
_sample_rate = value.get<int32_t>();
} else {
log().error("Engine sample rate property is not an integer\n");
@@ -354,9 +354,9 @@ App::quit(Gtk::Window* dialog_parent)
try {
const std::string path = _world->conf().save(
_world->uri_map(), "ingen", "gui.ttl", Configuration::GUI);
- cout << (Raul::fmt("Saved GUI settings to %1%\n") % path);
+ cout << (fmt("Saved GUI settings to %1%\n") % path);
} catch (const std::exception& e) {
- cerr << (Raul::fmt("Error saving GUI settings (%1%)\n")
+ cerr << (fmt("Error saving GUI settings (%1%)\n")
% e.what());
}
@@ -395,7 +395,7 @@ App::icon_from_path(const string& path, int size)
new IconDestroyNotification(*this, make_pair(path, size)),
&App::icon_destroyed);
} catch (const Glib::Error& e) {
- log().warn(Raul::fmt("Error loading icon %1%: %2%\n")
+ log().warn(fmt("Error loading icon %1%: %2%\n")
% path % e.what());
}
return buf;
diff --git a/src/gui/GraphBox.cpp b/src/gui/GraphBox.cpp
index d1f76ea4..68756a4b 100644
--- a/src/gui/GraphBox.cpp
+++ b/src/gui/GraphBox.cpp
@@ -23,10 +23,9 @@
#include <glibmm/fileutils.h>
#include <gtkmm/stock.h>
-#include "raul/fmt.hpp"
-
-#include "ingen/Interface.hpp"
#include "ingen/Configuration.hpp"
+#include "ingen/Interface.hpp"
+#include "ingen/Log.hpp"
#include "ingen/client/ClientStore.hpp"
#include "ingen/client/GraphModel.hpp"
@@ -183,7 +182,7 @@ GraphBox::init_box(App& app)
_status_bar->push("Running internal engine", STATUS_CONTEXT_ENGINE);
} else {
_status_bar->push(
- (Raul::fmt("Connected to %1%") % engine_uri).str(),
+ (fmt("Connected to %1%") % engine_uri).str(),
STATUS_CONTEXT_ENGINE);
}
diff --git a/src/gui/GraphCanvas.cpp b/src/gui/GraphCanvas.cpp
index 6c391d23..591c6fc9 100644
--- a/src/gui/GraphCanvas.cpp
+++ b/src/gui/GraphCanvas.cpp
@@ -240,7 +240,7 @@ GraphCanvas::build_plugin_class_menu(
const char* sub_label_str = lilv_node_as_string(lilv_plugin_class_get_label(c));
const char* sub_uri_str = lilv_node_as_string(lilv_plugin_class_get_uri(c));
if (ancestors.find(sub_uri_str) != ancestors.end()) {
- _app.log().warn(Raul::fmt("Infinite LV2 class recursion: %1% <: %2%\n")
+ _app.log().warn(fmt("Infinite LV2 class recursion: %1% <: %2%\n")
% class_uri_str % sub_uri_str);
return 0;
}
@@ -501,7 +501,7 @@ GraphCanvas::connection(SPtr<const ArcModel> arc)
if (tail && head) {
new GUI::Arc(*this, arc, tail, head, tail->get_fill_color());
} else {
- _app.log().error(Raul::fmt("Unable to find ports to connect %1% => %2%\n")
+ _app.log().error(fmt("Unable to find ports to connect %1% => %2%\n")
% arc->tail_path() % arc->head_path());
}
}
@@ -515,7 +515,7 @@ GraphCanvas::disconnection(SPtr<const ArcModel> arc)
if (src && dst) {
remove_edge(src, dst);
} else {
- _app.log().error(Raul::fmt("Unable to find ports to disconnect %1% => %2%\n")
+ _app.log().error(fmt("Unable to find ports to disconnect %1% => %2%\n")
% arc->tail_path() % arc->head_path());
}
}
diff --git a/src/gui/GraphTreeWindow.cpp b/src/gui/GraphTreeWindow.cpp
index 249e3e73..7ebb405d 100644
--- a/src/gui/GraphTreeWindow.cpp
+++ b/src/gui/GraphTreeWindow.cpp
@@ -204,7 +204,7 @@ GraphTreeWindow::graph_property_changed(const Raul::URI& key,
Gtk::TreeModel::Row row = *i;
row[_graph_tree_columns.enabled_col] = value.get<int32_t>();
} else {
- _app->log().error(Raul::fmt("Unable to find graph %1%\n")
+ _app->log().error(fmt("Unable to find graph %1%\n")
% graph->path());
}
}
@@ -223,7 +223,7 @@ GraphTreeWindow::graph_moved(SPtr<GraphModel> graph)
Gtk::TreeModel::Row row = *i;
row[_graph_tree_columns.name_col] = graph->symbol().c_str();
} else {
- _app->log().error(Raul::fmt("Unable to find graph %1%\n")
+ _app->log().error(fmt("Unable to find graph %1%\n")
% graph->path());
}
diff --git a/src/gui/NodeMenu.cpp b/src/gui/NodeMenu.cpp
index 43cf266f..cf245edb 100644
--- a/src/gui/NodeMenu.cpp
+++ b/src/gui/NodeMenu.cpp
@@ -110,7 +110,7 @@ NodeMenu::init(App& app, SPtr<const Client::BlockModel> block)
lilv_nodes_free(labels);
} else {
app.log().error(
- Raul::fmt("Preset <%1> has no rdfs:label\n")
+ fmt("Preset <%1> has no rdfs:label\n")
% lilv_node_as_string(lilv_nodes_get(presets, i)));
}
}
diff --git a/src/gui/NodeModule.cpp b/src/gui/NodeModule.cpp
index 54b30227..9bbd48c2 100644
--- a/src/gui/NodeModule.cpp
+++ b/src/gui/NodeModule.cpp
@@ -280,7 +280,7 @@ NodeModule::delete_port_view(SPtr<const PortModel> model)
if (p) {
delete p;
} else {
- app().log().warn(Raul::fmt("Failed to find port %1% on module %2%\n")
+ app().log().warn(fmt("Failed to find port %1% on module %2%\n")
% model->path() % _block->path());
}
}
@@ -319,7 +319,7 @@ NodeModule::popup_gui()
return true;
} else {
- app().log().warn(Raul::fmt("No LV2 GUI for %1%\n") % _block->path());
+ app().log().warn(fmt("No LV2 GUI for %1%\n") % _block->path());
}
}
diff --git a/src/gui/PropertiesWindow.cpp b/src/gui/PropertiesWindow.cpp
index 2e3ef35d..2177de8c 100644
--- a/src/gui/PropertiesWindow.cpp
+++ b/src/gui/PropertiesWindow.cpp
@@ -268,7 +268,7 @@ PropertiesWindow::create_value_widget(const Raul::URI& uri, const Atom& value)
return widget;
}
- _app->log().error(Raul::fmt("Unable to create widget for value %1% type %2%\n")
+ _app->log().error(fmt("Unable to create widget for value %1% type %2%\n")
% forge.str(value) % value.type());
return NULL;
}
@@ -327,7 +327,7 @@ PropertiesWindow::value_edited(const Raul::URI& predicate)
{
Records::iterator r = _records.find(predicate);
if (r == _records.end()) {
- _app->log().error(Raul::fmt("Unknown property `%1%' edited\n")
+ _app->log().error(fmt("Unknown property `%1%' edited\n")
% predicate);
return;
}
@@ -360,7 +360,7 @@ PropertiesWindow::value_edited(const Raul::URI& predicate)
return;
bad_type:
- _app->log().error(Raul::fmt("Property `%1%' value widget has wrong type\n")
+ _app->log().error(fmt("Property `%1%' value widget has wrong type\n")
% predicate);
return;
}
diff --git a/src/gui/Style.cpp b/src/gui/Style.cpp
index 3c004a20..1c61d995 100644
--- a/src/gui/Style.cpp
+++ b/src/gui/Style.cpp
@@ -98,7 +98,7 @@ Style::get_port_color(const Client::PortModel* p)
return _event_port_color;
}
- _app.log().warn(Raul::fmt("No known port type for %1%\n") % p->path());
+ _app.log().warn(fmt("No known port type for %1%\n") % p->path());
return 0x666666FF;
}
diff --git a/src/gui/WidgetFactory.cpp b/src/gui/WidgetFactory.cpp
index 642e3cea..8e7a5ab7 100644
--- a/src/gui/WidgetFactory.cpp
+++ b/src/gui/WidgetFactory.cpp
@@ -17,7 +17,7 @@
#include <fstream>
#include <string>
-#include "raul/fmt.hpp"
+#include "ingen/Log.hpp"
#include "ingen/runtime_paths.hpp"
#include "WidgetFactory.hpp"
@@ -58,7 +58,7 @@ WidgetFactory::find_ui_file()
if (is_readable(ui_filename))
return;
- throw std::runtime_error((Raul::fmt("Unable to find ingen_gui.ui in %1%\n")
+ throw std::runtime_error((fmt("Unable to find ingen_gui.ui in %1%\n")
% INGEN_DATA_DIR).str());
}