From e0246f31193610078f19dbfef0ca3d52ff3f18d1 Mon Sep 17 00:00:00 2001
From: Alexander James Wallar <aw204@st-andrews.ac.uk>
Date: Mon, 20 Jan 2014 22:24:02 -0500
Subject: [PATCH] Doing some initial recognition testing

---
 app/Locabean/res/layout/activity_node.xml     | 24 +++++++++----------
 .../com/locaudio/locabean/NodeActivity.java   |  4 ++--
 .../com/locaudio/signal/WaveProcessing.java   | 11 +++++++++
 tests/test_server.py                          |  2 +-
 4 files changed, 26 insertions(+), 15 deletions(-)
 create mode 100644 app/Locabean/src/com/locaudio/signal/WaveProcessing.java

diff --git a/app/Locabean/res/layout/activity_node.xml b/app/Locabean/res/layout/activity_node.xml
index 536838f..743f07c 100644
--- a/app/Locabean/res/layout/activity_node.xml
+++ b/app/Locabean/res/layout/activity_node.xml
@@ -48,22 +48,13 @@
         android:layout_alignLeft="@+id/nameTextView"
         android:text="@string/confidenceItl" />
 
-    <Button
-        android:id="@+id/btnStart"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_above="@+id/btnStop"
-        android:layout_alignLeft="@+id/btnStop"
-        android:layout_marginBottom="15dp"
-        android:text="@string/record" />
-
     <Button
         android:id="@+id/btnSend"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignLeft="@+id/btnStop"
+        android:layout_alignLeft="@+id/btnStart"
         android:layout_alignParentBottom="true"
-        android:layout_marginBottom="34dp"
+        android:layout_marginBottom="27dp"
         android:text="@string/send" />
 
     <Button
@@ -72,7 +63,16 @@
         android:layout_height="wrap_content"
         android:layout_above="@+id/btnSend"
         android:layout_centerHorizontal="true"
-        android:layout_marginBottom="17dp"
+        android:layout_marginBottom="26dp"
         android:text="@string/stop" />
 
+    <Button
+        android:id="@+id/btnStart"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_above="@+id/btnStop"
+        android:layout_alignLeft="@+id/btnStop"
+        android:layout_marginBottom="27dp"
+        android:text="@string/record" />
+
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/Locabean/src/com/locaudio/locabean/NodeActivity.java b/app/Locabean/src/com/locaudio/locabean/NodeActivity.java
index 49942cb..b0f2bfd 100644
--- a/app/Locabean/src/com/locaudio/locabean/NodeActivity.java
+++ b/app/Locabean/src/com/locaudio/locabean/NodeActivity.java
@@ -23,7 +23,7 @@ public class NodeActivity extends Activity {
 	private TextView confidenceTextView = null;
 	private Locaudio locaudio = null;
 
-	private static final String IP_ADDRESS = "10.0.0.221";// "192.168.1.9";
+	private static final String IP_ADDRESS = "192.168.1.9";
 	private static final int PORT = 8000;
 
 	@Override
@@ -110,7 +110,7 @@ public void onClick(View v) {
 				break;
 			}
 			case R.id.btnSend: {
-				
+
 				Wave wave = new Wave(WaveWriter.getFilename());
 				NotifyForm postForm = new NotifyForm();
 				postForm.setFingerprint(wave.getFingerprint());
diff --git a/app/Locabean/src/com/locaudio/signal/WaveProcessing.java b/app/Locabean/src/com/locaudio/signal/WaveProcessing.java
new file mode 100644
index 0000000..03533a9
--- /dev/null
+++ b/app/Locabean/src/com/locaudio/signal/WaveProcessing.java
@@ -0,0 +1,11 @@
+package com.locaudio.signal;
+
+import com.musicg.wave.Wave;
+
+public class WaveProcessing {
+
+	public static short determineAverageApplitude(Wave wave) {
+		return 0;
+	}
+
+}
diff --git a/tests/test_server.py b/tests/test_server.py
index 202f708..71c02f0 100644
--- a/tests/test_server.py
+++ b/tests/test_server.py
@@ -13,7 +13,7 @@
 import locaudio.api as api
 
 
-server_addr = "10.0.0.221" #"192.168.1.9"
+server_addr = "192.168.1.9"
 server_port = 8000
 
 test_sound_name = "Cock"