summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2008-06-09 18:51:55 +0000
committerDavid Robillard <d@drobilla.net>2008-06-09 18:51:55 +0000
commit121874f11a563d748d7eb3c425f859c00a6f7055 (patch)
treef79a62f9b8544ce5f3a2abed26a39a3e201bb4ae
parent7c4ca637481420c82a1d985987418af6daf19439 (diff)
downloadingen-121874f11a563d748d7eb3c425f859c00a6f7055.tar.gz
ingen-121874f11a563d748d7eb3c425f859c00a6f7055.tar.bz2
ingen-121874f11a563d748d7eb3c425f859c00a6f7055.zip
Bump liblo dependency to 0.25 (SVN).
git-svn-id: http://svn.drobilla.net/lad/ingen@1253 a436a847-0d15-0410-975c-d299462d15a1
-rw-r--r--configure.ac2
-rw-r--r--src/libs/gui/ControlGroups.cpp10
-rw-r--r--src/libs/gui/NodeControlWindow.cpp11
3 files changed, 12 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac
index a978a02e..75bee6bf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -140,7 +140,7 @@ if test "$build_jack" = "yes"; then
fi
# OSC support (mandatory for now due to laziness)
-PKG_CHECK_MODULES(LIBLO, liblo >= 0.24)
+PKG_CHECK_MODULES(LIBLO, liblo >= 0.25)
# LV2 support
build_lv2="yes"
diff --git a/src/libs/gui/ControlGroups.cpp b/src/libs/gui/ControlGroups.cpp
index f0f5aa13..fe022799 100644
--- a/src/libs/gui/ControlGroups.cpp
+++ b/src/libs/gui/ControlGroups.cpp
@@ -40,9 +40,9 @@ namespace GUI {
// ////////////////////// ControlGroup ///////////////////////////////// //
ControlGroup::ControlGroup(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& glade_xml)
-: Gtk::VBox(cobject),
- _control_panel(NULL),
- _enable_signal(false)
+ : Gtk::VBox(cobject),
+ , _control_panel(NULL),
+ , _enable_signal(false)
{
}
@@ -72,8 +72,8 @@ ControlGroup::init(ControlPanel* panel, SharedPtr<PortModel> pm)
SliderControlGroup::SliderControlGroup(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& xml)
-: ControlGroup(cobject, xml),
- _enabled(true)
+ : ControlGroup(cobject, xml)
+ , _enabled(true)
{
xml->get_widget("control_strip_name_label", _name_label);
xml->get_widget("control_strip_slider", _slider);
diff --git a/src/libs/gui/NodeControlWindow.cpp b/src/libs/gui/NodeControlWindow.cpp
index cfa22b10..3f3ccc97 100644
--- a/src/libs/gui/NodeControlWindow.cpp
+++ b/src/libs/gui/NodeControlWindow.cpp
@@ -35,9 +35,10 @@ namespace GUI {
/** Create a node control window and load a new ControlPanel for it.
*/
NodeControlWindow::NodeControlWindow(SharedPtr<NodeModel> node, uint32_t poly)
-: _node(node),
- _position_stored(false),
- _x(0), _y(0)
+ : _node(node)
+ , _position_stored(false)
+ , _x(0)
+ , _y(0)
{
assert(_node != NULL);
@@ -63,8 +64,8 @@ NodeControlWindow::NodeControlWindow(SharedPtr<NodeModel> node, uint32_t poly)
/** Create a node control window and with an existing ControlPanel.
*/
NodeControlWindow::NodeControlWindow(SharedPtr<NodeModel> node, ControlPanel* panel)
-: _node(node),
- _control_panel(panel)
+ : _node(node)
+ , _control_panel(panel)
{
assert(_node);