Merge pull request #4 from corrados/master

update
This commit is contained in:
ignotus 2020-06-19 19:45:19 +02:00 committed by GitHub
commit 74f415f3af
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 1 deletions

View file

@ -5,7 +5,7 @@
3.5.7git 3.5.7git
- add new "slim channel" skin, intended for large ensembles (#339) - add new "compact" skin, intended for large ensembles (#339)
- support sorting faders by channel instrument, coded by Alberstein8 (#356) - support sorting faders by channel instrument, coded by Alberstein8 (#356)

View file

@ -6,6 +6,17 @@ contains(CONFIG, "noupcasename") {
TARGET = jamulus TARGET = jamulus
} }
# support multi-threading with OMP if requested
contains(CONFIG, "multithreading") {
unix {
message(The OpenMP multithreading is enabled.)
message(NOTE THAT THE OpenMP IMPLEMENTATION IS STILL EXPERIMENTAL AND MAY NOT BE STABLE.)
DEFINES += USE_OMP
QMAKE_CXXFLAGS += -fopenmp
QMAKE_LFLAGS += -fopenmp
}
}
CONFIG += qt \ CONFIG += qt \
thread \ thread \
release release

View file

@ -993,6 +993,9 @@ static CTimingMeas JitterMeas ( 1000, "test2.dat" ); JitterMeas.Measure(); // TE
vecChannelLevels ); vecChannelLevels );
} }
#ifdef USE_OMP
# pragma omp parallel for
#endif
for ( int i = 0; i < iNumClients; i++ ) for ( int i = 0; i < iNumClients; i++ )
{ {
int iClientFrameSizeSamples = 0; // initialize to avoid a compiler warning int iClientFrameSizeSamples = 0; // initialize to avoid a compiler warning