From 5f34e93b4de84bfa27c1396cab07962b0f180595 Mon Sep 17 00:00:00 2001
From: Harry van Haaren <harryhaaren@gmail.com>
Date: Thu, 22 Aug 2013 04:45:24 +0100
Subject: [PATCH] -Updated Tupfile, run.sh script

---
 .ajsnapshot | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 .gitignore  |  1 +
 Tupfile     |  8 +++----
 run.sh      |  5 ++---
 4 files changed, 69 insertions(+), 7 deletions(-)
 create mode 100644 .ajsnapshot

diff --git a/.ajsnapshot b/.ajsnapshot
new file mode 100644
index 0000000..e9f03a4
--- /dev/null
+++ b/.ajsnapshot
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<alsa>
+  <client name="System">
+    <port id="0" />
+    <port id="1" />
+  </client>
+  <client name="Midi Through">
+    <port id="0" />
+  </client>
+  <client name="Hammerfall DSP">
+    <port id="0" />
+  </client>
+  <client name="Akai APC40">
+    <port id="0" />
+  </client>
+  <client name="Client-128" />
+  <client name="jack_midi" />
+</alsa>
+<jack>
+  <client name="system">
+    <port name="capture_1">
+      <connection port="Luppp:master_in" />
+    </port>
+    <port name="capture_2" />
+    <port name="capture_3" />
+    <port name="capture_4" />
+    <port name="capture_5" />
+    <port name="capture_6" />
+    <port name="capture_7" />
+    <port name="capture_8" />
+    <port name="capture_9" />
+    <port name="capture_10" />
+    <port name="capture_11" />
+    <port name="capture_12" />
+    <port name="capture_13" />
+    <port name="capture_14" />
+    <port name="capture_15" />
+    <port name="capture_16" />
+    <port name="capture_17" />
+    <port name="capture_18" />
+  </client>
+  <client name="alsa_pcm">
+    <port name="Midi-Through/midi_capture_1" />
+    <port name="Hammerfall-DSP/midi_capture_1" />
+  </client>
+  <client name="Luppp">
+    <port name="master_left">
+      <connection port="system:playback_1" />
+    </port>
+    <port name="master_right">
+      <connection port="system:playback_2" />
+    </port>
+    <port name="apc_out">
+      <connection port="alsa_pcm:Akai-APC40/midi_playback_1" />
+    </port>
+  </client>
+  <client name="alsa_pcm">
+    <port name="Akai-APC40/midi_capture_1">
+      <connection port="Luppp:midi_in" />
+    </port>
+  </client>
+</jack>
diff --git a/.gitignore b/.gitignore
index 9faab85..5745ec4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ planning/*
 
 *.o
 .tup/*
+/luppp
diff --git a/Tupfile b/Tupfile
index 21da61b..5b8590c 100644
--- a/Tupfile
+++ b/Tupfile
@@ -1,9 +1,9 @@
 
 # Tup build file for Luppp
 
-#INCLUDES  += 
-#LDFLAGS   += `pkg-config --libs jack sndfile cairomm-1.0 ntk ntk_images`
+INCLUDES  += `pkg-config --cflags jack sndfile cairomm-1.0 ntk ntk_images`
+LDFLAGS   += `pkg-config --libs   jack sndfile cairomm-1.0 ntk ntk_images`
 
-: foreach src/*.cxx src/observer/*.cxx src/dsp/*.cxx src/controller/*.cxx |> g++ -Wall -c %f -pthread -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -pthread -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/include/cairomm-1.0 -I/usr/lib/cairomm-1.0/include -I/usr/include/sigc++-2.0 -I/usr/lib/sigc++-2.0/include -I/usr/include/ntk -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng15  -o %o   |> %B.o
+: foreach src/*.cxx src/observer/*.cxx src/dsp/*.cxx src/controller/*.cxx |> g++ -Wall -c %f $(INCLUDES)  -o %o   |> %B.o
 
-: *.o |> g++ %f -ljack -lpthread -lrt -lsndfile -lcairomm-1.0 -lsigc-2.0 -lntk -lntk_images -lntk -lcairo  -o %o |> lup
+: *.o |> g++ %f $(LDFLAGS) -o %o |> luppp
diff --git a/run.sh b/run.sh
index bbd9372..dd2bdea 100755
--- a/run.sh
+++ b/run.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 
-cd .build/
+xterm -e "sleep 1 && aj-snapshot -r .ajsnapshot" &
 
-#xterm -e "sleep 1 && aj-snapshot -r luppp5apc.ajs" &
+./luppp
 
-./luppp5