diff options
| author | David Robillard <d@drobilla.net> | 2007-10-21 01:02:20 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2007-10-21 01:02:20 +0000 |
| commit | 6f1d3c49cde555178d189f42f83e12d2ca709bcf (patch) | |
| tree | 2e744dd08aaee9a421c372acf38b0c1aca8f88d4 /src | |
| parent | 31095ff836e7ee3af7bdae37827fdefe7abd60e6 (diff) | |
| download | machina-6f1d3c49cde555178d189f42f83e12d2ca709bcf.tar.gz machina-6f1d3c49cde555178d189f42f83e12d2ca709bcf.tar.bz2 machina-6f1d3c49cde555178d189f42f83e12d2ca709bcf.zip | |
Fix (most of the) basic machina functionality.
git-svn-id: http://svn.drobilla.net/lad/machina@889 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/EdgeView.cpp | 2 | ||||
| -rw-r--r-- | src/gui/MachinaCanvas.cpp | 1 | ||||
| -rw-r--r-- | src/gui/main.cpp | 4 |
3 files changed, 3 insertions, 4 deletions
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 |