Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Debian fixes #27

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Build/FaustLive.pro
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ else {
ROOT = $$PWD/..
BUILD = $$PWD
SRC = $$ROOT/src
DESTDIR = $$PWD/FaustLive
DESTDIR = FaustLive

LOCALLIB = $$ROOT/lib

Expand Down
2 changes: 1 addition & 1 deletion Resources/Examples/flute.dsp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ declare author "Romain Michon ([email protected])";
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");

Expand Down
2 changes: 1 addition & 1 deletion Resources/Examples/fluteStk.dsp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Resources/Examples/glassHarmonica.dsp
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion Resources/Examples/tibetanBowl.dsp
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion Resources/Examples_bckp/flute.dsp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ declare author "Romain Michon ([email protected])";
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");
Expand Down
2 changes: 1 addition & 1 deletion Resources/Examples_bckp/glassHarmonica.dsp
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion Resources/Examples_bckp/tibetanBowl.dsp
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
Empty file modified Resources/application.qrc
100755 → 100644
Empty file.
Empty file modified Resources/scheduler.qrc
100755 → 100644
Empty file.
Empty file modified Resources/windows.qrc
100755 → 100644
Empty file.
Empty file modified src/Audio/FJUI.h
100755 → 100644
Empty file.
Empty file modified src/MainStructure/FLApp.cpp
100755 → 100644
Empty file.
Empty file modified src/MainStructure/FLApp.h
100755 → 100644
Empty file.
Empty file modified src/MainStructure/FLComponentWindow.cpp
100755 → 100644
Empty file.
Empty file modified src/MainStructure/FLComponentWindow.h
100755 → 100644
Empty file.
Empty file modified src/MainStructure/FLFileWatcher.cpp
100755 → 100644
Empty file.
Empty file modified src/MainStructure/FLFileWatcher.h
100755 → 100644
Empty file.
Empty file modified src/MainStructure/FLInterfaceManager.cpp
100755 → 100644
Empty file.
Empty file modified src/MainStructure/FLInterfaceManager.h
100755 → 100644
Empty file.
2 changes: 1 addition & 1 deletion src/MainStructure/FLSessionManager.cpp
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Empty file modified src/MainStructure/FLSessionManager.h
100755 → 100644
Empty file.
Empty file modified src/MainStructure/FLSettings.cpp
100755 → 100644
Empty file.
Empty file modified src/MainStructure/FLSettings.h
100755 → 100644
Empty file.
Empty file modified src/MainStructure/FLWinSettings.cpp
100755 → 100644
Empty file.
Empty file modified src/MainStructure/FLWinSettings.h
100755 → 100644
Empty file.
Empty file modified src/MainStructure/FLWindow.cpp
100755 → 100644
Empty file.
Empty file modified src/MainStructure/FLWindow.h
100755 → 100644
Empty file.
Empty file modified src/MenusAndDialogs/FLErrorWindow.cpp
100755 → 100644
Empty file.
Empty file modified src/MenusAndDialogs/FLErrorWindow.h
100755 → 100644
Empty file.
Empty file modified src/MenusAndDialogs/FLExportManager.cpp
100755 → 100644
Empty file.
Empty file modified src/MenusAndDialogs/FLExportManager.h
100755 → 100644
Empty file.
4 changes: 2 additions & 2 deletions src/MenusAndDialogs/FLHelpWindow.cpp
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ void FLHelpWindow::setToolText(const QString & currentText)
else if (currentText.compare("JACK") == 0)
fToolText->setHtml("<br>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.<br><br>YOU CAN DOWNLOAD IT HERE : <a href =http://www.jackosx.com> www.jackosx.com</a>\n");
else if (currentText.compare("NETJACK") == 0)
fToolText->setHtml("<br>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.<br><br>""LEARN MORE ABOUT NETJACK : <a href = http://netjack.sourceforge.net> netjack.sourceforge.net</a>\n");
fToolText->setHtml("<br>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.<br><br>""LEARN MORE ABOUT NETJACK : <a href = http://netjack.sourceforge.net> netjack.sourceforge.net</a>\n");
else if (currentText.compare("PORTAUDIO") == 0)
fToolText->setHtml("<br>PortAudio is a free, cross-platform, open-source, audio I/O library. <br><br>""LEARN MORE ABOUT PORTAUDIO : <a href = http://www.portaudio.com/> portaudio.com</a>\n");
else if (currentText.compare("LIB QRENCODE") == 0)
Expand Down Expand Up @@ -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

Expand Down
Empty file modified src/MenusAndDialogs/FLHelpWindow.h
100755 → 100644
Empty file.
Empty file modified src/MenusAndDialogs/FLMessageWindow.cpp
100755 → 100644
Empty file.
Empty file modified src/MenusAndDialogs/FLMessageWindow.h
100755 → 100644
Empty file.
Empty file modified src/MenusAndDialogs/FLPreferenceWindow.cpp
100755 → 100644
Empty file.
Empty file modified src/MenusAndDialogs/FLPreferenceWindow.h
100755 → 100644
Empty file.
Empty file modified src/MenusAndDialogs/FLPresentationWindow.cpp
100755 → 100644
Empty file.
Empty file modified src/MenusAndDialogs/FLPresentationWindow.h
100755 → 100644
Empty file.
Empty file modified src/MenusAndDialogs/FLRemoteDSPScanner.cpp
100755 → 100644
Empty file.
Empty file modified src/MenusAndDialogs/FLRemoteDSPScanner.h
100755 → 100644
Empty file.
Empty file modified src/MenusAndDialogs/FLStatusBar.cpp
100755 → 100644
Empty file.
Empty file modified src/MenusAndDialogs/FLStatusBar.h
100755 → 100644
Empty file.
Empty file modified src/MenusAndDialogs/FLToolBar.cpp
100755 → 100644
Empty file.
Empty file modified src/MenusAndDialogs/FLToolBar.h
100755 → 100644
Empty file.
Empty file modified src/Network/FLRemoteServer.cpp
100755 → 100644
Empty file.
Empty file modified src/Network/FLRemoteServer.h
100755 → 100644
Empty file.
Empty file modified src/Network/FLServerHttp.cpp
100755 → 100644
Empty file.
Empty file modified src/Network/FLServerHttp.h
100755 → 100644
Empty file.
Empty file modified src/Network/HTTPWindow.cpp
100755 → 100644
Empty file.
Empty file modified src/Network/HTTPWindow.h
100755 → 100644
Empty file.
3 changes: 2 additions & 1 deletion src/Utilities/make_llvm_module
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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
clang -cc1 -emit-llvm -S -triple arm-apple-darwin14.0.0 llvm_memory.c -o llvm_memory.ll