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/ConnectWindow.hpp7
-rw-r--r--src/gui/NodeMenu.cpp5
-rw-r--r--src/gui/NodeModule.cpp4
-rw-r--r--src/gui/PatchCanvas.cpp7
-rw-r--r--src/gui/PatchCanvas.hpp8
-rw-r--r--src/gui/WidgetFactory.cpp1
7 files changed, 8 insertions, 32 deletions
diff --git a/src/gui/App.cpp b/src/gui/App.cpp
index 99e0ee42..9d7fffc1 100644
--- a/src/gui/App.cpp
+++ b/src/gui/App.cpp
@@ -15,7 +15,6 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "ingen-config.h"
#include "App.hpp"
#include <cassert>
#include <string>
@@ -26,6 +25,7 @@
#include <sys/time.h>
#include "raul/log.hpp"
#include "raul/Path.hpp"
+#include "lilv/lilv.h"
#include "flowcanvas/Connection.hpp"
#include "shared/World.hpp"
#include "server/Engine.hpp"
@@ -49,9 +49,6 @@
#include "ThreadedLoader.hpp"
#include "WindowFactory.hpp"
#include "Port.hpp"
-#ifdef HAVE_LILV
-#include "lilv/lilv.h"
-#endif
using namespace std;
using namespace Raul;
@@ -89,10 +86,7 @@ App::App(Ingen::Shared::World* world)
_about_dialog->property_logo_icon_name() = "ingen";
PluginModel::set_rdf_world(*world->rdf_world());
-
-#ifdef HAVE_LILV
PluginModel::set_lilv_world(world->lilv_world());
-#endif
}
App::~App()
diff --git a/src/gui/ConnectWindow.hpp b/src/gui/ConnectWindow.hpp
index 44d4c925..65ff11a2 100644
--- a/src/gui/ConnectWindow.hpp
+++ b/src/gui/ConnectWindow.hpp
@@ -18,14 +18,9 @@
#ifndef INGEN_GUI_CONNECTWINDOW_HPP
#define INGEN_GUI_CONNECTWINDOW_HPP
-#include "ingen-config.h"
-
-#ifdef HAVE_LILV
-#include "lilv/lilv.h"
-#endif
-
#include <gtkmm.h>
+#include "lilv/lilv.h"
#include "raul/SharedPtr.hpp"
#include "Window.hpp"
diff --git a/src/gui/NodeMenu.cpp b/src/gui/NodeMenu.cpp
index 87ad5030..e1d59f8f 100644
--- a/src/gui/NodeMenu.cpp
+++ b/src/gui/NodeMenu.cpp
@@ -16,7 +16,6 @@
*/
#include <gtkmm.h>
-#include "ingen-config.h"
#include "ingen/ServerInterface.hpp"
#include "shared/LV2URIMap.hpp"
#include "client/NodeModel.hpp"
@@ -86,7 +85,6 @@ NodeMenu::init(SharedPtr<const NodeModel> node)
_embed_gui_menuitem->hide();
}
-#ifdef HAVE_LILV
if (plugin && plugin->type() == PluginModel::LV2) {
LilvNode* preset_pred = lilv_new_uri(
plugin->lilv_world(),
@@ -130,7 +128,6 @@ NodeMenu::init(SharedPtr<const NodeModel> node)
lilv_node_free(title_pred);
lilv_node_free(preset_pred);
}
-#endif
if (has_control_inputs())
_randomize_menuitem->show();
@@ -180,7 +177,6 @@ NodeMenu::on_menu_disconnect()
void
NodeMenu::on_preset_activated(const std::string& uri)
{
-#ifdef HAVE_LILV
const NodeModel* const node = (NodeModel*)_object.get();
const PluginModel* const plugin = dynamic_cast<const PluginModel*>(node->plugin());
@@ -220,7 +216,6 @@ NodeMenu::on_preset_activated(const std::string& uri)
lilv_node_free(value_pred);
lilv_node_free(symbol_pred);
lilv_node_free(port_pred);
-#endif
}
bool
diff --git a/src/gui/NodeModule.cpp b/src/gui/NodeModule.cpp
index d65ae217..c4d75519 100644
--- a/src/gui/NodeModule.cpp
+++ b/src/gui/NodeModule.cpp
@@ -16,7 +16,6 @@
*/
#include <cassert>
-#include "ingen-config.h"
#include "raul/log.hpp"
#include "raul/Atom.hpp"
#include "ingen/ServerInterface.hpp"
@@ -291,7 +290,6 @@ NodeModule::remove_port(SharedPtr<const PortModel> model)
bool
NodeModule::popup_gui()
{
-#ifdef HAVE_LILV
if (_node->plugin() && _node->plugin()->type() == PluginModel::LV2) {
if (_plugin_ui) {
warn << "LV2 GUI already embedded, cannot pop up" << endl;
@@ -323,7 +321,7 @@ NodeModule::popup_gui()
warn << "No LV2 GUI for " << _node->path().chop_scheme() << endl;
}
}
-#endif
+
return false;
}
diff --git a/src/gui/PatchCanvas.cpp b/src/gui/PatchCanvas.cpp
index 6da4eb93..a994662d 100644
--- a/src/gui/PatchCanvas.cpp
+++ b/src/gui/PatchCanvas.cpp
@@ -45,7 +45,6 @@
#include "WidgetFactory.hpp"
#include "WindowFactory.hpp"
#include "ThreadedLoader.hpp"
-#include "ingen-config.h"
#define LOG(s) s << "[PatchCanvas] "
@@ -167,7 +166,6 @@ PatchCanvas::build_menus()
}
// Build skeleton LV2 plugin class heirarchy for 'Plugin' menu
-#ifdef HAVE_LILV
if (!_plugin_menu)
build_plugin_menu();
@@ -181,7 +179,6 @@ PatchCanvas::build_menus()
classless_menu_item->set_submenu(*_classless_menu);
_classless_menu->hide();
}
-#endif
// Add known plugins to menu heirarchy
SharedPtr<const ClientStore::Plugins> plugins = App::instance().store()->plugins();
@@ -189,8 +186,6 @@ PatchCanvas::build_menus()
add_plugin(i->second);
}
-#ifdef HAVE_LILV
-
/** Recursively build the plugin class menu heirarchy rooted at
* @a plugin class into @a menu
*/
@@ -277,8 +272,6 @@ PatchCanvas::build_plugin_menu()
build_plugin_class_menu(_plugin_menu, lv2_plugin, classes, children, ancestors);
}
-#endif
-
void
PatchCanvas::build()
{
diff --git a/src/gui/PatchCanvas.hpp b/src/gui/PatchCanvas.hpp
index d5f30b49..1f831624 100644
--- a/src/gui/PatchCanvas.hpp
+++ b/src/gui/PatchCanvas.hpp
@@ -21,12 +21,16 @@
#include <string>
#include <map>
#include <set>
+
#include <boost/shared_ptr.hpp>
-#include "ingen-config.h"
+
+#include "lilv/lilv.h"
+
#include "flowcanvas/Canvas.hpp"
#include "flowcanvas/Module.hpp"
#include "raul/SharedPtr.hpp"
#include "raul/Path.hpp"
+
#include "client/ConnectionModel.hpp"
#include "ingen/GraphObject.hpp"
#include "NodeModule.hpp"
@@ -110,7 +114,6 @@ private:
void auto_menu_position(int& x, int& y, bool& push_in);
-#ifdef HAVE_LILV
typedef std::multimap<const std::string, const LilvPluginClass*> LV2Children;
void build_plugin_menu();
size_t build_plugin_class_menu(
@@ -119,7 +122,6 @@ private:
const LilvPluginClasses* classes,
const LV2Children& children,
std::set<const char*>& ancestors);
-#endif
GraphObject::Properties get_initial_data();
diff --git a/src/gui/WidgetFactory.cpp b/src/gui/WidgetFactory.cpp
index 9579a1e1..68582fd3 100644
--- a/src/gui/WidgetFactory.cpp
+++ b/src/gui/WidgetFactory.cpp
@@ -18,7 +18,6 @@
#include "WidgetFactory.hpp"
#include <fstream>
#include "raul/log.hpp"
-#include "ingen-config.h"
#include "shared/runtime_paths.hpp"
using namespace std;