From 6f1d3c49cde555178d189f42f83e12d2ca709bcf Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Sun, 21 Oct 2007 01:02:20 +0000
Subject: Fix (most of the) basic machina functionality.

git-svn-id: http://svn.drobilla.net/lad/machina@889 a436a847-0d15-0410-975c-d299462d15a1
---
 src/gui/EdgeView.cpp      | 2 +-
 src/gui/MachinaCanvas.cpp | 1 -
 src/gui/main.cpp          | 4 ++--
 3 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/gui/EdgeView.cpp b/src/gui/EdgeView.cpp
index 9e933f8..166f5fa 100644
--- a/src/gui/EdgeView.cpp
+++ b/src/gui/EdgeView.cpp
@@ -28,7 +28,7 @@ EdgeView::EdgeView(SharedPtr<Canvas>        canvas,
                    SharedPtr<NodeView>      src,
                    SharedPtr<NodeView>      dst,
                    SharedPtr<Machina::Edge> edge)
-	: FlowCanvas::Connection(canvas, src, dst, 0x9999AAff, true)
+	: FlowCanvas::Connection(canvas, src, dst, 0x9FA0A0F4, true)
 	, _edge(edge)
 {
 }
diff --git a/src/gui/MachinaCanvas.cpp b/src/gui/MachinaCanvas.cpp
index 3386334..3524035 100644
--- a/src/gui/MachinaCanvas.cpp
+++ b/src/gui/MachinaCanvas.cpp
@@ -53,7 +53,6 @@ MachinaCanvas::node_clicked(WeakPtr<NodeView> item, GdkEventButton* event)
 		_app->machine()->learn(Machina::LearnRequest::create(_app->maid(), node->node()));
 		return;
 	} else if (event->button == 3) {
-
 		SharedPtr<NodeView> last = _last_clicked.lock();
 
 		if (last) {
diff --git a/src/gui/main.cpp b/src/gui/main.cpp
index 62de866..527986b 100644
--- a/src/gui/main.cpp
+++ b/src/gui/main.cpp
@@ -26,7 +26,7 @@
 #include "machina/SMFDriver.hpp"
 #include "MachinaGUI.hpp"
 
-#ifdef WITH_JACK
+#ifdef HAVE_JACK
 #include "machina/JackDriver.hpp"
 #endif
 
@@ -70,7 +70,7 @@ main(int argc, char** argv)
 
 	// Build engine
 	SharedPtr<Driver> driver;
-#ifdef WITH_JACK
+#ifdef HAVE_JACK
 	driver = SharedPtr<Driver>(new JackDriver(machine));
 	((JackDriver*)driver.get())->attach("machina");
 #endif
-- 
cgit v1.2.1