Merge branch 'master' into feature/pljones-audio-stream-saving

This commit is contained in:
Peter L Jones 2019-04-03 18:14:49 +01:00 committed by GitHub
commit 005a506b0d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
57 changed files with 66 additions and 54 deletions

7
.gitignore vendored
View file

@ -15,3 +15,10 @@ ui_*.h
moc_predefs.h moc_predefs.h
src/res/qrc_resources.cpp src/res/qrc_resources.cpp
windows/ASIOSDK2 windows/ASIOSDK2
debug/
jamulus.vcxproj
jamulus.vcxproj.filters
release/
deploy/
Jamulus.app/
.DS_Store

View file

@ -1,5 +1,5 @@
/******************************************************************************\ /******************************************************************************\
* Copyright (c) 2004-2018 * Copyright (c) 2004-2019
* *
* Author(s): * Author(s):
* Volker Fischer * Volker Fischer

2
README
View file

@ -1,5 +1,5 @@
/******************************************************************************\ /******************************************************************************\
* Copyright (c) 2004-2018 * Copyright (c) 2004-2019
* *
* Author(s): * Author(s):
* Volker Fischer * Volker Fischer

View file

@ -1,5 +1,5 @@
/******************************************************************************\ /******************************************************************************\
* Copyright (c) 2004-2018 * Copyright (c) 2004-2019
* *
* Author(s): * Author(s):
* Volker Fischer * Volker Fischer

View file

@ -1,5 +1,5 @@
/******************************************************************************\ /******************************************************************************\
* Copyright (c) 2004-2018 * Copyright (c) 2004-2019
* *
* Author(s): * Author(s):
* Volker Fischer * Volker Fischer

View file

@ -6,5 +6,6 @@ qmake Jamulus.pro
make -j2 make -j2
make dist make dist
mkdir -p deploy
mv *.tar.gz deploy/Jamulus-version.tar.gz mv *.tar.gz deploy/Jamulus-version.tar.gz
cd linux cd linux

View file

@ -1,5 +1,5 @@
/******************************************************************************\ /******************************************************************************\
* Copyright (c) 2004-2018 * Copyright (c) 2004-2019
* *
* Author(s): * Author(s):
* Volker Fischer * Volker Fischer

View file

@ -1,5 +1,5 @@
/******************************************************************************\ /******************************************************************************\
* Copyright (c) 2004-2018 * Copyright (c) 2004-2019
* *
* Author(s): * Author(s):
* Volker Fischer * Volker Fischer

View file

@ -6,6 +6,9 @@ cd ..
# cvs -n update 2>null | grep -i "M " # error if any file is locally modified!!! -> TODO # cvs -n update 2>null | grep -i "M " # error if any file is locally modified!!! -> TODO
# call qmake
qmake Jamulus.pro
# first clean up # first clean up
rm -rf Jamulus.app rm -rf Jamulus.app
make clean make clean
@ -20,6 +23,7 @@ macdeployqt Jamulus.app -dmg
zip Jamulus-version-mac.zip Jamulus.dmg COPYING zip Jamulus-version-mac.zip Jamulus.dmg COPYING
# move new file in deploy directory # move new file in deploy directory
mkdir -p deploy
mv Jamulus-version-mac.zip deploy/Jamulus-version-mac.zip mv Jamulus-version-mac.zip deploy/Jamulus-version-mac.zip
# cleanup and go back to original directory # cleanup and go back to original directory

View file

@ -1,5 +1,5 @@
/******************************************************************************\ /******************************************************************************\
* Copyright (c) 2004-2018 * Copyright (c) 2004-2019
* *
* Author(s): * Author(s):
* Volker Fischer * Volker Fischer

View file

@ -1,5 +1,5 @@
/******************************************************************************\ /******************************************************************************\
* Copyright (c) 2004-2018 * Copyright (c) 2004-2019
* *
* Author(s): * Author(s):
* Volker Fischer * Volker Fischer

View file

@ -135,7 +135,7 @@
<item> <item>
<widget class="QLabel" name="lblCopyright"> <widget class="QLabel" name="lblCopyright">
<property name="text"> <property name="text">
<string>Copyright (C) 2005-2018</string> <string>Copyright (C) 2005-2019</string>
</property> </property>
<property name="wordWrap"> <property name="wordWrap">
<bool>false</bool> <bool>false</bool>

View file

@ -1,5 +1,5 @@
/******************************************************************************\ /******************************************************************************\
* Copyright (c) 2004-2018 * Copyright (c) 2004-2019
* *
* Author(s): * Author(s):
* Volker Fischer * Volker Fischer

View file

@ -1,5 +1,5 @@
/******************************************************************************\ /******************************************************************************\
* Copyright (c) 2004-2018 * Copyright (c) 2004-2019
* *
* Author(s): * Author(s):
* Volker Fischer * Volker Fischer

View file

@ -1,5 +1,5 @@
/******************************************************************************\ /******************************************************************************\
* Copyright (c) 2004-2018 * Copyright (c) 2004-2019
* *
* Author(s): * Author(s):
* Volker Fischer * Volker Fischer

View file

@ -1,5 +1,5 @@
/******************************************************************************\ /******************************************************************************\
* Copyright (c) 2004-2018 * Copyright (c) 2004-2019
* *
* Author(s): * Author(s):
* Volker Fischer * Volker Fischer

View file

@ -1,5 +1,5 @@
/******************************************************************************\ /******************************************************************************\
* Copyright (c) 2004-2018 * Copyright (c) 2004-2019
* *
* Author(s): * Author(s):
* Volker Fischer * Volker Fischer

View file

@ -1,5 +1,5 @@
/******************************************************************************\ /******************************************************************************\
* Copyright (c) 2004-2018 * Copyright (c) 2004-2019
* *
* Author(s): * Author(s):
* Volker Fischer * Volker Fischer

View file

@ -1,5 +1,5 @@
/******************************************************************************\ /******************************************************************************\
* Copyright (c) 2004-2018 * Copyright (c) 2004-2019
* *
* Author(s): * Author(s):
* Volker Fischer * Volker Fischer

View file

@ -1,5 +1,5 @@
/******************************************************************************\ /******************************************************************************\
* Copyright (c) 2004-2018 * Copyright (c) 2004-2019
* *
* Author(s): * Author(s):
* Volker Fischer * Volker Fischer

View file

@ -1,5 +1,5 @@
/******************************************************************************\ /******************************************************************************\
* Copyright (c) 2004-2018 * Copyright (c) 2004-2019
* *
* Author(s): * Author(s):
* Volker Fischer * Volker Fischer

View file

@ -1,5 +1,5 @@
/******************************************************************************\ /******************************************************************************\
* Copyright (c) 2004-2018 * Copyright (c) 2004-2019
* *
* Author(s): * Author(s):
* Volker Fischer * Volker Fischer

View file

@ -1,5 +1,5 @@
/******************************************************************************\ /******************************************************************************\
* Copyright (c) 2004-2018 * Copyright (c) 2004-2019
* *
* Author(s): * Author(s):
* Volker Fischer * Volker Fischer

View file

@ -1,5 +1,5 @@
/******************************************************************************\ /******************************************************************************\
* Copyright (c) 2004-2018 * Copyright (c) 2004-2019
* *
* Author(s): * Author(s):
* Volker Fischer * Volker Fischer

View file

@ -1,5 +1,5 @@
/******************************************************************************\ /******************************************************************************\
* Copyright (c) 2004-2018 * Copyright (c) 2004-2019
* *
* Author(s): * Author(s):
* Volker Fischer * Volker Fischer

View file

@ -1,5 +1,5 @@
/******************************************************************************\ /******************************************************************************\
* Copyright (c) 2004-2018 * Copyright (c) 2004-2019
* *
* Author(s): * Author(s):
* Volker Fischer * Volker Fischer

View file

@ -1,5 +1,5 @@
/******************************************************************************\ /******************************************************************************\
* Copyright (c) 2004-2018 * Copyright (c) 2004-2019
* *
* Author(s): * Author(s):
* Volker Fischer * Volker Fischer

View file

@ -1,5 +1,5 @@
/******************************************************************************\ /******************************************************************************\
* Copyright (c) 2004-2018 * Copyright (c) 2004-2019
* *
* Author(s): * Author(s):
* Volker Fischer * Volker Fischer

View file

@ -1,5 +1,5 @@
/******************************************************************************\ /******************************************************************************\
* Copyright (c) 2004-2018 * Copyright (c) 2004-2019
* *
* Author(s): * Author(s):
* Volker Fischer * Volker Fischer

View file

@ -1,5 +1,5 @@
/******************************************************************************\ /******************************************************************************\
* Copyright (c) 2004-2018 * Copyright (c) 2004-2019
* *
* Author(s): * Author(s):
* Volker Fischer * Volker Fischer

View file

@ -1,5 +1,5 @@
/******************************************************************************\ /******************************************************************************\
* \Copyright (c) 2004-2018 * \Copyright (c) 2004-2019
* \author Volker Fischer * \author Volker Fischer
* *

View file

@ -1,5 +1,5 @@
/******************************************************************************\ /******************************************************************************\
* Copyright (c) 2004-2018 * Copyright (c) 2004-2019
* *
* Author(s): * Author(s):
* Volker Fischer * Volker Fischer

View file

@ -1,5 +1,5 @@
/******************************************************************************\ /******************************************************************************\
* Copyright (c) 2004-2018 * Copyright (c) 2004-2019
* *
* Author(s): * Author(s):
* Volker Fischer * Volker Fischer

View file

@ -1,5 +1,5 @@
/******************************************************************************\ /******************************************************************************\
* Copyright (c) 2004-2018 * Copyright (c) 2004-2019
* *
* Author(s): * Author(s):
* Volker Fischer * Volker Fischer

View file

@ -1,5 +1,5 @@
/******************************************************************************\ /******************************************************************************\
* Copyright (c) 2004-2018 * Copyright (c) 2004-2019
* *
* Author(s): * Author(s):
* Volker Fischer * Volker Fischer

View file

@ -1,5 +1,5 @@
/******************************************************************************\ /******************************************************************************\
* Copyright (c) 2004-2018 * Copyright (c) 2004-2019
* *
* Author(s): * Author(s):
* Volker Fischer * Volker Fischer

View file

@ -1,5 +1,5 @@
/******************************************************************************\ /******************************************************************************\
* Copyright (c) 2004-2018 * Copyright (c) 2004-2019
* *
* Author(s): * Author(s):
* Volker Fischer * Volker Fischer

View file

@ -1,5 +1,5 @@
/******************************************************************************\ /******************************************************************************\
* Copyright (c) 2004-2018 * Copyright (c) 2004-2019
* *
* Author(s): * Author(s):
* Volker Fischer * Volker Fischer

View file

@ -1,5 +1,5 @@
/******************************************************************************\ /******************************************************************************\
* Copyright (c) 2004-2018 * Copyright (c) 2004-2019
* *
* Author(s): * Author(s):
* Volker Fischer * Volker Fischer

View file

@ -1,5 +1,5 @@
/******************************************************************************\ /******************************************************************************\
* Copyright (c) 2004-2018 * Copyright (c) 2004-2019
* *
* Author(s): * Author(s):
* Volker Fischer * Volker Fischer

View file

@ -1,5 +1,5 @@
/******************************************************************************\ /******************************************************************************\
* Copyright (c) 2004-2018 * Copyright (c) 2004-2019
* *
* Author(s): * Author(s):
* Volker Fischer * Volker Fischer

View file

@ -1,5 +1,5 @@
/******************************************************************************\ /******************************************************************************\
* Copyright (c) 2004-2018 * Copyright (c) 2004-2019
* *
* Author(s): * Author(s):
* Volker Fischer * Volker Fischer

View file

@ -1,5 +1,5 @@
/******************************************************************************\ /******************************************************************************\
* Copyright (c) 2004-2018 * Copyright (c) 2004-2019
* *
* Author(s): * Author(s):
* Volker Fischer * Volker Fischer

View file

@ -1,5 +1,5 @@
/******************************************************************************\ /******************************************************************************\
* Copyright (c) 2004-2018 * Copyright (c) 2004-2019
* *
* Author(s): * Author(s):
* Volker Fischer * Volker Fischer

View file

@ -1,5 +1,5 @@
/******************************************************************************\ /******************************************************************************\
* Copyright (c) 2004-2018 * Copyright (c) 2004-2019
* *
* Author(s): * Author(s):
* Volker Fischer * Volker Fischer

View file

@ -1,5 +1,5 @@
/******************************************************************************\ /******************************************************************************\
* Copyright (c) 2004-2018 * Copyright (c) 2004-2019
* *
* Author(s): * Author(s):
* Volker Fischer * Volker Fischer

View file

@ -1,5 +1,5 @@
/******************************************************************************\ /******************************************************************************\
* Copyright (c) 2004-2018 * Copyright (c) 2004-2019
* *
* Author(s): * Author(s):
* Volker Fischer * Volker Fischer

View file

@ -1,5 +1,5 @@
/******************************************************************************\ /******************************************************************************\
* Copyright (c) 2004-2018 * Copyright (c) 2004-2019
* *
* Author(s): * Author(s):
* Volker Fischer * Volker Fischer

View file

@ -1,5 +1,5 @@
/******************************************************************************\ /******************************************************************************\
* Copyright (c) 2004-2018 * Copyright (c) 2004-2019
* *
* Author(s): * Author(s):
* Volker Fischer * Volker Fischer

View file

@ -1,5 +1,5 @@
/******************************************************************************\ /******************************************************************************\
* Copyright (c) 2004-2018 * Copyright (c) 2004-2019
* *
* Author(s): * Author(s):
* Volker Fischer * Volker Fischer

View file

@ -1,5 +1,5 @@
/******************************************************************************\ /******************************************************************************\
* Copyright (c) 2004-2018 * Copyright (c) 2004-2019
* *
* Author(s): * Author(s):
* Volker Fischer * Volker Fischer

View file

@ -1,5 +1,5 @@
/******************************************************************************\ /******************************************************************************\
* Copyright (c) 2004-2018 * Copyright (c) 2004-2019
* *
* Author(s): * Author(s):
* Volker Fischer * Volker Fischer

View file

@ -1,5 +1,5 @@
/******************************************************************************\ /******************************************************************************\
* Copyright (c) 2004-2018 * Copyright (c) 2004-2019
* *
* Author(s): * Author(s):
* Volker Fischer * Volker Fischer

View file

@ -1,5 +1,5 @@
/******************************************************************************\ /******************************************************************************\
* Copyright (c) 2004-2018 * Copyright (c) 2004-2019
* *
* Author(s): * Author(s):
* Volker Fischer * Volker Fischer

View file

@ -1,5 +1,5 @@
/******************************************************************************\ /******************************************************************************\
* Copyright (c) 2004-2018 * Copyright (c) 2004-2019
* *
* Author(s): * Author(s):
* Volker Fischer * Volker Fischer

View file

@ -1,5 +1,5 @@
/******************************************************************************\ /******************************************************************************\
* Copyright (c) 2004-2018 * Copyright (c) 2004-2019
* *
* Author(s): * Author(s):
* Volker Fischer * Volker Fischer

View file

@ -1,5 +1,5 @@
/******************************************************************************\ /******************************************************************************\
* Copyright (c) 2004-2018 * Copyright (c) 2004-2019
* *
* Author(s): * Author(s):
* Volker Fischer * Volker Fischer