# HG changeset patch
# User Chris Cannam
# Date 1393594905 0
# Node ID 84d02afe28e67f96235f0bf469287f00635e051f
# Parent  c42239ab60845e64f961accc76cfd601dc950b54
Supply dirname and filename separately

diff -r c42239ab6084 -r 84d02afe28e6 .hgsubstate
--- a/.hgsubstate	Fri Feb 28 11:27:06 2014 +0000
+++ b/.hgsubstate	Fri Feb 28 13:41:45 2014 +0000
@@ -1,1 +1,1 @@
-d9262cdbfb38fd9b4dc782030c3721fef4286911 mcode
+c8b0cf96ea447dec3df8ed5268837c2468584c11 mcode
diff -r c42239ab6084 -r 84d02afe28e6 INSTALL.txt
--- a/INSTALL.txt	Fri Feb 28 11:27:06 2014 +0000
+++ b/INSTALL.txt	Fri Feb 28 13:41:45 2014 +0000
@@ -115,5 +115,5 @@
 If this fails, you may be able to recompile the MATLAB component by
 running the following MCC command:
 
-    /Applications/MATLAB_R2013b.app/bin/mcc -W "java:uk.ac.soton.isvr,HumanEcho" -d ./scratch -T "link:lib" -v "class{HumanEcho:./WebContent/WEB-INF/mcode/gen_echo.m}"
+    /Applications/MATLAB_R2013b.app/bin/mcc -W "java:uk.ac.soton.isvr,HumanEcho" -d ./scratch -T "link:lib" -v "class{HumanEcho:./mcode/simulateBinauralSignals.m}"
 
diff -r c42239ab6084 -r 84d02afe28e6 src/HumanEchoServlet.java
--- a/src/HumanEchoServlet.java	Fri Feb 28 11:27:06 2014 +0000
+++ b/src/HumanEchoServlet.java	Fri Feb 28 13:41:45 2014 +0000
@@ -112,16 +112,17 @@
             Input.set("orient", 1, "horz");
             Input.set("dirweight", 1, Double.valueOf(0.2));
 
+	    Input.set("outdir", 1, wavdir);
+
             // the ofname should depend on the parameters
             StringBuilder sb = new StringBuilder();
             sb.append("e_d");
             sb.append(dist);
             sb.append("_a");
             sb.append(azim);
-            sb.append(".wav");
             outputfname = sb.toString();
 
-            Input.set("outputfname", 1, outputfname);
+            Input.set("outname", 1, outputfname);
 
             // todo: before calling should test if wav already exists..
             Object[] result = echo.simulateBinauralSignals(Input);