Skip to content
Merged
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 .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ assignees: ''
<!-- Don't worry about requesting something that hasn't been discussed - we'll just move it to Discussion if we think it's unclear. But ideally, issues should have an agreed specification such that anyone could action it without much help. -->

**Describe the solution you'd like**
<!-- A clear and concise description of what you want to happen. -->
<!-- A clear and concise description of what you want to happen. -->

**Describe alternatives that have been considered**
<!-- If some alternatives have been discussed, please briefly list those together with a reason(s) why they were decided against. This prevents a repeat of the previous discussions. Reference any relevant discussion threads if possible, and consider tagging the main participants. -->
8 changes: 4 additions & 4 deletions .github/actions_scripts/analyse_git_reference.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ def get_git_hash():
print('Number of arguments:', len(sys.argv), 'arguments.')
print('Argument List:', str(sys.argv))
raise Exception("wrong agruments")

# derive workspace-path
repo_path_on_disk = os.environ['GITHUB_WORKSPACE']
repo_path_on_disk = os.environ['GITHUB_WORKSPACE']

# derive git related variables
version_from_changelog = get_jamulus_version(repo_path_on_disk)
Expand Down Expand Up @@ -74,7 +74,7 @@ def get_git_hash():
print('this reference is a Tag')
release_tag = pushed_name # tag already exists
release_title="Release {} ({})".format(release_version_name, pushed_name)

if pushed_name.startswith("r"):
if re.match(r'^r\d+_\d+_\d+$', pushed_name):
print('this reference is a Release-Tag')
Expand Down Expand Up @@ -110,7 +110,7 @@ def set_github_variable(varname, varval):
set_github_variable("PUBLISH_TO_RELEASE", str(publish_to_release).lower())
set_github_variable("IS_PRERELEASE", str(is_prerelease).lower())
set_github_variable("RELEASE_TITLE", release_title)
set_github_variable("RELEASE_TAG", release_tag)
set_github_variable("RELEASE_TAG", release_tag)
set_github_variable("PUSHED_NAME", pushed_name)
set_github_variable("JAMULUS_VERSION", release_version_name)
set_github_variable("RELEASE_VERSION_NAME", release_version_name)
Expand Down
6 changes: 3 additions & 3 deletions COMPILING.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ sudo make install

### “Headless” server build

Although not strictly necessary, we recommend using the headless flag to avoid having to install some of the dependent packages, save some disk space and/or speed up your build time.
Although not strictly necessary, we recommend using the headless flag to avoid having to install some of the dependent packages, save some disk space and/or speed up your build time.

Note that you don’t need to install the JACK package(s) for a headless build. If you plan to run headless on Gentoo, or are compiling under Ubuntu for use on another Ubuntu machine, the only packages you should need for a headless build are `qtcore`, `qtnetwork`, `qtconcurrent` and `qtxml` (both for building and running the server).

Expand Down Expand Up @@ -148,7 +148,7 @@ Will build the file and make it available in `./Release/Jamulus.app`
4. Open the generated .xcodeproject in Xcode
5. Go to the Signing & Capabilities tab and fix signing errors by setting a team. Xcode will tell you what you need to change.
* If have a free Apple Developer Account, you can use it as a "Personal Team":
* Set it up under Xcode Menu->Preferences->Accounts.
* Set it up under Xcode Menu->Preferences->Accounts.
* Then choose a Bundle Identifier at your choice in the relevant field in the "General" Tab (in section "Identity")
* Now click on the "Signing & Capabilities" tab. In the section "Signing", the "Automatically manage signing" option should be selected.
* You should now see Team: (Your Name) (Personal Team), Bundle identifier: (the same you modified on General Tab), Provisioning Profile: Xcode Management Profile, Signing Certificate: Apple Development (your e-mail used for signing in to Apple) below
Expand All @@ -160,7 +160,7 @@ Will build the file and make it available in `./Release/Jamulus.app`

## Android
* Install Qt, including the Android support from the Qt installer
* Follow Qt's [Getting Started with Qt for Android](https://doc.qt.io/qt-5/android-getting-started.html) instructions
* Follow Qt's [Getting Started with Qt for Android](https://doc.qt.io/qt-5/android-getting-started.html) instructions
* Make sure Jamulus submodules are present, notably oboe:
`git submodule update --init`
* Open Jamulus.pro in Qt Creator
Expand Down
10 changes: 5 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

## We’d really appreciate your support!

