diff --git a/Build/FaustLive.pro b/Build/FaustLive.pro old mode 100755 new mode 100644 index 22937c6..1bf6993 --- a/Build/FaustLive.pro +++ b/Build/FaustLive.pro @@ -11,7 +11,7 @@ else { ROOT = $$PWD/.. BUILD = $$PWD SRC = $$ROOT/src -DESTDIR = $$PWD/FaustLive +DESTDIR = FaustLive LOCALLIB = $$ROOT/lib diff --git a/Resources/Examples/flute.dsp b/Resources/Examples/flute.dsp index fa90cba..da21566 100644 --- a/Resources/Examples/flute.dsp +++ b/Resources/Examples/flute.dsp @@ -4,7 +4,7 @@ declare author "Romain Michon (rmichon@ccrma.stanford.edu)"; declare copyright "Romain Michon"; declare version "1.0"; declare licence "STK-4.3"; // Synthesis Tool Kit 4.3 (MIT style license); -declare description "A simple flute based on Smith algorythm: https://ccrma.stanford.edu/~jos/pasp/Flutes_Recorders_Pipe_Organs.html"; +declare description "A simple flute based on Smith algorithm: https://ccrma.stanford.edu/~jos/pasp/Flutes_Recorders_Pipe_Organs.html"; import("instruments.lib"); diff --git a/Resources/Examples/fluteStk.dsp b/Resources/Examples/fluteStk.dsp index 9d1a371..4e48da7 100644 --- a/Resources/Examples/fluteStk.dsp +++ b/Resources/Examples/fluteStk.dsp @@ -96,7 +96,7 @@ stereo = stereoizer(ma.SR/freq); //----------------------- Algorithm implementation ---------------------------- -//the vibrato amplitude is controled by an envelope generator (declared in instruments.lib) +//the vibrato amplitude is controlled by an envelope generator (declared in instruments.lib) vibrato = vibratoGain*envVibrato(vibratoBegin,vibratoAttack,1,vibratoRelease,gate)*os.osc(vibratoFreq); //Breath pressure is controlled by an Attack / Decay / Sustain / Release envelope diff --git a/Resources/Examples/glassHarmonica.dsp b/Resources/Examples/glassHarmonica.dsp index 24acf5c..f7e874d 100644 --- a/Resources/Examples/glassHarmonica.dsp +++ b/Resources/Examples/glassHarmonica.dsp @@ -105,7 +105,7 @@ baseGainApp = 0.8999999999999999 + (0.1*baseGain); velocityInputApp = integrationConstant; velocityInput = velocityInputApp + _*baseGainApp,par(i,(nModes-1),(_*baseGainApp)) :> +; -//Bow velocity is controled by an ADSR envelope +//Bow velocity is controlled by an ADSR envelope maxVelocity = 0.03 + 0.1*gain; bowVelocity = maxVelocity*en.adsr(0.02,0.005,1,0.01,gate); diff --git a/Resources/Examples/tibetanBowl.dsp b/Resources/Examples/tibetanBowl.dsp index 63b55ad..ce13307 100644 --- a/Resources/Examples/tibetanBowl.dsp +++ b/Resources/Examples/tibetanBowl.dsp @@ -129,7 +129,7 @@ baseGainApp = 0.8999999999999999 + (0.1*baseGain); velocityInputApp = integrationConstant; velocityInput = velocityInputApp + _*baseGainApp,par(i,(nModes-1),(_*baseGainApp)) :> +; -//Bow velocity is controled by an ADSR envelope +//Bow velocity is controlled by an ADSR envelope maxVelocity = 0.03 + 0.1*gain; bowVelocity = maxVelocity*en.adsr(0.02,0.005,1,0.01,gate); diff --git a/Resources/Examples_bckp/flute.dsp b/Resources/Examples_bckp/flute.dsp index 9a06749..9fb9032 100644 --- a/Resources/Examples_bckp/flute.dsp +++ b/Resources/Examples_bckp/flute.dsp @@ -4,7 +4,7 @@ declare author "Romain Michon (rmichon@ccrma.stanford.edu)"; declare copyright "Romain Michon"; declare version "1.0"; declare licence "STK-4.3"; // Synthesis Tool Kit 4.3 (MIT style license); -declare description "A simple flute based on Smith algorythm: https://ccrma.stanford.edu/~jos/pasp/Flutes_Recorders_Pipe_Organs.html"; +declare description "A simple flute based on Smith algorithm: https://ccrma.stanford.edu/~jos/pasp/Flutes_Recorders_Pipe_Organs.html"; import("math.lib"); import("signal.lib"); diff --git a/Resources/Examples_bckp/glassHarmonica.dsp b/Resources/Examples_bckp/glassHarmonica.dsp index f92f912..f03759b 100644 --- a/Resources/Examples_bckp/glassHarmonica.dsp +++ b/Resources/Examples_bckp/glassHarmonica.dsp @@ -114,7 +114,7 @@ baseGainApp = 0.8999999999999999 + (0.1*baseGain); velocityInputApp = integrationConstant; velocityInput = velocityInputApp + _*baseGainApp,par(i,(nModes-1),(_*baseGainApp)) :> +; -//Bow velocity is controled by an ADSR envelope +//Bow velocity is controlled by an ADSR envelope maxVelocity = 0.03 + 0.1*gain; bowVelocity = maxVelocity*adsr(0.02,0.005,90,0.01,gate); diff --git a/Resources/Examples_bckp/tibetanBowl.dsp b/Resources/Examples_bckp/tibetanBowl.dsp index e5510b6..d62d684 100644 --- a/Resources/Examples_bckp/tibetanBowl.dsp +++ b/Resources/Examples_bckp/tibetanBowl.dsp @@ -135,7 +135,7 @@ baseGainApp = 0.8999999999999999 + (0.1*baseGain); velocityInputApp = integrationConstant; velocityInput = velocityInputApp + _*baseGainApp,par(i,(nModes-1),(_*baseGainApp)) :> +; -//Bow velocity is controled by an ADSR envelope +//Bow velocity is controlled by an ADSR envelope maxVelocity = 0.03 + 0.1*gain; bowVelocity = maxVelocity*adsr(0.02,0.005,90,0.01,gate); diff --git a/Resources/application.qrc b/Resources/application.qrc old mode 100755 new mode 100644 diff --git a/Resources/scheduler.qrc b/Resources/scheduler.qrc old mode 100755 new mode 100644 diff --git a/Resources/windows.qrc b/Resources/windows.qrc old mode 100755 new mode 100644 diff --git a/src/Audio/FJUI.h b/src/Audio/FJUI.h old mode 100755 new mode 100644 diff --git a/src/MainStructure/FLApp.cpp b/src/MainStructure/FLApp.cpp old mode 100755 new mode 100644 diff --git a/src/MainStructure/FLApp.h b/src/MainStructure/FLApp.h old mode 100755 new mode 100644 diff --git a/src/MainStructure/FLComponentWindow.cpp b/src/MainStructure/FLComponentWindow.cpp old mode 100755 new mode 100644 diff --git a/src/MainStructure/FLComponentWindow.h b/src/MainStructure/FLComponentWindow.h old mode 100755 new mode 100644 diff --git a/src/MainStructure/FLFileWatcher.cpp b/src/MainStructure/FLFileWatcher.cpp old mode 100755 new mode 100644 diff --git a/src/MainStructure/FLFileWatcher.h b/src/MainStructure/FLFileWatcher.h old mode 100755 new mode 100644 diff --git a/src/MainStructure/FLInterfaceManager.cpp b/src/MainStructure/FLInterfaceManager.cpp old mode 100755 new mode 100644 diff --git a/src/MainStructure/FLInterfaceManager.h b/src/MainStructure/FLInterfaceManager.h old mode 100755 new mode 100644 diff --git a/src/MainStructure/FLSessionManager.cpp b/src/MainStructure/FLSessionManager.cpp old mode 100755 new mode 100644 index 823609a..761832d --- a/src/MainStructure/FLSessionManager.cpp +++ b/src/MainStructure/FLSessionManager.cpp @@ -32,7 +32,7 @@ /* When creating a new DSP, it is associated to a unique SHA Key calculated from the faust code, the name and the compilation options */ -/* This allows to accelerate compilation when reusing the same DSP */ +/* This allows one to accelerate compilation when reusing the same DSP */ FLSessionManager* FLSessionManager::_sessionManager = 0; diff --git a/src/MainStructure/FLSessionManager.h b/src/MainStructure/FLSessionManager.h old mode 100755 new mode 100644 diff --git a/src/MainStructure/FLSettings.cpp b/src/MainStructure/FLSettings.cpp old mode 100755 new mode 100644 diff --git a/src/MainStructure/FLSettings.h b/src/MainStructure/FLSettings.h old mode 100755 new mode 100644 diff --git a/src/MainStructure/FLWinSettings.cpp b/src/MainStructure/FLWinSettings.cpp old mode 100755 new mode 100644 diff --git a/src/MainStructure/FLWinSettings.h b/src/MainStructure/FLWinSettings.h old mode 100755 new mode 100644 diff --git a/src/MainStructure/FLWindow.cpp b/src/MainStructure/FLWindow.cpp old mode 100755 new mode 100644 diff --git a/src/MainStructure/FLWindow.h b/src/MainStructure/FLWindow.h old mode 100755 new mode 100644 diff --git a/src/MenusAndDialogs/FLErrorWindow.cpp b/src/MenusAndDialogs/FLErrorWindow.cpp old mode 100755 new mode 100644 diff --git a/src/MenusAndDialogs/FLErrorWindow.h b/src/MenusAndDialogs/FLErrorWindow.h old mode 100755 new mode 100644 diff --git a/src/MenusAndDialogs/FLExportManager.cpp b/src/MenusAndDialogs/FLExportManager.cpp old mode 100755 new mode 100644 diff --git a/src/MenusAndDialogs/FLExportManager.h b/src/MenusAndDialogs/FLExportManager.h old mode 100755 new mode 100644 diff --git a/src/MenusAndDialogs/FLHelpWindow.cpp b/src/MenusAndDialogs/FLHelpWindow.cpp old mode 100755 new mode 100644 index 8563d77..47c3e59 --- a/src/MenusAndDialogs/FLHelpWindow.cpp +++ b/src/MenusAndDialogs/FLHelpWindow.cpp @@ -66,7 +66,7 @@ void FLHelpWindow::setToolText(const QString & currentText) else if (currentText.compare("JACK") == 0) fToolText->setHtml("
Jack (the Jack Audio Connection Kit) is a low-latency audio server. It can connect any number of different applications to a single hardware audio device.

YOU CAN DOWNLOAD IT HERE : www.jackosx.com\n"); else if (currentText.compare("NETJACK") == 0) - fToolText->setHtml("
NetJack (fully integrated in Jack) is a Realtime Audio Transport over a generic IP Network. It allows to send audio signals through the network to a server.

""LEARN MORE ABOUT NETJACK : netjack.sourceforge.net\n"); + fToolText->setHtml("
NetJack (fully integrated in Jack) is a Realtime Audio Transport over a generic IP Network. It allows one to send audio signals through the network to a server.

""LEARN MORE ABOUT NETJACK : netjack.sourceforge.net\n"); else if (currentText.compare("PORTAUDIO") == 0) fToolText->setHtml("
PortAudio is a free, cross-platform, open-source, audio I/O library.

""LEARN MORE ABOUT PORTAUDIO : portaudio.com\n"); else if (currentText.compare("LIB QRENCODE") == 0) @@ -305,7 +305,7 @@ void FLHelpWindow::init() QGridLayout* appLayout1 = new QGridLayout; fTreeLibs = new QTreeWidget; - fTreeLibs->setHeaderLabel("Available Librairies"); + fTreeLibs->setHeaderLabel("Available Libraries"); // Mettre en route d'ajouter les librairies présentes dans le dossier Libs diff --git a/src/MenusAndDialogs/FLHelpWindow.h b/src/MenusAndDialogs/FLHelpWindow.h old mode 100755 new mode 100644 diff --git a/src/MenusAndDialogs/FLMessageWindow.cpp b/src/MenusAndDialogs/FLMessageWindow.cpp old mode 100755 new mode 100644 diff --git a/src/MenusAndDialogs/FLMessageWindow.h b/src/MenusAndDialogs/FLMessageWindow.h old mode 100755 new mode 100644 diff --git a/src/MenusAndDialogs/FLPreferenceWindow.cpp b/src/MenusAndDialogs/FLPreferenceWindow.cpp old mode 100755 new mode 100644 diff --git a/src/MenusAndDialogs/FLPreferenceWindow.h b/src/MenusAndDialogs/FLPreferenceWindow.h old mode 100755 new mode 100644 diff --git a/src/MenusAndDialogs/FLPresentationWindow.cpp b/src/MenusAndDialogs/FLPresentationWindow.cpp old mode 100755 new mode 100644 diff --git a/src/MenusAndDialogs/FLPresentationWindow.h b/src/MenusAndDialogs/FLPresentationWindow.h old mode 100755 new mode 100644 diff --git a/src/MenusAndDialogs/FLRemoteDSPScanner.cpp b/src/MenusAndDialogs/FLRemoteDSPScanner.cpp old mode 100755 new mode 100644 diff --git a/src/MenusAndDialogs/FLRemoteDSPScanner.h b/src/MenusAndDialogs/FLRemoteDSPScanner.h old mode 100755 new mode 100644 diff --git a/src/MenusAndDialogs/FLStatusBar.cpp b/src/MenusAndDialogs/FLStatusBar.cpp old mode 100755 new mode 100644 diff --git a/src/MenusAndDialogs/FLStatusBar.h b/src/MenusAndDialogs/FLStatusBar.h old mode 100755 new mode 100644 diff --git a/src/MenusAndDialogs/FLToolBar.cpp b/src/MenusAndDialogs/FLToolBar.cpp old mode 100755 new mode 100644 diff --git a/src/MenusAndDialogs/FLToolBar.h b/src/MenusAndDialogs/FLToolBar.h old mode 100755 new mode 100644 diff --git a/src/Network/FLRemoteServer.cpp b/src/Network/FLRemoteServer.cpp old mode 100755 new mode 100644 diff --git a/src/Network/FLRemoteServer.h b/src/Network/FLRemoteServer.h old mode 100755 new mode 100644 diff --git a/src/Network/FLServerHttp.cpp b/src/Network/FLServerHttp.cpp old mode 100755 new mode 100644 diff --git a/src/Network/FLServerHttp.h b/src/Network/FLServerHttp.h old mode 100755 new mode 100644 diff --git a/src/Network/HTTPWindow.cpp b/src/Network/HTTPWindow.cpp old mode 100755 new mode 100644 diff --git a/src/Network/HTTPWindow.h b/src/Network/HTTPWindow.h old mode 100755 new mode 100644 diff --git a/src/Utilities/make_llvm_module b/src/Utilities/make_llvm_module index 81e638e..9f49688 100755 --- a/src/Utilities/make_llvm_module +++ b/src/Utilities/make_llvm_module @@ -1,3 +1,4 @@ +#!/bin/sh clang -m32 -emit-llvm -S llvm_math.c -o llvm_math_32.ll llc -march=cpp -cppgen=module -cppfname=llvm_32_module llvm_math_32.ll @@ -13,4 +14,4 @@ echo "llvm::Module* llvm_64_module();" >> llvm_math.h clang -m32 -emit-llvm -S -target arm-apple-darwin14.0.0 llvm_memory.c -o llvm_memory.ll llc -march=cpp -cppgen=module -cppfname=llvm_32_module llvm_memory.ll -clang -cc1 -emit-llvm -S -triple arm-apple-darwin14.0.0 llvm_memory.c -o llvm_memory.ll \ No newline at end of file +clang -cc1 -emit-llvm -S -triple arm-apple-darwin14.0.0 llvm_memory.c -o llvm_memory.ll