Fix libfaustremote compilation, cleanup.

architecture/faust/gui/CGlue.h

@@ -1,20 +1,20 @@
 /************************************************************************
  ************************************************************************
     FAUST Architecture File
-	Copyright (C) 2003-2013 GRAME, Centre National de Creation Musicale
+    Copyright (C) 2003-2013 GRAME, Centre National de Creation Musicale
     ---------------------------------------------------------------------
     This Architecture section is free software; you can redistribute it
     and/or modify it under the terms of the GNU General Public License
-	as published by the Free Software Foundation; either version 3 of
-	the License, or (at your option) any later version.
+    as published by the Free Software Foundation; either version 3 of
+    the License, or (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-	along with this program; If not, see <http://www.gnu.org/licenses/>.
+    along with this program; If not, see <http://www.gnu.org/licenses/>.
 
  ************************************************************************
  ************************************************************************/

architecture/faust/gui/CInterface.h

@@ -1,20 +1,20 @@
 /************************************************************************
  ************************************************************************
     FAUST Architecture File
-	Copyright (C) 2003-2013 GRAME, Centre National de Creation Musicale
+    Copyright (C) 2003-2013 GRAME, Centre National de Creation Musicale
     ---------------------------------------------------------------------
     This Architecture section is free software; you can redistribute it
     and/or modify it under the terms of the GNU General Public License
-	as published by the Free Software Foundation; either version 3 of
-	the License, or (at your option) any later version.
+    as published by the Free Software Foundation; either version 3 of
+    the License, or (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-	along with this program; If not, see <http://www.gnu.org/licenses/>.
+    along with this program; If not, see <http://www.gnu.org/licenses/>.
 
  ************************************************************************
  ************************************************************************/

architecture/webaudio/dynamic-organ-wasm.html

@@ -32,10 +32,12 @@ <H1> Faust dynamically generated polyphonic MIDI ready WebAudio node </H1>
 // Slider handler to change the 'noise' volume
 function changeVolume(event)
 {
-    var val = event.target.value;
-    val = parseFloat(val);
-    console.log(val);
-    organ.setParamValue("/FaustDSP/volume", val);
+    if (organ) {
+        var val = event.target.value;
+        val = parseFloat(val);
+        console.log(val);
+        organ.setParamValue("/FaustDSP/volume", val);
+    }
 }
 
 // MIDI input handling

compiler/libcode.cpp

@@ -767,9 +767,9 @@ static void initFaustDirectories()
 
     gGlobal->gArchitectureDirList.push_back(gGlobal->gMasterDirectory);
     if (char* envpath = getenv("FAUST_ARCH_PATH")) { gGlobal->gArchitectureDirList.push_back(envpath); }
-    gGlobal->gArchitectureDirList.push_back(gGlobal->gFaustDirectory+"/architecture");
-    gGlobal->gArchitectureDirList.push_back(gGlobal->gFaustSuperDirectory+"/architecture");
-    gGlobal->gArchitectureDirList.push_back(gGlobal->gFaustSuperSuperDirectory+"/architecture");
+    gGlobal->gArchitectureDirList.push_back(gGlobal->gFaustDirectory + "/architecture");
+    gGlobal->gArchitectureDirList.push_back(gGlobal->gFaustSuperDirectory + "/architecture");
+    gGlobal->gArchitectureDirList.push_back(gGlobal->gFaustSuperSuperDirectory + "/architecture");
 #ifdef INSTALL_PREFIX
     gGlobal->gArchitectureDirList.push_back(INSTALL_PREFIX "/share/faust");
     gGlobal->gArchitectureDirList.push_back(INSTALL_PREFIX "/include");
@@ -817,7 +817,7 @@ static Tree evaluateBlockDiagram(Tree expandedDefList, int& numInputs, int& numO
 
     if (gGlobal->gDrawPSSwitch || gGlobal->gDrawSVGSwitch) {
         string projname = gGlobal->makeDrawPathNoExt();
-        if (gGlobal->gDrawPSSwitch)  { drawSchema(process, subst("$0-ps",  projname).c_str(), "ps"); }
+        if (gGlobal->gDrawPSSwitch)  { drawSchema(process, subst("$0-ps", projname).c_str(), "ps"); }
         if (gGlobal->gDrawSVGSwitch) { drawSchema(process, subst("$0-svg", projname).c_str(), "svg"); }
     }
 
@@ -828,7 +828,7 @@ static Tree evaluateBlockDiagram(Tree expandedDefList, int& numInputs, int& numO
     }
 
     if (gGlobal->gDetailsSwitch) {
-        cout <<"process has " << numInputs <<" inputs, and " << numOutputs <<" outputs" << endl;
+        cout << "process has " << numInputs <<" inputs, and " << numOutputs << " outputs" << endl;
     }
 
     endTiming("evaluation");

embedded/faustremote/RemoteClient/remote_dsp_aux.cpp

@@ -26,8 +26,8 @@
 #include "remote_dsp_aux.h"
 #include "faust/gui/ControlUI.h"
 #include "faust/gui/MidiUI.h"
-#include "faust/dsp/llvm-dsp.h"
-#include "faust/dsp/interpreter-dsp.h"
+#include "llvm-dsp.h"
+#include "interpreter-dsp.h"
 #include "utilities.h"
 #include "rn_base64.h"
 

embedded/faustremote/RemoteServer/Makefile

@@ -25,9 +25,9 @@ sources =  $(wildcard *.cpp)
 objects = $(sources:.cpp=.o)
 
 ifeq ($(system), Darwin)
-	LIBS = ../../../compiler/libfaust.a -framework CoreAudio -framework AudioUnit -framework CoreServices -framework CoreFoundation -lportaudio -ljacknet -ljack -L/opt/local/lib -lOSCFaust -lHTTPDFaust -framework CoreMIDI -lmicrohttpd -lpthread -lcrypto `$(LLVM_CONFIG) --ldflags` `$(LLVM_CONFIG) --libs` -lz -lncurses -ldl -llo
+	LIBS = ../../../compiler/libfaust.a -framework CoreAudio -framework AudioUnit -framework CoreServices -framework CoreFoundation -lportaudio -ljack -ljacknet -L/opt/local/lib ../../../architecture/osclib/libOSCFaust.a ../../../architecture/httpdlib/libHTTPDFaust.a -framework CoreMIDI -lmicrohttpd -lpthread -lcrypto `$(LLVM_CONFIG) --ldflags` `$(LLVM_CONFIG) --libs` -lz -lncurses -ldl -llo
 else 
-	LIBS = ../../../compiler/libfaust.a -ljacknet -lOSCFaust -lHTTPDFaust -ljack -lmicrohttpd -lpthread -lcrypto `$(LLVM_CONFIG) --ldflags` `$(LLVM_CONFIG) --libs` -lz -lncurses -ldl -llo
+	LIBS = ../../../compiler/libfaust.a ../../../architecture/osclib/libOSCFaust.a ../../../architecture/httpdlib/libHTTPDFaust.a -ljack -ljacknet -lmicrohttpd -lpthread -lcrypto `$(LLVM_CONFIG) --ldflags` `$(LLVM_CONFIG) --libs` -lz -lncurses -ldl -llo
 endif
 
 ####### Files

embedded/faustremote/RemoteServer/remote_server.h

@@ -44,9 +44,9 @@
 */
 
 #ifdef LLVM_DSP_FACTORY
-#include "faust/dsp/llvm-dsp.h"
+#include "llvm-dsp.h"
 #else
-#include "faust/dsp/interpreter-dsp.h"
+#include "interpreter-dsp.h"
 #endif
 
 #include "faust/audio/audio.h"