- If the [Github issue](https://github.com/jamulussoftware/jamulus/issues) for your feature/bug fix already exists, write a message in that issue saying you want to work on it.
- Otherwise, please [post on the GitHub Discussions](https://github.com/jamulussoftware/jamulus/discussions) and say that you are planning to do some coding and explain why. Then we can discuss the specification.
- If the [Github issue](https://github.com/jamulussoftware/jamulus/issues) for your feature/bug fix already exists, write a message in that issue saying you want to work on it.
- Otherwise, please [post on the GitHub Discussions](https://github.com/jamulussoftware/jamulus/discussions) and say that you are planning to do some coding and explain why. Then we can discuss the specification.
- Please only start coding after we have agreed to a specification to avoid putting lots of work into something which may not get accepted later.

## Jamulus project/source code general principles
Expand All @@ -12,7 +12,7 @@
This has been, and must continue to be, the most important requirement. It is particularly important for use cases such as the Worldjam where instability during a live performance would be unacceptable. The following two principles are designed to support this principle.

### [Keep it Simple and Stupid](https://en.wikipedia.org/wiki/KISS_principle) and [Do One Thing and Do It Well](https://en.wikipedia.org/wiki/Unix_philosophy#Do_One_Thing_and_Do_It_Well)
If a feature or function can be achieved in another way by another system or method, then that is preferable to building that feature into Jamulus.
If a feature or function can be achieved in another way by another system or method, then that is preferable to building that feature into Jamulus.

### Source code consistency
- Respect the existing code style: Tab size=4, insert spaces.
Expand Down Expand Up @@ -53,7 +53,7 @@ The Jamulus project has a [style and tone guide](https://jamulus.io/contribute/S
Features should be usable in the sense that they act as expected to somebody who does not have a technical background.

### Ownership
The submitter of an Issue or a PR is responsible for its care and feeding, answering all questions directed at them, and making agreed amends if needed.
The submitter of an Issue or a PR is responsible for its care and feeding, answering all questions directed at them, and making agreed amends if needed.

So as to reduce effort for others in understanding a PR or an Issue, authors are strongly encouraged to update their initial posts/PR descriptions or title to reflect the current state of play, amends, enhancements, outstanding issues etc. Admins reserve the right to do this as they see fit.

Expand All @@ -67,6 +67,6 @@ The git master branch is protected to require at least two reviews by the main d

---

## Want to get involved in other ways?
## Want to get involved in other ways?

We always need help with documentation, translation and anything else. Have a look at our [overview for contributors](https://jamulus.io/wiki/Contribution).
3 changes: 1 addition & 2 deletions COPYING
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ notice, this list of conditions and the following disclaimer.
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.

- Neither the name of Internet Society, IETF or IETF Trust, nor the
- Neither the name of Internet Society, IETF or IETF Trust, nor the
names of specific contributors, may be used to endorse or promote
products derived from this software without specific prior written
permission.
Expand Down Expand Up @@ -371,4 +371,3 @@ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

14 changes: 7 additions & 7 deletions ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,8 @@

- Bug Fix: Fix ampersand not being shown correctly on mixer (#1886, #1893).
(contributed by @HughePaul, @ann0see)
- Bug Fix: A crash fix related to the way iOS handles sockets in idle mode (#1875).

- Bug Fix: A crash fix related to the way iOS handles sockets in idle mode (#1875).
(contributed by @ngocdh)

- Server: A single click on the server application in the systemtray now opens the Jamulus Server main window (#1722, #1731).
Expand All @@ -175,7 +175,7 @@
- Server: The list of servers registered on a directory can now be saved during directory restart. Use the new
--directoryfile CLI option to use this feature (#1867).
(contributed by @pljones)

- Server: Add link to website if a new version is available (#1980).
(contributed by: @ann0see)

Expand All @@ -193,7 +193,7 @@

- Android: Add close button on Android to enhance UX (#1763, #1876).
(contributed by @ngocdh)

- iOS: Sound support, feature to allow switch between external device and the internal mic (#1875).
(contributed by @ngocdh)

Expand All @@ -217,14 +217,14 @@

- Documentation: Number range command line error messages reworded accurately (#1978).
(contributed by @DavidSavinkoff)

- Website: switch to .po file format to make updating translations easier (various PRs)
(contributed by: @ignotus666)

- Website: Removed edit button from wiki layout file (#576).
(contributed by: @DevRish)

- Internal: Enable signing of macOS binaries (via build script and automatically via CI) (#1856, #1937).
- Internal: Enable signing of macOS binaries (via build script and automatically via CI) (#1856, #1937).
(contributed by @emlynmac)

- Internal: Added Apple Appstore licence waiver (#1874)
Expand All @@ -235,7 +235,7 @@

- Internal: Document release process on contribute page (#1594, #592).
(contributed by: @hoffie, @ann0see)

### 3.8.0 (2021-06-02) ###

- The term "Central server" has been replaced with "Directory server" (#1407, #1715, #1629).
Expand Down
5 changes: 2 additions & 3 deletions Jamulus.pro
Original file line number Diff line number Diff line change
Expand Up @@ -146,9 +146,9 @@ win32 {
QMAKE_APPLICATION_BUNDLE_NAME. = $$TARGET

OSX_ENTITLEMENTS.files = Jamulus.entitlements
OSX_ENTITLEMENTS.path = Contents/Resources
OSX_ENTITLEMENTS.path = Contents/Resources
QMAKE_BUNDLE_DATA += OSX_ENTITLEMENTS

macx-xcode {
QMAKE_INFO_PLIST = mac/Info-xcode.plist
XCODE_ENTITLEMENTS.name = CODE_SIGN_ENTITLEMENTS
Expand Down Expand Up @@ -1168,4 +1168,3 @@ contains(CONFIG, "disable_version_check") {
}

ANDROID_ABIS = armeabi-v7a arm64-v8a x86 x86_64

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Jamulus - Internet Jam Session Software
Jamulus enables musicians to perform in real-time together over the internet.
A Jamulus server collects the incoming audio data from each Jamulus client, mixes that data and then sends that mix back to each client. Jamulus can support large numbers of clients with minimal latency and modest bandwidth requirements.

Jamulus is [__free and open source software__](https://www.gnu.org/philosophy/free-sw.en.html) (FOSS) licensed under the [GPL](http://www.gnu.org/licenses/gpl-2.0.html)
Jamulus is [__free and open source software__](https://www.gnu.org/philosophy/free-sw.en.html) (FOSS) licensed under the [GPL](http://www.gnu.org/licenses/gpl-2.0.html)
and runs under __Windows__ ([ASIO](https://www.steinberg.net) or [JACK](https://jackaudio.org)),
__MacOS__ ([Core Audio](https://developer.apple.com/documentation/coreaudio)) and
__Linux__ ([JACK](https://jackaudio.org)).
Expand Down
1 change: 0 additions & 1 deletion autobuild/android/install-qt.sh
Original file line number Diff line number Diff line change
Expand Up @@ -352,4 +352,3 @@ for COMPONENT in ${COMPONENTS}; do
fi

done

1 change: 0 additions & 1 deletion autobuild/ensure_THIS_JAMULUS_PROJECT_PATH.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,3 @@ else
echo "ERROR: THIS_JAMULUS_PROJECT_PATH must reference an existing directory: \"${THIS_JAMULUS_PROJECT_PATH}\""
exit 1
fi

Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ Function github_output_value
[Parameter(Mandatory=$true)]
[string] $value
)

echo "github_output_value() $name = $value"
echo "::set-output name=$name::$value"
}
Expand Down
1 change: 0 additions & 1 deletion docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@ Mostly documentation can be found on the Jamulus Website: https://jamulus.io
## Project related documentation
1. Release process: https://jamulus.io/contribute/Release-Process
2. Style and tone guide: https://jamulus.io/contribute/Style-and-Tone

2 changes: 1 addition & 1 deletion docs/TRANSLATING.md
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ Select the current repository as `jamulus`, and the branch that was created abov

The changed file(s) should be listed in the left-hand column as `src/res/translation/translation_xx_YY.ts`. When the file is selected, the differences will be displayed in the main panel.

Add a simple commit message in the first box below the file list, (e.g. change "Update filename"
Add a simple commit message in the first box below the file list, (e.g. change "Update filename"
to something like "Update German translations for v3.7.0"), and add any extra description in the Description box (optional, probably not required).

Commit the changes to the local git repo by clicking on **Commit to <branch>**.
Expand Down
4 changes: 2 additions & 2 deletions mac/activity.mm
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@
void CActivity::BeginActivity()
{
NSActivityOptions options = NSActivityBackground | NSActivityIdleDisplaySleepDisabled | NSActivityIdleSystemSleepDisabled | NSActivityLatencyCritical;

pActivity->activityId = [[NSProcessInfo processInfo] beginActivityWithOptions: options reason:@"Jamulus provides low latency audio processing and should not be inturrupted by system throttling."];
}

void CActivity::EndActivity()
{
[[NSProcessInfo processInfo] endActivity: pActivity->activityId];

pActivity->activityId = nil;
}
12 changes: 6 additions & 6 deletions mac/deploy_mac.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,21 @@ cert_name=""

while getopts 'hs:' flag; do
case "${flag}" in
s)
cert_name=$OPTARG
s)
cert_name=$OPTARG
if [[ -z "$cert_name" ]]; then
echo "Please add the name of the certificate to use: -s \"<name>\""
fi
# shift 2
;;
h)
echo "Usage: -s <cert name> for signing mac build"
exit 0
h)
echo "Usage: -s <cert name> for signing mac build"
exit 0
;;
*)
exit 1
;;

esac
done

Expand Down
Loading