From 9ebbe983742a3ba1ba269615118aa55b972b289b Mon Sep 17 00:00:00 2001 From: ignotus Date: Wed, 10 Feb 2021 09:53:59 +0100 Subject: [PATCH 01/43] Update en-Central-Servers.md --- wiki/en/en-Central-Servers.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/en/en-Central-Servers.md b/wiki/en/en-Central-Servers.md index 55756bd32..9902f996b 100644 --- a/wiki/en/en-Central-Servers.md +++ b/wiki/en/en-Central-Servers.md @@ -9,7 +9,7 @@ permalink: "/wiki/Central-Servers" Because there is a limit of 150 servers per central server, you need to select which central server you want to advertise your server on. Select a genre if you intend to limit players to that style (players can then see your server in their genre list). -When you start a public server, you will see a message saying whether your server has been successfully listed or not. If not, and you leave your server running, it will re-try its attempts to register until a free slot becomes available. +When you start a public server, you will see a message saying whether your server has been successfully listed or not. If not, and you leave your server running, it will reattempt to register until a free slot becomes available. ## Headless servers From f8eaaf02f9d29aa797c52ab41daf6248fb82770b Mon Sep 17 00:00:00 2001 From: ignotus Date: Wed, 10 Feb 2021 10:07:32 +0100 Subject: [PATCH 02/43] Update en-Client-Troubleshooting.md --- wiki/en/en-Client-Troubleshooting.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wiki/en/en-Client-Troubleshooting.md b/wiki/en/en-Client-Troubleshooting.md index 2ea5c8a17..c81c1a0cf 100644 --- a/wiki/en/en-Client-Troubleshooting.md +++ b/wiki/en/en-Client-Troubleshooting.md @@ -18,7 +18,7 @@ Start with the simple stuff: make sure your instrument/microphone and headphones You can test whether you are hearing your signal correctly by doing the following: -1. Get your audio into your computer. +1. Connect your audio source (mic, instrument...) to your computer. 1. Use an audio recording application (such as [Audacity](https://www.audacityteam.org/)) on your computer to record that input and check it's OK. 1. Make sure that if you mute your audio input inside the recording application, you can't hear yourself. 1. Close the recording application and run Jamulus. You should still not hear yourself. @@ -50,7 +50,7 @@ You can set your "New Client Level" to a low value (e.g. 10), or set the musicia ### Can't see the server you want to join? -First check that you have the right genre server selected in your Connect Setup window. But sometimes network issues mean your client won't list all the available servers. If you know the name of the server you want to join, you can [look up its IP address here](https://explorer.jamulus.io/). Enter the IP address in the "Server Name/Address" field in the Connect Setup window to connect to it. +First check that you have the right genre server selected in your Connection Setup window. Sometimes network issues mean your client won't list all the available servers. If you know the name of the server you want to join, you can [look up its IP address here](https://explorer.jamulus.io/). Enter the IP address in the "Server Name/Address" field in the Connect Setup window to connect to it. ### Not seeing a list of servers at all? From d3b621b93a98169643dd508b7338a252079727b0 Mon Sep 17 00:00:00 2001 From: ignotus Date: Wed, 10 Feb 2021 10:14:51 +0100 Subject: [PATCH 03/43] Update en-Compiling.md --- wiki/en/en-Compiling.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wiki/en/en-Compiling.md b/wiki/en/en-Compiling.md index 56e2b6615..5b01e2025 100644 --- a/wiki/en/en-Compiling.md +++ b/wiki/en/en-Compiling.md @@ -16,7 +16,7 @@ You don't need to compile Jamulus for macOS since we provide official binaries, ### Requirements 1. Install XCode -1. Install Qt as follow +1. Install Qt as follows ```shell brew install qt5 @@ -66,13 +66,13 @@ You don't need to compile Jamulus for Windows since we provide official binaries * A compiler like [Visual Studio](https://visualstudio.microsoft.com) (You only need [Build Tools 2017 or 2019](https://visualstudio.microsoft.com/thank-you-downloading-visual-studio/?sku=BuildTools&rel=16) but can also choose to download and install the full IDE from the [Visual Studio download page](https://visualstudio.microsoft.com/downloads/)) * [Qt](https://www.qt.io/download) * Use the free GPLv2 license for Open Source development - * To determine the Qt version you need, check [qt-installer-windows.qs](https://github.com/corrados/jamulus/blob/master/windows/qt-installer-windows.qs): under INSTALL_COMPONENTS you will see `qt.qt5.[version]`, e.g., 5123 means version 5.12.3. + * To determine the Qt version you need, check [qt-installer-windows.qs](https://github.com/jamulussoftware/jamulus/blob/master/windows/qt-installer-windows.qs): under INSTALL_COMPONENTS you will see `qt.qt5.[version]`, e.g., 5123 means version 5.12.3. * Select Components during installation: Expand the Qt section, find the matching version, e.g., **Qt 5.12.3**, and add the compiler components for your compiler, e.g., `MSVC 2017 32-bit/64-bit` for Visual Studio 2019 * [ASIO development files](https://www.steinberg.net/en/company/developer.html) ### Download Jamulus source code -Get the Jamulus source code e.g. via git or [zip download](https://github.com/corrados/jamulus/archive/master.zip) from the [Jamulus repo](https://github.com/corrados/jamulus). Make sure that there are **no** spaces in the directory you move the `jamulus` directory to since it might break the Jamulus installer (if you know how to fix this issue, please comment on [issue #864](https://github.com/corrados/jamulus/issues/864) on the Jamulus repo to tell us how). +Get the Jamulus source code e.g. via git or [zip download](https://github.com/jamulussoftware/jamulus/archive/master.zip) from the [Jamulus repo](https://github.com/jamulussoftware/jamulus). Make sure that there are **no** spaces in the directory you move the `jamulus` directory to since it might break the Jamulus installer (if you know how to fix this issue, please comment on [issue #864](https://github.com/jamulussoftware/jamulus/issues/864) on the Jamulus repo to tell us how). ### Compiling and building installer From 12a1445ecda8bfd530c47c0b5be5e2df0551bee9 Mon Sep 17 00:00:00 2001 From: ignotus Date: Wed, 10 Feb 2021 10:19:44 +0100 Subject: [PATCH 04/43] Update en-Contribution.md --- wiki/en/en-Contribution.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wiki/en/en-Contribution.md b/wiki/en/en-Contribution.md index 107c6dfe5..e623586cc 100644 --- a/wiki/en/en-Contribution.md +++ b/wiki/en/en-Contribution.md @@ -9,19 +9,19 @@ permalink: "/wiki/Contribution" ## Jamulus Software -If you want to contribute code or have a feature request, [open an issue on GitHub](https://github.com/corrados/jamulus/issues/) (preferred) or [post your idea on the developer forum](https://sourceforge.net/p/llcon/discussion/developerforum/) if you don't have a GitHub account. This allows us to discuss the changes before e.g. making a pull request (be sure to read main dev's [Volker's manifesto for contributions on GitHub](https://github.com/corrados/jamulus/issues/596) and the [CONTRIBUTING file](https://github.com/corrados/jamulus/blob/master/CONTRIBUTING.md)) +If you want to contribute code or have a feature request, [open an issue on GitHub](https://github.com/corrados/jamulus/issues/) (preferred) or [post your idea on the developer forum](https://sourceforge.net/p/llcon/discussion/developerforum/) if you don't have a GitHub account. This allows us to discuss the changes before e.g. making a pull request (be sure to read main dev's [Volker's manifesto for contributions on GitHub](https://github.com/jamulussoftware/jamulus/issues/596) and the [CONTRIBUTING file](https://github.com/jamulussoftware/jamulus/blob/master/CONTRIBUTING.md)) -See the [Jamulus GitHub repo](https://github.com/corrados/jamulus) for further information. +See the [Jamulus GitHub repo](https://github.com/jamulussoftware/jamulus) for further information. ## Jamulus Website -* If you find a mistake, typo or something out of date (in any language) on the website, you can [open an issue on GitHub](https://github.com/jamulussoftware/jamuluswebsite/issues) or, if you don't have a GitHub account on [the relevant discussion forum](https://sourceforge.net/p/llcon/discussion/) on SourceForge. +* If you find a mistake, typo or something out of date (in any language) on the website, you can [open an issue on GitHub](https://github.com/jamulussoftware/jamuluswebsite/issues) or if you don't have a GitHub account, on [the relevant discussion forum](https://sourceforge.net/p/llcon/discussion/) on SourceForge. * If you think some documentation or information is missing or can be improved, post about that on [the relevant discussion forum](https://sourceforge.net/p/llcon/discussion/) so that it can be discussed first. Have a look at the [CONTRIBUTING file](https://github.com/jamulussoftware/jamuluswebsite/blob/changes/CONTRIBUTING.md) for the website and the [Website GitHub repo](https://github.com/jamulussoftware/jamuluswebsite) for further information. -### I don't know GitHub. What do I need to know? +### I'm not familiar with GitHub. What do I need to know? **The following content is for the documentation on jamulus.io only, not for the Jamulus software!** From bf07489d5b0f518caebdb3a3db5b471a7a5418b1 Mon Sep 17 00:00:00 2001 From: ignotus Date: Wed, 10 Feb 2021 10:28:37 +0100 Subject: [PATCH 05/43] Update en-Getting-Started.md --- wiki/en/en-Getting-Started.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/wiki/en/en-Getting-Started.md b/wiki/en/en-Getting-Started.md index f1f6ff9b5..dca01c905 100644 --- a/wiki/en/en-Getting-Started.md +++ b/wiki/en/en-Getting-Started.md @@ -11,21 +11,21 @@ permalink: "/wiki/Getting-Started" 1. **A computer** running either **Windows 10**, **macOS** (**MacOS X** El Capitan v10.11 or higher), or **Linux**. 1. **A wired internet connection** (don't use Wi-Fi, it will cause sound problems). Most broadband connections will be fine[^1]. -1. **Wired headphones - not speakers** to prevent echo or feedback and to minimize delay[^2]. +1. **Wired headphones - not speakers** to prevent echo or feedback and to minimise delay[^2]. ## Maximise quality, minimise delay -### 1. Minimize internet traffic and close all programs on your PC +### 1. Minimise internet traffic and close all programs on your PC Try to make sure nothing on your machine or your network (like a video stream) is competing against Jamulus when you are using it. ### 2. Use an audio interface/external microphone, not your internal sound card -We strongly recommend – although you could start without it – to use an audio interface (a box you plug a microphone/instrument into and connect to your PC e.g. via USB) to enjoy higher quality sound with low latency in Jamulus. You can also use a USB microphone. See [recommended hardware](#recommended-hardware). +We strongly recommend – although you could start without it – using an audio interface (a box you plug a microphone/instrument into and connect to your PC e.g. via USB) to enjoy higher quality sound with low latency in Jamulus. You can also use a USB microphone. See [recommended hardware](#recommended-hardware). ### 3. Connect to the servers with the lowest ping times -Servers shown on the list with 15ms or below will give you the best chance of having a good time (although there's other things that affect performance too). Anything higher and you're taking your chances. +Servers shown on the list with 15 ms or below will give you the best chance of having a good time (although there are other things that affect performance too). Anything higher and you're taking your chances. Now that you have the basics down, let's go: @@ -61,8 +61,8 @@ Further information about how to avoid listening to yourself (and help with othe **Here's how millions of people are using Jamulus to play, sing and teach music with other people in real time, all over the world:** ![Overview](https://user-images.githubusercontent.com/4561747/79309764-bd387280-7ef2-11ea-9d81-1e81302525e6.png) -_Jamulus works on the client server principle. Everybody’s audio is sent to a server, mixed and processed there. Afterwards, the audio is sent to each client. If a server is made public and registered on a central server, its information will be broadcast to all clients._ +_Jamulus works on the client-server principle. Everybody’s audio is sent to a server, mixed and processed there. Afterwards, the audio is sent back to each client. If a server is made public and registered on a central server, its information will be broadcast to all clients._ ## Footnotes [^1]: [Full details here](Network-Requirements){: target="_blank" rel="noopener noreferrer"}. If you have 10 Mbit/s down and 1 Mbit/s up, you're unlikely to run into bandwidth-related issues. -[^2]: Bluetooth headphones usually have too much latency. That's one reason why wired headphones are required. Particularity if singing or playing acoustic instruments to make sure you keep in time with others only use headphones (see the [note on this](Getting-Started#having-trouble-cant-keep-in-time) for further information). +[^2]: Bluetooth headphones usually have too much latency. That's one reason why wired headphones are required. Particularly if singing or playing acoustic instruments, to make sure you keep in time with others, only use headphones (see the [note on this](Getting-Started#having-trouble-cant-keep-in-time) for further information). From e4ecb8396eacdc165ca3cdb75b2bd3514ab22dc8 Mon Sep 17 00:00:00 2001 From: ignotus Date: Wed, 10 Feb 2021 10:35:31 +0100 Subject: [PATCH 06/43] Update en-Hardware-Setup.md --- wiki/en/en-Hardware-Setup.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/wiki/en/en-Hardware-Setup.md b/wiki/en/en-Hardware-Setup.md index b3484d188..3f73a72a0 100644 --- a/wiki/en/en-Hardware-Setup.md +++ b/wiki/en/en-Hardware-Setup.md @@ -15,7 +15,7 @@ permalink: "/wiki/Hardware-Setup" ## Example Setups -Setting up hardware usually burns down to 4 points, although each setup is different. +Setting up hardware usually boils down to 4 points, although each setup is different. 1. Plug the interface into a USB port on your computer 2. Close all programs and start Jamulus (don't forget to choose the right inputs in Jamulus's settings) @@ -25,14 +25,14 @@ Setting up hardware usually burns down to 4 points, although each setup is diffe ## Windows: Audio interface connection - ASIO4ALL -This is an example Windows client installation with audio device [Behringer U-CONTROL UCA202](https://www.amazon.com/Behringer-U-Phono-UFO202-Audiophile-Interface/dp/B002GHBYZ0). +This is an example Windows client installation with the [Behringer U-CONTROL UCA202](https://www.amazon.com/Behringer-U-Phono-UFO202-Audiophile-Interface/dp/B002GHBYZ0) audio device. The following instructions might be similar with other audio devices. _**The exact method of connecting your instrument will of course vary depending on your hardware.**_ #### 1. Plug the interface into a USB port on your computer -In the future, always use the same USB port for the audio device. +In future, always use the same USB port for the audio device. **Windows users**: If not already done: download and install the [free ASIO sound driver (ASIO4ALL)](https://www.asio4all.org){: target="_blank" rel="noopener noreferrer"}. Some people have also reported success using [this ASIO native driver](http://www.behringerdownload.de/_software/BEHRINGER_2902_X64_2.8.40.zip){: target="_blank" rel="noopener noreferrer"} __currently not available__, although it's not listed on Behringer's product pages as of April 2020. @@ -45,7 +45,7 @@ Make sure you have switched off the monitor button on your Behringer U-CONTROL U #### 3. Plug in your instrument and headphones -Connect your instrument to the input plugs of the Behringer U-CONTROL UCA202. Plug in your headphones into the Behringer U-CONTROL UCA202. +Connect your instrument to the input socket of the Behringer U-CONTROL UCA202. Plug your headphones into the Behringer U-CONTROL UCA202. #### 4. Connect to a Jamulus server. @@ -56,16 +56,16 @@ You're done! Have fun! Refer to the Linux [client install guide](Installation-for-Linux#configure-jack-with-qjackctl). ## Linux: Low Latency Kernels for Jamulus -You might want to install [Ubuntu Studio](https://ubuntustudio.org/) it adds a second options in your boot menu for a low-latency kernel. The key of successful jamming is "low latency" between servers and connected Jamulus clients. If the underlying Linux system is started with a low-latency then it has a positive impact on latency for your Jamulus Sessions. +You might want to install [Ubuntu Studio](https://ubuntustudio.org/). It adds a second option in your boot menu for a low-latency kernel. The key to successful jamming is "low latency" between servers and connected Jamulus clients. If the underlying Linux system is started with a low-latency kernel then it has a positive impact on latency for your Jamulus sessions. ## Points to note about inputs -- If you want to connect 2 or more sources (eg voice + synth + guitar), it is important to note that Jamulus currently handles only input 2 channels (L/R). So the hardware being used must provide a mixed-down stereo output to Jamulus. +- If you want to connect 2 or more sources (e.g. voice + synth + guitar), it is important to note that Jamulus currently handles only 2 input channels (L/R). So the hardware being used must provide a mixed-down stereo output to Jamulus. - Audio interfaces generally output a mixed signal on their analogue output, but separate signals (1 per source) on their digital output (USB/FireWire/Thunderbolt). - Mixers generally only output mixed-down signals on their analogue output. -- Mixers with USB/FireWire/Thunderbolt generally output mixed-down signal on their **analogue** output AND separate signals only (no mixed-down signal) on their **digital** output. -- A few Mixers with USB/FireWire/Thunderbolt will either send **only** a mixed down signal to the **digital** output (small/budget mixers), or else also ADD a stereo mix-down signal to the separate signals on the digital output. +- Mixers with USB/FireWire/Thunderbolt generally output a mixed-down signal on their **analogue** output AND separate signals only (no mixed-down signal) on their **digital** output. +- A few Mixers with USB/FireWire/Thunderbolt will either send **only** a mixed-down signal to the **digital** output (small/budget mixers), or else also ADD a stereo mixed-down signal to the separate signals on the digital output. _(Thanks to [pcar75](https://github.com/pcar75) for this information)_ @@ -73,7 +73,7 @@ _(Thanks to [pcar75](https://github.com/pcar75) for this information)_ **This video documents a [live jam session](https://youtu.be/c8838jS2g3U).** I am using a Lexicon Omega USB audio card on a 2009 Mac Mini. My bandmates all use Windows 10 and have Behringer audio cards, e.g. the Behringer Xenyx 1204USB. My internet connection is 10 Mbit/s down / 1 Mbit/s upstream via DSL. -**Jamulus user [Andrew Evans](https://sourceforge.net/u/belvario/profile/)**: With bandmates all within one city (but spanning 2 ISPs) and achieving consistent 20ms ping time, running the server on a separate dedicated Windows machine and a client on a MacBook Pro. Remote players on MacBook Air. Everyone on wired Ethernet connections to their home router/gateways. We used WhatsApp video to see each other (with audio muted - it's funny to see how far behind the WhatsApp audio lags from Jamulus though!) +**Jamulus user [Andrew Evans](https://sourceforge.net/u/belvario/profile/)**: With bandmates all within one city (but spanning 2 ISPs) and achieving a consistent 20 ms ping time, running the server on a separate dedicated Windows machine and a client on a MacBook Pro. Remote players on MacBook Air. Everyone on wired Ethernet connections to their home router/gateways. We used WhatsApp video to see each other (with audio muted - it's funny to see how far behind the WhatsApp audio lags from Jamulus though!) ## Having problems? From 5aea37a92498d62e3711195117ac9e3a1c0e0cf9 Mon Sep 17 00:00:00 2001 From: ignotus Date: Wed, 10 Feb 2021 10:44:47 +0100 Subject: [PATCH 07/43] Update en-Installation-for-Linux.md --- wiki/en/en-Installation-for-Linux.md | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/wiki/en/en-Installation-for-Linux.md b/wiki/en/en-Installation-for-Linux.md index 95600047d..c131b6645 100644 --- a/wiki/en/en-Installation-for-Linux.md +++ b/wiki/en/en-Installation-for-Linux.md @@ -14,18 +14,18 @@ Although we don't provide official packages for every Linux distribution, you mi [![Packaging status](https://repology.org/badge/vertical-allrepos/jamulus.svg)](https://repology.org/project/jamulus/versions) -There is also list of unofficial [packages for different distributions here](https://github.com/corrados/jamulus/issues/223). +There is also list of unofficial [packages for different distributions here](https://github.com/jamuluswebsite/jamulus/issues/223). ### Debian and Ubuntu (amd64 .deb only) If you're on amd64 **Debian**/**Ubuntu**, you may try the compiled .deb packages from GitHub Actions. -1. Download the jamulus_latest_ubuntu_amd64.deb file from the [Jamulus GitHub release](https://github.com/corrados/jamulus/releases/tag/latest) page +1. Download the jamulus_latest_ubuntu_amd64.deb file from the [Jamulus GitHub release](https://github.com/jamuluswebsite/jamulus/releases/tag/latest) page 1. Update apt: `sudo apt-get update` 1. Install the package: `sudo dpkg -i /path/to/jamulus_latest_ubuntu_amd64.deb` -1. Since Jamulus needs the JACK server, you have to install it too. We recommend to use `QjackCtl` to configure JACK. You can install it via `sudo apt-get install qjackctl` +1. Since Jamulus needs the JACK server, you have to install it too. We recommend using `QjackCtl` to configure JACK. You can install it via `sudo apt-get install qjackctl` -**Note:** The generated deb files will install Jamulus with a lower case "j". You can therefore start it in terminal by typing `jamulus`. This is different to a compiled version of Jamulus which uses the upper case *J*! +**Note:** The generated .deb files will install Jamulus with a lower-case "j". You can therefore start it in the terminal by typing `jamulus`. This is different to a compiled version of Jamulus which uses the upper-case *J*! Afterwards you should look at the "Set up your sound card" step on this page. @@ -36,14 +36,14 @@ If you can't use one of these options, you need to compile Jamulus from source. 1. Open up a terminal window (command line - `CTRL+ALT+T` on Ubuntu and related distros) 1. Download and unzip the sources for the latest release: ```shell -wget https://github.com/corrados/jamulus/archive/latest.tar.gz +wget https://github.com/jamuluswebsite/jamulus/archive/latest.tar.gz tar -xvf latest.tar.gz ``` ## Install dependencies -First, update your package list (e.g. on Debian based distributions with `sudo apt-get update`). +First, update your package list (e.g. on Debian-based distributions with `sudo apt-get update`). On **Ubuntu-based** distributions 18.04+, **Debian** 9+ or 10 and Raspberry Pi Raspbian Buster release or later: @@ -65,7 +65,7 @@ sudo dnf install qt5-qtdeclarative-devel jack-audio-connection-kit-dbus libQt5Co sudo apt-get install qjackctl ``` -You may also wish to consider using a [low-latency kernel](https://help.ubuntu.com/community/UbuntuStudio/RealTimeKernel) (eg. for Ubuntu 18.04: `sudo apt-get install linux-lowlatency-hwe-18.04`). +You may also wish to consider using a [low-latency kernel](https://help.ubuntu.com/community/UbuntuStudio/RealTimeKernel) (e.g. for Ubuntu 18.04: `sudo apt-get install linux-lowlatency-hwe-18.04`). ## Compile this bad boy @@ -91,14 +91,14 @@ You can now delete the sources directory you compiled from. ### Configure JACK with QjackCtl Jamulus clients need [JACK](https://jackaudio.org/) to run, but you need to configure that first. The recommended method is to use `QjackCtl`. 1. Open the command shell e.g. with Ctrl-Alt-T and -1. Execute the command `qjackctl` you will see the **JACK Audio Connection Kit** +1. Execute the command `qjackctl`. You will see the **JACK Audio Connection Kit** 2. Configure your audio interface as follows (the exact settings for JACK will depend on what your audio interface/sound card is capable of): - Set the audio **Interface** to the one you want (there may be several in the list) - Set the **Sample Rate to 48000** - Set the **Frames/Period to 128** and Periods/Buffer at 2 at first -Restart JACK to take any new settings +Restart JACK for the new settings to take effect ### Start Jamulus @@ -118,12 +118,12 @@ Download the new sources as per [Get Jamulus](Installation-for-Linux#get-jamulus ## Notes for geeks -* The "make clean" is essential to remove the automatically generated Qt files which are present in the .tar.gz file and may not match the Qt version you are using. +* The "make clean" command is essential to remove the automatically generated Qt files which are present in the .tar.gz file and may not match the Qt version you are using. -* To use an external shared OPUS library instead of the built-in use qmake `"CONFIG+=opus_shared_lib" Jamulus.pro`. +* To use an external shared OPUS library instead of the built-in one use qmake `"CONFIG+=opus_shared_lib" Jamulus.pro`. * To use this file configure the software with `qmake "CONFIG+=noupcasename" Jamulus.pro` to make sure the output target name of this software is **j**amulus instead of **J**amulus. -* Users of Raspberry Pi: You may want to compile the client on another machine and run the binary on the Raspberry Pi. In which case, the only libraries you need to run it are those for a [headless server](Server-Linux#running-a-headless-server) build, but _with_ the JACK sound packages. Especially have a look at the footnote for the headless build. +* Users of Raspberry Pi: You may want to compile the client on another machine and run the binary on the Raspberry Pi. In which case the only libraries you need to run it are those for a [headless server](Server-Linux#running-a-headless-server) build, but _with_ the JACK sound packages. In particular, have a look at the footnote for the headless build. * As of version 3.5.3, Jamulus is no longer compatible with Qt4. From 2b00c04ee278d6d208cd0c44a6e2ad3b921ef759 Mon Sep 17 00:00:00 2001 From: ignotus Date: Wed, 10 Feb 2021 10:47:10 +0100 Subject: [PATCH 08/43] Update en-Installation-for-Macintosh.md --- wiki/en/en-Installation-for-Macintosh.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/en/en-Installation-for-Macintosh.md b/wiki/en/en-Installation-for-Macintosh.md index 104d7e925..00f5b4b1b 100644 --- a/wiki/en/en-Installation-for-Macintosh.md +++ b/wiki/en/en-Installation-for-Macintosh.md @@ -25,7 +25,7 @@ The first time you try to double-click Jamulus to run it, you will probably see To open Jamulus 1. Navigate to the Applications folder via Finder -1. Double-click on Jamulus and wait for the mentioned message +1. Double-click on Jamulus and wait for the above-mentioned message 1. Close this message by clicking on "Cancel" 1. Now control-click (or right-click) on Jamulus, and select "Open" from the top of the menu. From 0ec910b127b87828a16b5012ca629ca88eb24a8c Mon Sep 17 00:00:00 2001 From: ignotus Date: Wed, 10 Feb 2021 10:52:11 +0100 Subject: [PATCH 09/43] Update en-Installation-for-Windows.md --- wiki/en/en-Installation-for-Windows.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/wiki/en/en-Installation-for-Windows.md b/wiki/en/en-Installation-for-Windows.md index eb3789b22..4dc1a1cb6 100644 --- a/wiki/en/en-Installation-for-Windows.md +++ b/wiki/en/en-Installation-for-Windows.md @@ -11,7 +11,7 @@ Make sure you read the [Getting Started](Getting-Started) page. 1. [Download Jamulus](https://sourceforge.net/projects/llcon/files/latest/download){: .button target="_blank" rel="noopener noreferrer"} 1. **Install Jamulus**: Double click the installer to launch it. If you get a warning notice from SmartScreen, click on "More info" and "Run anyway" to install Jamulus. (If you grabbed a new version of Jamulus and are one of the first people who downloaded it, Jamulus won't be whitelisted by SmartScreen yet. We don't pay for code signing.) 1. **Run Jamulus**. Now you should be able to use Jamulus just like any other application. -1. **Setup your sound card**. When you're done, you need to setup your audio hardware. Have a look at how to setup ASIO4ALL if you you're using that and/or [Hardware Setup](Hardware-Setup). +1. **Set up your sound card**. When you're done, you need to set up your audio hardware. Have a look at how to set up ASIO4ALL if you're using that and/or [Hardware Setup](Hardware-Setup). *** @@ -28,14 +28,14 @@ Jamulus uses [ASIO](https://en.wikipedia.org/wiki/Audio_Stream_Input/Output) to For ASIO4ALL ([download](http://www.asio4all.org){: target="_blank" rel="noopener noreferrer"}), you may need to experiment a bit to find the right configuration since every computer is a bit different. -**Tip:** Setup your sound card while you're [connected to a server](Onboarding#2-connecting-to-a-server) to hear your instrument or voice and check if everything is correctly setup, but first read on. +**Tip:** Set up your sound card while you're [connected to a server](Onboarding#2-connecting-to-a-server) to hear your instrument or voice and check if everything is correctly set up; but first read on. Before you start with Jamulus: 1. **Close all applications** (especially those which could access your sound card like your browser/media player) since Jamulus needs exclusive access to your sound card. Other programs will not be able to use audio if ASIO4ALL and Jamulus are running. 1. If the Jamulus audio doesn’t work out of the box, make sure that only the **correct inputs/outputs** in ASIO4ALL **are switched on**. Everything else should be switched off. This can be done as follows: -### How to setup ASIO4ALL inputs (Guide) +### How to set up ASIO4ALL inputs (Guide) 1. Open Jamulus's settings 1. Go to _"ASIO Settings"_ (column on the left) @@ -46,15 +46,15 @@ Before you start with Jamulus: **Hint:** Many internal sound cards are named Realtek High Definition Audio, Conexant or similar. -Concerning the inputs/outputs: Headphones and speakers are often labelled as output and microphones as inputs or capture. Stereo Mix is usually not the input/output you search for, therefore you can switch it off, if you see it. +Concerning the inputs/outputs: Headphones and speakers are often labelled as output and microphones as inputs or capture. Stereo Mix is usually not the input/output you're looking for and therefore you can switch it off if you see it. -### Having trouble with ASIO4ALL setup? +### Having trouble setting up ASIO4ALL? If nothing works, first restart Jamulus and/or your PC to close background processes that may be accessing your sound card. -Afterwards, *set up the inputs/outputs again*. Enabled and accessible input/outputs show as lit up power buttons and play buttons. If instead, you see a red cross or yellow symbol, close other applications that may be accessing your sound card (e.g browser, Zoom, etc). +Afterwards, *set up the inputs/outputs again*. Enabled and accessible input/outputs show as lit up power buttons and play buttons. If instead you see a red cross or yellow symbol, close other applications that may be accessing your sound card (e.g. browser, Zoom, etc). -Have a look at [this video](https://youtu.be/_GzOsitVgLI) from [trombonepizza](https://github.com/trombonepizza) which gives more detailed setup information on ASIO4ALL. +Have a look at [this video](https://youtu.be/_GzOsitVgLI) by [trombonepizza](https://github.com/trombonepizza) which gives more detailed setup information on ASIO4ALL. Official and further information about how to configure ASIO4ALL is documented in the official [ASIO4ALL FAQs on the ASIO4ALL website](http://www.asio4all.org/faq.html){: target="_blank" rel="noopener noreferrer"} and in the [ASIO4ALL manual here](https://www.asio4all.org/ASIO4ALL%20v2%20Instruction%20Manual.pdf). (The manual can also be found on your desktop or in the folder where the ASIO4ALL binary is installed (usually `C:\Program Files (x86)\ASIO4ALL v2\`)). From 65f682fe7010f11a3db9378b044f66e57f3f62f4 Mon Sep 17 00:00:00 2001 From: ignotus Date: Wed, 10 Feb 2021 10:54:11 +0100 Subject: [PATCH 10/43] Update en-Network-Requirements.md --- wiki/en/en-Network-Requirements.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wiki/en/en-Network-Requirements.md b/wiki/en/en-Network-Requirements.md index de2153217..0ecc805d1 100644 --- a/wiki/en/en-Network-Requirements.md +++ b/wiki/en/en-Network-Requirements.md @@ -9,7 +9,7 @@ permalink: "/wiki/Network-Requirements" ## Audio bandwidth -The audio settings have an impact on the required network bandwidth. The below table summarises network requirements with respect to the configuration of: +The audio settings have an impact on the required network bandwidth. The table below summarises network requirements with respect to the configuration of: * Channels : stereo/mono * Quality : high/medium/low * Audio buffer duration : 2.67 ms, 5.33 ms, 10.67 ms, 21.33 ms @@ -19,7 +19,7 @@ With the following units * Kbit/s : Kilo-bits per second (Reminder : 1 Mbit/s = 1024 Kbit/s, 1 KByte/s = 8 Kbit/s) * Mbit/s : Mega-bits per second -| Channels | Quality | Bandwidth (for buffer : 2.67 ms) | Bandwidth (for buffer : 5.33ms) | Bandwidth (for buffer : 10.67 ms) | Bandwidth (for buffer : 21.33 ms) | +| Channels | Quality | Bandwidth (for buffer : 2.67 ms) | Bandwidth (for buffer : 5.33 ms) | Bandwidth (for buffer : 10.67 ms) | Bandwidth (for buffer : 21.33 ms) | | --------- | ------ | -------- | -------- | -------- | -------- | | Stereo | High | 894 Kbit/s | 657 Kbit/s | 541 Kbit/s | 483 Kbit/s | | Stereo | Medium | 672 Kbit/s | 444 Kbit/s | 328 Kbit/s | 270 Kbit/s | @@ -33,4 +33,4 @@ With the following units There is one upstream (musician sending to the server) and one downstream (server sending back the mix to the musician) ![image](https://user-images.githubusercontent.com/9976944/79274940-999b0b00-7ea5-11ea-85be-3ded5ee198d5.png) -Note also that mean ADSL2 transfer rate is 10 Mbit/s for downstream and 1 Mbit/s for upstream. The actual performance depends on distance to the provider, which may [theoretically range from 24 Mbit/s at 0.3km to 1.5 Mbit/s at 5.2km](https://en.wikipedia.org/wiki/Asymmetric_digital_subscriber_line) for download rate. +Note also that mean ADSL2 transfer rate is 10 Mbit/s for downstream and 1 Mbit/s for upstream. The actual performance depends on distance to the provider, which may [theoretically range from 24 Mbit/s at 0.3 km to 1.5 Mbit/s at 5.2 km](https://en.wikipedia.org/wiki/Asymmetric_digital_subscriber_line) for download rate. From 66f0fd38d7451305880b6cef06f99425cd601911 Mon Sep 17 00:00:00 2001 From: ignotus Date: Wed, 10 Feb 2021 10:57:01 +0100 Subject: [PATCH 11/43] Update en-Onboarding.md --- wiki/en/en-Onboarding.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/en/en-Onboarding.md b/wiki/en/en-Onboarding.md index 0ad8dfeae..7b7e404fa 100644 --- a/wiki/en/en-Onboarding.md +++ b/wiki/en/en-Onboarding.md @@ -62,6 +62,6 @@ If you need help or want to contribute to the Jamulus Project, you can have a lo For help, chat, and general discussions about Jamulus: Have a look at the [forums on SourceForge](https://sourceforge.net/p/llcon/discussion/). ### Development and contribution -If you want to contribute to the Jamulus Software, have a look at the [Jamulus GitHub repository](https://github.com/corrados/jamulus/) and read the contributing file there. +If you want to contribute to the Jamulus Software, have a look at the [Jamulus GitHub repository](https://github.com/jamuluswebsite/jamulus/) and read the contributing file there. From e9ca38efa626b7004f570ed9505c79d9333909e1 Mon Sep 17 00:00:00 2001 From: ignotus Date: Wed, 10 Feb 2021 10:59:38 +0100 Subject: [PATCH 12/43] Update en-Privacy-Statement.md --- wiki/en/en-Privacy-Statement.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/en/en-Privacy-Statement.md b/wiki/en/en-Privacy-Statement.md index 14b1b01d6..d3b67e712 100644 --- a/wiki/en/en-Privacy-Statement.md +++ b/wiki/en/en-Privacy-Statement.md @@ -24,7 +24,7 @@ When you connect to a public or private server, the server operator can see your As a server operator, when you register a public server with a Central Server, your IP address is sent to CloudFlare (1.1.1.1) in order to identify your public IP address. The IP addresses of all public servers registered with the Central Server can also be seen by third parties for informational or other purposes (for example [here](https://explorer.jamulus.io/)). Your public IP address is otherwise not logged or stored by Jamulus, but may be stored or processed by third parties. -_Users concerned by the use of CloudFlare's network can [re-compile](Compiling) the Jamulus source code to use an alternative for WELL_KNOWN_HOST/ WELL_KNOWN_PORT in [global.h](https://github.com/corrados/jamulus/blob/master/src/global.h#L111)_ +_Users concerned by the use of CloudFlare's network can [re-compile](Compiling) the Jamulus source code to use an alternative for WELL_KNOWN_HOST/ WELL_KNOWN_PORT in [global.h](https://github.com/jamuluswebsite/jamulus/blob/master/src/global.h#L111)_ ### Audio Recordings From d1d677bcd5984b28801e797ef311519c83927b21 Mon Sep 17 00:00:00 2001 From: ignotus Date: Wed, 10 Feb 2021 11:02:23 +0100 Subject: [PATCH 13/43] Update en-Running-a-Private-Server.md --- wiki/en/en-Running-a-Private-Server.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/en/en-Running-a-Private-Server.md b/wiki/en/en-Running-a-Private-Server.md index f189ad78e..5a012df5a 100644 --- a/wiki/en/en-Running-a-Private-Server.md +++ b/wiki/en/en-Running-a-Private-Server.md @@ -15,7 +15,7 @@ It is highly recommended to test your server in **public mode first** so as to n ## Operating a private server behind a home network router ### Port forwarding -To run a private server, you need to setup port forwarding on your router. _(If you are curious about why you need to do this for private but not public servers, see [this footnote](#footnote-for-geeks).)_ +To run a private server, you need to set up port forwarding on your router. _(If you are curious about why you need to do this for private but not public servers, see [this footnote](#footnote-for-geeks).)_ Normally, people from outside your home network cannot see things inside it. So if you want to operate a Jamulus server at home, you need to open a hole in your router to let Jamulus clients connect to it. From 01b9bbe3d805234da961c822f9637826a1202296 Mon Sep 17 00:00:00 2001 From: ignotus Date: Wed, 10 Feb 2021 11:05:41 +0100 Subject: [PATCH 14/43] Update en-Running-a-Server.md --- wiki/en/en-Running-a-Server.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/wiki/en/en-Running-a-Server.md b/wiki/en/en-Running-a-Server.md index 215fbb9da..0b3c25c91 100644 --- a/wiki/en/en-Running-a-Server.md +++ b/wiki/en/en-Running-a-Server.md @@ -33,9 +33,9 @@ If you really want to run a server, it's **very important** that you read and un Many people attribute problems to the server that are in fact problems with the _client_. Much depends on the clients' [hardware](Hardware-Setup), the networks that _they_ are on, and whether they are sticking to [Rule Number One](Getting-Started#having-trouble-cant-keep-in-time). There is therefore no guarantee that you will achieve lower latency or better overall performance by having your own server. -If you plan to be playing regularly with the same people, **you are strongly advised** to first make sure that each member of the group is set up to use Jamulus properly. Do this by finding a public server with a reasonable ping time for all of you (20ms or less perhaps), all connect to that and work to fix any individual issues (verifying that they can [follow Rule Number One](Getting-Started#having-trouble-cant-keep-in-time) in particular). Use the solo technique above to prevent being interrupted if needed. +If you plan to be playing regularly with the same people, **you are strongly advised** to first make sure that each member of the group is set up to use Jamulus properly. Do this by finding a public server with a reasonable ping time for all of you (20 ms or less perhaps), all connect to that and work to fix any individual issues (verifying that they can [follow Rule Number One](Getting-Started#having-trouble-cant-keep-in-time) in particular). Use the solo technique above to prevent being interrupted if needed. -Once any issues with musicians have been solved in this way, you can then investigate hosting your own server either at home or on a cloud host such as Amazon, which may result in better latency than servers run at home. For example, [see this guide](https://www.facebook.com/notes/jamulus-online-musicianssingers-jamming/howto-idiots-guide-to-installing-jamulus-server-on-amazon-aws-lightsail-ubuntu-i/507719749802976/) to using AWS Lightsail by Jamulus user [Simon Tomlinson](https://www.facebook.com/simon.james.tomlinson?eid=ARBQoY3KcZAtS3pGdLJuqvQTeRSOo4gHdQZT7nNzOt1oPMGgZ4_3GERe-rOyH5PxsSHVYYXjWwcqd71a) (_Facebook_) +Once any issues with musicians have been solved in this way, you can then investigate hosting your own server either at home or on a cloud host such as Amazon, which may result in better latency than servers run at home. For example, [see this guide](https://www.facebook.com/notes/jamulus-online-musicianssingers-jamming/howto-idiots-guide-to-installing-jamulus-server-on-amazon-aws-lightsail-ubuntu-i/507719749802976/) for using AWS Lightsail, by Jamulus user [Simon Tomlinson](https://www.facebook.com/simon.james.tomlinson?eid=ARBQoY3KcZAtS3pGdLJuqvQTeRSOo4gHdQZT7nNzOt1oPMGgZ4_3GERe-rOyH5PxsSHVYYXjWwcqd71a) (_Facebook_) ### Bandwidth – do you have enough? @@ -43,7 +43,7 @@ A typical jam might have 4 people, for which you would need 200 Kbit/s * 4 = 800 ### In general -- Consider using a cloud host to get better ping times if you having problems +- Consider using a cloud host to get better ping times if you're having problems - Any server should have at least 1.6GHz CPU frequency and 1GB RAM @@ -60,9 +60,9 @@ A typical jam might have 4 people, for which you would need 200 Kbit/s * 4 = 800 For Linux users -If you want to run a server on a Raspberry Pi, have a look at the [guide for Raspberry Pi](/kb/2020/03/28/Server-Rpi.html) from fredsiva. +If you want to run a server on a Raspberry Pi, have a look at the [guide for Raspberry Pi](/kb/2020/03/28/Server-Rpi.html) by fredsiva. -Server operators may also be interested in downloading [this set of useful tools](https://github.com/corrados/jamulus/tree/master/tools) from the Jamulus repository (clone the Git repo and also call `git submodule update --init`). +Server operators may also be interested in downloading [this set of useful tools](https://github.com/jamuluswebsite/jamulus/tree/master/tools) from the Jamulus repository (clone the Git repo and also call `git submodule update --init`). ## Having problems? Got issues? From b8f3dddc29e75f91bd0a82c55e5b0e4ae38b573b Mon Sep 17 00:00:00 2001 From: ignotus Date: Wed, 10 Feb 2021 11:10:29 +0100 Subject: [PATCH 15/43] Update en-Server-Linux.md --- wiki/en/en-Server-Linux.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/en/en-Server-Linux.md b/wiki/en/en-Server-Linux.md index 1e059dc6e..49e92ca8b 100644 --- a/wiki/en/en-Server-Linux.md +++ b/wiki/en/en-Server-Linux.md @@ -195,7 +195,7 @@ You can see the result of these commands if you run `service jamulus status`, or ### Viewing The Logs -Jamulus will log to the system file if you left the `StandardOutput=journal` setting in the unit file. Logging to the system log is recommended, as the system will manage the log file for you, no need to come back and purge it later, or worry about filling up your disk space. +Jamulus will log to the system file if you left the `StandardOutput=journal` setting in the unit file. Logging to the system log is recommended, as the system will manage the log file for you - no need to come back and purge it later or worry about filling up your disk space. To view the log, use `journalctl` (to exit press Ctrl-C). For example, to read the system log file, filtered for the Jamulus service: From 420200b5ebd7a8b72cec1da536c19f94d4040b99 Mon Sep 17 00:00:00 2001 From: ignotus Date: Wed, 10 Feb 2021 11:14:13 +0100 Subject: [PATCH 16/43] Update en-Server-Troubleshooting.md --- wiki/en/en-Server-Troubleshooting.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wiki/en/en-Server-Troubleshooting.md b/wiki/en/en-Server-Troubleshooting.md index a36e11564..984b77f13 100644 --- a/wiki/en/en-Server-Troubleshooting.md +++ b/wiki/en/en-Server-Troubleshooting.md @@ -9,7 +9,7 @@ permalink: "/wiki/Server-Troubleshooting" ## Servers - Public -### Why doesn't my server show up in the list? Why isn't in registering? +### Why doesn't my server show up in the list? Why isn't it registering? If you are registered OK (you can [see it here](https://explorer.jamulus.io/)) and you or your friends can't see your server, you may need to wait, or start your client with the `--showallservers` option and try connecting from there ([see this page](Command-Line-Options) on how to start your client with a config option). @@ -37,7 +37,7 @@ Yes. Please see [Server Types](Choosing-a-Server-Type) ### Can I convert my private server to being a public one? -Yes. Simply check the "Make my Server Public" box in the server window and fill out the details. Remember that you also do not need to port forward if you have a public server. +Yes. Simply check the "Make my Server Public" box in the server window and fill out the details. Remember also that you do not need to port forward if you have a public server. ### **_Headless Linux_**: I have created a server but it is joining the Central Server and I don't want it to. From 0264d9eb50fe9de9462b6ae2e6eae498e0963e91 Mon Sep 17 00:00:00 2001 From: ignotus Date: Wed, 10 Feb 2021 11:16:21 +0100 Subject: [PATCH 17/43] Update en-Server-Win-Mac.md --- wiki/en/en-Server-Win-Mac.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wiki/en/en-Server-Win-Mac.md b/wiki/en/en-Server-Win-Mac.md index a90358afe..d130d518f 100644 --- a/wiki/en/en-Server-Win-Mac.md +++ b/wiki/en/en-Server-Win-Mac.md @@ -24,13 +24,13 @@ permalink: "/wiki/Server-Win-Mac" 1. Type in the name, city and country so that other users can easily identify you. -1. Specify a musical genre if you wish. This will make your server appear in the relevant server list for clients (see more [details on Central Servers](Central-Servers)). +1. Specify a music genre if you wish. This will make your server appear in the relevant server list for clients (see more [details on Central Servers](Central-Servers)). _The Chat Welcome Message appears to all users when they join the server (the chat window will open automatically for them)._ ### Private server setup -If you do not check the "Make My Server Public", you will be running a private server and need to [read these instructions](Running-a-Private-Server). +If you do not check "Make My Server Public", you will be running a private server and need to [read these instructions](Running-a-Private-Server). _If you want to **run a client on the same machine** you should **connect the client to `127.0.0.1`** for best performance. (Similarly, if you want to connect a client on another machine on your LAN, use the server's LAN IP address)._ From 269e90e42e813009c99dded7bf34cd4804c69164 Mon Sep 17 00:00:00 2001 From: ignotus Date: Wed, 10 Feb 2021 11:24:56 +0100 Subject: [PATCH 18/43] Update en-Software-Manual.md --- wiki/en/en-Software-Manual.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wiki/en/en-Software-Manual.md b/wiki/en/en-Software-Manual.md index bf3e8e62b..000e482e9 100644 --- a/wiki/en/en-Software-Manual.md +++ b/wiki/en/en-Software-Manual.md @@ -52,7 +52,7 @@ Make sure not to clip the input signal to avoid distortions of the audio signal The chat text entered in that dialog is sent to all connected clients. If a new chat message arrives and the Chat dialog is not already open, it will -opened automatically for all clients. +open automatically for all clients. ### Profile window @@ -72,7 +72,7 @@ pressing this button will end the session. ![Connect dialog](https://user-images.githubusercontent.com/20726856/97360965-31d76b00-189f-11eb-870b-f58be6e30f04.png) -The Connection Setup window shows a list of available servers together with the number of occupants and the maximum number supported. Server operators can optionally list their servers by musical genre. Use the List dropdown to select a genre, click on the server you want to join and press the Connect button to connect to it. Alternatively, double-click on the server name. Permanent servers (those that have been listed for longer than 24 hours) are shown in bold. +The Connection Setup window shows a list of available servers together with the number of occupants and the maximum number supported. Server operators can optionally list their servers by music genre. Use the List dropdown to select a genre, click on the server you want to join and press the Connect button to connect to it. Alternatively, double-click on the server name. Permanent servers (those that have been listed for longer than 24 hours) are shown in bold. You can filter the list by server name or location. To list only occupied servers, enter a "#" character. @@ -171,7 +171,7 @@ In this case the buffer delay setting is disabled and has to be changed using th On Linux, use the JACK configuration tool to change the buffer size. The actual buffer delay has an influence on the connection status, the current upload rate and the overall delay. -The lower the buffer size, the higher the probability of a red light in the status indicator (drop outs) and the +The lower the buffer size, the higher the probability of a red light in the status indicator (dropouts) and the higher the upload rate and the lower the overall delay. ![Buffer delay dependencies](https://user-images.githubusercontent.com/20726856/97361878-816a6680-18a0-11eb-8c1f-fbf956be4b81.png) @@ -246,7 +246,7 @@ Leave this blank unless you need to enter the address of a central server other ![Indicators](https://user-images.githubusercontent.com/20726856/97362338-271dd580-18a1-11eb-99b7-02c9371a6258.png) The Ping Time is the time required for the audio stream to travel from the client to the server and back again. -This delay is introduced by the network and should about 20-30ms. If this delay is higher than about 50ms, +This delay is introduced by the network and should be about 20-30 ms. If this delay is higher than about 50 ms, your distance to the server is too large or your internet connection is not sufficient. Overall Delay is calculated from the current Ping Time and the delay introduced by the current buffer settings. From 56d560ebe00c60f08bd61d557e501a76ad83602d Mon Sep 17 00:00:00 2001 From: ignotus Date: Wed, 10 Feb 2021 11:29:18 +0100 Subject: [PATCH 19/43] Update en-Tips-Tricks-More.md --- wiki/en/en-Tips-Tricks-More.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wiki/en/en-Tips-Tricks-More.md b/wiki/en/en-Tips-Tricks-More.md index 6adfd6bb0..4f1e7e1ca 100644 --- a/wiki/en/en-Tips-Tricks-More.md +++ b/wiki/en/en-Tips-Tricks-More.md @@ -13,9 +13,9 @@ Jamulus user [Chris Rimple](https://sourceforge.net/u/chrisrimple/profile/) has ## Using Jamulus audio in Zoom (or other) meeting apps -Several users have reported success allowing a "virtual audience" for a Jamulus session by using [JACK audio](https://jackaudio.org) to route the Jamulus signal through the JackRouter to the target application (in this case, Zoom meetings). +Several users have reported success allowing a "virtual audience" for a Jamulus session by using [JACK audio](https://jackaudio.org) to route the Jamulus signal through JackRouter to the target application (in this case, Zoom meetings). -You can also use [VoiceMeeter](https://www.vb-audio.com/Voicemeeter/banana.htm) (Banana) for Windows or [BlackHole](https://github.com/ExistentialAudio/BlackHole) for macOS to route Jamulus output to multiple destinations, for example to your headphones and the meeting application at the same time. +You can also use [VoiceMeeter](https://www.vb-audio.com/Voicemeeter/banana.htm) (Banana) for Windows or [BlackHole](https://github.com/ExistentialAudio/BlackHole) for macOS to route the Jamulus output to multiple destinations, for example to your headphones and the meeting application at the same time. ## Recording Jamulus on Windows with Reaper @@ -29,7 +29,7 @@ Jamulus user [BTDT](https://sourceforge.net/u/btdt/profile/) has written a syste ## Making a server status page -With the `-m` command line argument a server statistic information can be generated to be put on a web page. +With the `-m` command line argument, server statistic information can be generated to be put on a web page. Here is an example php script using the server status file to display the current server status on a html page (assuming the following command line argument to be used: `-m /var/www/stat1.dat`): From 6e6d4fa3e113f7e5a52932530ba7642924a7d98f Mon Sep 17 00:00:00 2001 From: ignotus Date: Wed, 10 Feb 2021 21:53:36 +0100 Subject: [PATCH 20/43] Update en-Central-Servers.md --- wiki/en/en-Central-Servers.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/en/en-Central-Servers.md b/wiki/en/en-Central-Servers.md index 9902f996b..5bdca96c8 100644 --- a/wiki/en/en-Central-Servers.md +++ b/wiki/en/en-Central-Servers.md @@ -9,7 +9,7 @@ permalink: "/wiki/Central-Servers" Because there is a limit of 150 servers per central server, you need to select which central server you want to advertise your server on. Select a genre if you intend to limit players to that style (players can then see your server in their genre list). -When you start a public server, you will see a message saying whether your server has been successfully listed or not. If not, and you leave your server running, it will reattempt to register until a free slot becomes available. +When you start a public server, you will see a message saying whether your server has been successfully listed or not. If not, and you leave your server running, it will keep trying to register until a free slot becomes available. ## Headless servers From a1c0c44b515ab65423de760b18b793e1da71788c Mon Sep 17 00:00:00 2001 From: ignotus Date: Wed, 10 Feb 2021 21:55:13 +0100 Subject: [PATCH 21/43] Update en-Contribution.md --- wiki/en/en-Contribution.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/en/en-Contribution.md b/wiki/en/en-Contribution.md index e623586cc..0ebae6547 100644 --- a/wiki/en/en-Contribution.md +++ b/wiki/en/en-Contribution.md @@ -15,7 +15,7 @@ See the [Jamulus GitHub repo](https://github.com/jamulussoftware/jamulus) for fu ## Jamulus Website -* If you find a mistake, typo or something out of date (in any language) on the website, you can [open an issue on GitHub](https://github.com/jamulussoftware/jamuluswebsite/issues) or if you don't have a GitHub account, on [the relevant discussion forum](https://sourceforge.net/p/llcon/discussion/) on SourceForge. +* If you find a mistake, typo or something out of date (in any language) on the website, you can [open an issue on GitHub](https://github.com/jamulussoftware/jamuluswebsite/issues) or, if you don't have a GitHub account, on [the relevant discussion forum](https://sourceforge.net/p/llcon/discussion/) on SourceForge. * If you think some documentation or information is missing or can be improved, post about that on [the relevant discussion forum](https://sourceforge.net/p/llcon/discussion/) so that it can be discussed first. From 1c0dd93ff6932a7a002b597ab7d2461ea1b60909 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Thu, 11 Feb 2021 12:19:28 +0100 Subject: [PATCH 22/43] Add spacing --- wiki/en/en-Contribution.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wiki/en/en-Contribution.md b/wiki/en/en-Contribution.md index 0ebae6547..a348fdbe1 100644 --- a/wiki/en/en-Contribution.md +++ b/wiki/en/en-Contribution.md @@ -15,9 +15,9 @@ See the [Jamulus GitHub repo](https://github.com/jamulussoftware/jamulus) for fu ## Jamulus Website -* If you find a mistake, typo or something out of date (in any language) on the website, you can [open an issue on GitHub](https://github.com/jamulussoftware/jamuluswebsite/issues) or, if you don't have a GitHub account, on [the relevant discussion forum](https://sourceforge.net/p/llcon/discussion/) on SourceForge. +* If you find a mistake, typo or something out of date (in any language) on the website, you can [open an issue on GitHub](https://github.com/jamulussoftware/jamuluswebsite/issues) or, if you don't have a GitHub account, on [the relevant discussion forum](https://sourceforge.net/p/llcon/discussion/) on SourceForge. -* If you think some documentation or information is missing or can be improved, post about that on [the relevant discussion forum](https://sourceforge.net/p/llcon/discussion/) so that it can be discussed first. +* If you think some documentation or information is missing or can be improved, post about that on [the relevant discussion forum](https://sourceforge.net/p/llcon/discussion/) so that it can be discussed first. Have a look at the [CONTRIBUTING file](https://github.com/jamulussoftware/jamuluswebsite/blob/changes/CONTRIBUTING.md) for the website and the [Website GitHub repo](https://github.com/jamulussoftware/jamuluswebsite) for further information. From 9082a3b61df5bdb517546acacef9511298a9f15b Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Thu, 11 Feb 2021 12:21:38 +0100 Subject: [PATCH 23/43] Update en-Client-Troubleshooting.md --- wiki/en/en-Client-Troubleshooting.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/wiki/en/en-Client-Troubleshooting.md b/wiki/en/en-Client-Troubleshooting.md index c81c1a0cf..8ff62e5f0 100644 --- a/wiki/en/en-Client-Troubleshooting.md +++ b/wiki/en/en-Client-Troubleshooting.md @@ -18,11 +18,11 @@ Start with the simple stuff: make sure your instrument/microphone and headphones You can test whether you are hearing your signal correctly by doing the following: -1. Connect your audio source (mic, instrument...) to your computer. -1. Use an audio recording application (such as [Audacity](https://www.audacityteam.org/)) on your computer to record that input and check it's OK. -1. Make sure that if you mute your audio input inside the recording application, you can't hear yourself. -1. Close the recording application and run Jamulus. You should still not hear yourself. -1. Connect to a server and play something. Now you should hear yourself with the delay from the server. +1. Connect your audio source (mic, instrument...) to your computer. +1. Use an audio recording application (such as [Audacity](https://www.audacityteam.org/)) on your computer to record that input and check it's OK. +1. Make sure that if you mute your audio input inside the recording application, you can't hear yourself. +1. Close the recording application and run Jamulus. You should still not hear yourself. +1. Connect to a server and play something. Now you should hear yourself with the delay from the server. **If you are still having problems**, try asking on the [hardware forum](https://sourceforge.net/p/llcon/discussion/hardware/). Exactly how you avoid listening to your direct signal will depend on your individual setup - your sound interface, mixing desk, headphone connection point, etc. For example, some audio interfaces have "monitor" buttons (turn these off), or similar options. @@ -67,8 +67,8 @@ See [this forum discussion](https://sourceforge.net/p/llcon/discussion/533517/th (With thanks to [Mark Anthony De Souza](https://www.facebook.com/groups/619274602254947/permalink/765122847670121/?comment_id=765525034296569)) Maybe you did not answer "Yes" to the `"Jamulus wants to access your microphone"` challenge. To fix this: -* Go to `Preferences` > `Security & Privacy` > `Privacy` tab -* Find `Microphone` on the left and then make sure `Jamulus` is enabled on the right-hand list +* Go to `Preferences` > `Security & Privacy` > `Privacy` tab +* Find `Microphone` on the left and then make sure `Jamulus` is enabled on the right-hand list *** From 57b5e5e98f2a647599f1971d984bd691dfd52613 Mon Sep 17 00:00:00 2001 From: ignotus Date: Mon, 15 Feb 2021 10:04:27 +0100 Subject: [PATCH 24/43] Update en-Hardware-Setup.md --- wiki/en/en-Hardware-Setup.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/en/en-Hardware-Setup.md b/wiki/en/en-Hardware-Setup.md index 3f73a72a0..0c73e61e3 100644 --- a/wiki/en/en-Hardware-Setup.md +++ b/wiki/en/en-Hardware-Setup.md @@ -61,7 +61,7 @@ You might want to install [Ubuntu Studio](https://ubuntustudio.org/). It adds a ## Points to note about inputs -- If you want to connect 2 or more sources (e.g. voice + synth + guitar), it is important to note that Jamulus currently handles only 2 input channels (L/R). So the hardware being used must provide a mixed-down stereo output to Jamulus. +- If you want to connect 2 or more sources (e.g. voice + synth + guitar), it is important to note that Jamulus currently handles only 2 input channels (L/R). So the hardware being used must provide a mixed-down stereo output to Jamulus. Alternatively, run two instances of Jamulus, if your hardware supports it, or use virtual audio inputs to Jamulus for each hardware input. - Audio interfaces generally output a mixed signal on their analogue output, but separate signals (1 per source) on their digital output (USB/FireWire/Thunderbolt). - Mixers generally only output mixed-down signals on their analogue output. - Mixers with USB/FireWire/Thunderbolt generally output a mixed-down signal on their **analogue** output AND separate signals only (no mixed-down signal) on their **digital** output. From dcd805622b46c6385ee9205e2b21f9607207887a Mon Sep 17 00:00:00 2001 From: ignotus Date: Mon, 15 Feb 2021 10:10:40 +0100 Subject: [PATCH 25/43] Update en-Installation-for-Windows.md --- wiki/en/en-Installation-for-Windows.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/en/en-Installation-for-Windows.md b/wiki/en/en-Installation-for-Windows.md index 4dc1a1cb6..fd31613b6 100644 --- a/wiki/en/en-Installation-for-Windows.md +++ b/wiki/en/en-Installation-for-Windows.md @@ -41,7 +41,7 @@ Before you start with Jamulus: 1. Go to _"ASIO Settings"_ (column on the left) 1. Enable _advanced view_ in ASIO4ALL (click the tool icon on the bottom right) 1. Enable only the sound card you want to use by clicking on the button next to its name -1. Open your sound card inputs by clicking the _plus icon_ next to this sound card +1. Open your sound card inputs/outputs by clicking the _plus icon_ next to this sound card 1. Now enable the correct inputs/outputs in the list under your sound card and disable everything else **Hint:** Many internal sound cards are named Realtek High Definition Audio, Conexant or similar. From 1ca2ef472c277a7ca735ec06bc1f7e35101d30e1 Mon Sep 17 00:00:00 2001 From: ignotus Date: Mon, 15 Feb 2021 11:35:30 +0100 Subject: [PATCH 26/43] Update en-Onboarding.md --- wiki/en/en-Onboarding.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/en/en-Onboarding.md b/wiki/en/en-Onboarding.md index 7b7e404fa..686e2ce38 100644 --- a/wiki/en/en-Onboarding.md +++ b/wiki/en/en-Onboarding.md @@ -62,6 +62,6 @@ If you need help or want to contribute to the Jamulus Project, you can have a lo For help, chat, and general discussions about Jamulus: Have a look at the [forums on SourceForge](https://sourceforge.net/p/llcon/discussion/). ### Development and contribution -If you want to contribute to the Jamulus Software, have a look at the [Jamulus GitHub repository](https://github.com/jamuluswebsite/jamulus/) and read the contributing file there. +If you want to contribute to the Jamulus Software, have a look at the [Jamulus GitHub repository](https://github.com/jamulussoftware/jamulus/) and read the `CONTRIBUTING.MD` file there. From 0e7ea7d4301d930bfec41ac0c5e7cb507c5a2fc1 Mon Sep 17 00:00:00 2001 From: ignotus Date: Mon, 15 Feb 2021 11:36:31 +0100 Subject: [PATCH 27/43] Update en-Onboarding.md --- wiki/en/en-Onboarding.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/en/en-Onboarding.md b/wiki/en/en-Onboarding.md index 686e2ce38..f5d8bb667 100644 --- a/wiki/en/en-Onboarding.md +++ b/wiki/en/en-Onboarding.md @@ -62,6 +62,6 @@ If you need help or want to contribute to the Jamulus Project, you can have a lo For help, chat, and general discussions about Jamulus: Have a look at the [forums on SourceForge](https://sourceforge.net/p/llcon/discussion/). ### Development and contribution -If you want to contribute to the Jamulus Software, have a look at the [Jamulus GitHub repository](https://github.com/jamulussoftware/jamulus/) and read the `CONTRIBUTING.MD` file there. +If you want to contribute to the Jamulus Software, have a look at the [Jamulus GitHub repository](https://github.com/jamulussoftware/jamulus/) and read the `CONTRIBUTING.md` file there. From 47261c04ec24db6763cfc786c0017a8f3bbb5b05 Mon Sep 17 00:00:00 2001 From: ignotus Date: Mon, 15 Feb 2021 11:53:13 +0100 Subject: [PATCH 28/43] Update en-Software-Manual.md --- wiki/en/en-Software-Manual.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/wiki/en/en-Software-Manual.md b/wiki/en/en-Software-Manual.md index 000e482e9..85f766271 100644 --- a/wiki/en/en-Software-Manual.md +++ b/wiki/en/en-Software-Manual.md @@ -246,8 +246,10 @@ Leave this blank unless you need to enter the address of a central server other ![Indicators](https://user-images.githubusercontent.com/20726856/97362338-271dd580-18a1-11eb-99b7-02c9371a6258.png) The Ping Time is the time required for the audio stream to travel from the client to the server and back again. -This delay is introduced by the network and should be about 20-30 ms. If this delay is higher than about 50 ms, -your distance to the server is too large or your internet connection is not sufficient. +This delay is introduced by the network and ideally should be about 20-30 ms. When this delay is higher than about 50 ms, it starts to become +more noticeable and you may find it harder to keep in time, though it is still possible once you get used to it. Factors such as tempo, the instrument +played or headphone isolation will have an impact on the delay you find you can deal with. +The most probable causes for a high delay are that your distance to the server is too large or your internet connection is not sufficient. Overall Delay is calculated from the current Ping Time and the delay introduced by the current buffer settings. From 191d144faf1fe06db3f0cf14887579a0dae21255 Mon Sep 17 00:00:00 2001 From: ignotus Date: Mon, 15 Feb 2021 11:58:24 +0100 Subject: [PATCH 29/43] Corrected URL --- wiki/en/en-Installation-for-Linux.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wiki/en/en-Installation-for-Linux.md b/wiki/en/en-Installation-for-Linux.md index c131b6645..1dbc5875a 100644 --- a/wiki/en/en-Installation-for-Linux.md +++ b/wiki/en/en-Installation-for-Linux.md @@ -14,13 +14,13 @@ Although we don't provide official packages for every Linux distribution, you mi [![Packaging status](https://repology.org/badge/vertical-allrepos/jamulus.svg)](https://repology.org/project/jamulus/versions) -There is also list of unofficial [packages for different distributions here](https://github.com/jamuluswebsite/jamulus/issues/223). +There is also list of unofficial [packages for different distributions here](https://github.com/jamulussoftware/jamulus/issues/223). ### Debian and Ubuntu (amd64 .deb only) If you're on amd64 **Debian**/**Ubuntu**, you may try the compiled .deb packages from GitHub Actions. -1. Download the jamulus_latest_ubuntu_amd64.deb file from the [Jamulus GitHub release](https://github.com/jamuluswebsite/jamulus/releases/tag/latest) page +1. Download the jamulus_latest_ubuntu_amd64.deb file from the [Jamulus GitHub release](https://github.com/jamulussoftware/jamulus/releases/tag/latest) page 1. Update apt: `sudo apt-get update` 1. Install the package: `sudo dpkg -i /path/to/jamulus_latest_ubuntu_amd64.deb` 1. Since Jamulus needs the JACK server, you have to install it too. We recommend using `QjackCtl` to configure JACK. You can install it via `sudo apt-get install qjackctl` From 1b2b43f889f348709c74bc7683055b71d52d9c88 Mon Sep 17 00:00:00 2001 From: ignotus Date: Mon, 15 Feb 2021 12:01:23 +0100 Subject: [PATCH 30/43] Corrected URL --- wiki/en/en-Privacy-Statement.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/en/en-Privacy-Statement.md b/wiki/en/en-Privacy-Statement.md index d3b67e712..e5ea4bb41 100644 --- a/wiki/en/en-Privacy-Statement.md +++ b/wiki/en/en-Privacy-Statement.md @@ -24,7 +24,7 @@ When you connect to a public or private server, the server operator can see your As a server operator, when you register a public server with a Central Server, your IP address is sent to CloudFlare (1.1.1.1) in order to identify your public IP address. The IP addresses of all public servers registered with the Central Server can also be seen by third parties for informational or other purposes (for example [here](https://explorer.jamulus.io/)). Your public IP address is otherwise not logged or stored by Jamulus, but may be stored or processed by third parties. -_Users concerned by the use of CloudFlare's network can [re-compile](Compiling) the Jamulus source code to use an alternative for WELL_KNOWN_HOST/ WELL_KNOWN_PORT in [global.h](https://github.com/jamuluswebsite/jamulus/blob/master/src/global.h#L111)_ +_Users concerned by the use of CloudFlare's network can [re-compile](Compiling) the Jamulus source code to use an alternative for WELL_KNOWN_HOST/ WELL_KNOWN_PORT in [global.h](https://github.com/jamulussoftware/jamulus/blob/master/src/global.h#L111)_ ### Audio Recordings From c0a9ed0644bd2686e0f1639b5e51054549d3ffc2 Mon Sep 17 00:00:00 2001 From: ignotus Date: Mon, 15 Feb 2021 12:02:31 +0100 Subject: [PATCH 31/43] Corrected URL --- wiki/en/en-Running-a-Server.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/en/en-Running-a-Server.md b/wiki/en/en-Running-a-Server.md index c8e4c2090..6efa3d7b6 100644 --- a/wiki/en/en-Running-a-Server.md +++ b/wiki/en/en-Running-a-Server.md @@ -62,7 +62,7 @@ A typical jam might have 4 people, for which you would need 200 Kbit/s * 4 = 800 If you want to run a server on a Raspberry Pi, have a look at the [guide for Raspberry Pi](/kb/2020/03/28/Server-Rpi.html) by fredsiva. -Server operators may also be interested in downloading [this set of useful tools](https://github.com/jamuluswebsite/jamulus/tree/master/tools) from the Jamulus repository (clone the Git repo and also call `git submodule update --init`). +Server operators may also be interested in downloading [this set of useful tools](https://github.com/jamulussoftware/jamulus/tree/master/tools) from the Jamulus repository (clone the Git repo and also call `git submodule update --init`). ## Having problems? Got issues? From bc788c5008e17c8e2aec90d16b7bf90a20259be4 Mon Sep 17 00:00:00 2001 From: ignotus Date: Mon, 15 Feb 2021 14:16:45 +0100 Subject: [PATCH 32/43] Updated to document new MIDI controller functions --- wiki/en/en-Tips-Tricks-More.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/wiki/en/en-Tips-Tricks-More.md b/wiki/en/en-Tips-Tricks-More.md index 4f1e7e1ca..755f1db95 100644 --- a/wiki/en/en-Tips-Tricks-More.md +++ b/wiki/en/en-Tips-Tricks-More.md @@ -96,8 +96,14 @@ jack_connect Jamulus:'output right' system:playback_2 ## Using ctrlmidich for MIDI controllers -The volume faders in the client's mixer window can be controlled using a MIDI controller by using the `--ctrlmidich` parameter (note: only available for use with macOS and Linux). To enable this feature, Jamulus must be launched with `--ctrlmidich`. There are two parameters you can set: `Channel` and `Offset`. Set the first parameter to the channel you want Jamulus to listen on (0 for all channels) and the second parameter to the Control Number you want the first fader to react to. By default, the offset is 70 (for the Behringer X-Touch), which means that the first fader reacts to Control Number 70, the second to 71, and so on. +The volume fader, pan control and mute & solo buttons in the client's mixer window strips can be controlled using a MIDI controller by using the `--ctrlmidich` parameter (note: only available for use with macOS and Linux using Jamulus version 3.6.3 or higher). To enable this feature, Jamulus must be launched with `--ctrlmidich`. There is one global MIDI channel parameter (1-16) and two parameters you can set for each item controlled: `offset` and `consecutive CC numbers`. Set the first parameter to the channel you want Jamulus to listen on (0 for all channels) and then specify the items you want to control (f = volume fader; p = pan; m = mute; s = solo) with the offset (CC number to start from) and number of consecutive CC numbers. Take the following example: -So for example, if you're using a Behringer X-Touch, sending MIDI on channel 1 and leaving the offset at default, the command would look like this: `--ctrlmidich 1`. If you have a different controller, e.g. sending MIDI on channel 2 and starting with Control Number 30, the command would be as follows: `--ctrlmidich "2;30"` +`--ctrlmidich '1;f0*8;p16*8;s32*8;m48*8'` + +Here, Jamulus listens on MIDI channel 1. Volume fader CC numbers start at 0 and there are 8 of them (so end at CC number 7). Pan controls start at CC number 16 and end at 23; Solo 32 to 39 and Mute 48 to 55. + +Fader strips in the mixer window are controlled in ascending order from left to right. Continuing with the above example, in strip number 1 (farthest left), the volume fader would controlled by CC number 0; pan by 16; solo by 32 and mute by 48. As we have specified 8 consecutive controllers for each parameter, this would give us MIDI control over 8 strips in the mixer window. The next strip would be controlled by 1, 17, 33 and 49, and so forth. + +*Note*: Jamulus does not provide feedback on the state of the Solo and Mute buttons, meaning that your controller must keep track and toggle LEDs (if any) to 'on' or 'off' itself. Make sure you connect your MIDI device's output port to the Jamulus MIDI in port (QjackCtl (Linux), MIDI Studio (macOS) or whatever you use for managing connections). In Linux you will need to install and launch a2jmidid so your device shows up in the MIDI tab in Qjackctl. From 281c3c86327fbe2246f13031c33eabea15d54090 Mon Sep 17 00:00:00 2001 From: ignotus Date: Mon, 15 Feb 2021 14:29:24 +0100 Subject: [PATCH 33/43] Updated MIDI controller syntax --- wiki/en/en-Command-Line-Options.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/en/en-Command-Line-Options.md b/wiki/en/en-Command-Line-Options.md index 468524285..3c1d5849b 100644 --- a/wiki/en/en-Command-Line-Options.md +++ b/wiki/en/en-Command-Line-Options.md @@ -50,6 +50,6 @@ You can see all possible options your version supports by starting Jamulus with | `-u` |`--numchannels` | Maximum number of users. Default is 10, maximum is 50 | (server only) | | `-w` |`--welcomemessage` | Supports HTML and inline CSS formatting (in enclosing quotes), or set path to text file. | (server only) | | `-z` |`--startminimized` | Start minimized | (server only) | -| |`--ctrlmidich` | MIDI controller channel to listen on and control number offset, format: `channel[;offset]` | (client only) see [Tips & Tricks](Tips-Tricks-More#Using-ctrlmidich-for-MIDI-controllers) | +| |`--ctrlmidich` | MIDI controller channel to listen on, control number offset and consecutive CC numbers (channels) format: `channel[;f*][;p*][;s*][;m*]` | (client only) see [Tips & Tricks](Tips-Tricks-More#Using-ctrlmidich-for-MIDI-controllers) | | |`--clientname` | Window title and JACK client name | (client only) | | |`--serverpublicip` | When running your own central server with own slave servers in a private network, specify your public IP with this option to enable clients from the Internet to connect. You will still need proper port forwarding in your router/firewall.| (server only) | From f6e0e0a67ffe75792eed89f209d447c267e58404 Mon Sep 17 00:00:00 2001 From: ignotus Date: Mon, 15 Feb 2021 14:30:03 +0100 Subject: [PATCH 34/43] Update en-Command-Line-Options.md --- wiki/en/en-Command-Line-Options.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/en/en-Command-Line-Options.md b/wiki/en/en-Command-Line-Options.md index 3c1d5849b..3cb7f7908 100644 --- a/wiki/en/en-Command-Line-Options.md +++ b/wiki/en/en-Command-Line-Options.md @@ -50,6 +50,6 @@ You can see all possible options your version supports by starting Jamulus with | `-u` |`--numchannels` | Maximum number of users. Default is 10, maximum is 50 | (server only) | | `-w` |`--welcomemessage` | Supports HTML and inline CSS formatting (in enclosing quotes), or set path to text file. | (server only) | | `-z` |`--startminimized` | Start minimized | (server only) | -| |`--ctrlmidich` | MIDI controller channel to listen on, control number offset and consecutive CC numbers (channels) format: `channel[;f*][;p*][;s*][;m*]` | (client only) see [Tips & Tricks](Tips-Tricks-More#Using-ctrlmidich-for-MIDI-controllers) | +| |`--ctrlmidich` | MIDI controller channel to listen on, control number offset and consecutive CC numbers (channels). Format: `channel[;f*][;p*][;s*][;m*]` | (client only) see [Tips & Tricks](Tips-Tricks-More#Using-ctrlmidich-for-MIDI-controllers) | | |`--clientname` | Window title and JACK client name | (client only) | | |`--serverpublicip` | When running your own central server with own slave servers in a private network, specify your public IP with this option to enable clients from the Internet to connect. You will still need proper port forwarding in your router/firewall.| (server only) | From 79848dc635597cd1c1dbbda70084ae49995a42ac Mon Sep 17 00:00:00 2001 From: ignotus Date: Mon, 15 Feb 2021 15:57:11 +0100 Subject: [PATCH 35/43] Correction and addition --- wiki/en/en-Tips-Tricks-More.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/en/en-Tips-Tricks-More.md b/wiki/en/en-Tips-Tricks-More.md index 755f1db95..fcf16d762 100644 --- a/wiki/en/en-Tips-Tricks-More.md +++ b/wiki/en/en-Tips-Tricks-More.md @@ -102,7 +102,7 @@ The volume fader, pan control and mute & solo buttons in the client's mixer wind Here, Jamulus listens on MIDI channel 1. Volume fader CC numbers start at 0 and there are 8 of them (so end at CC number 7). Pan controls start at CC number 16 and end at 23; Solo 32 to 39 and Mute 48 to 55. -Fader strips in the mixer window are controlled in ascending order from left to right. Continuing with the above example, in strip number 1 (farthest left), the volume fader would controlled by CC number 0; pan by 16; solo by 32 and mute by 48. As we have specified 8 consecutive controllers for each parameter, this would give us MIDI control over 8 strips in the mixer window. The next strip would be controlled by 1, 17, 33 and 49, and so forth. +Fader strips in the mixer window are controlled in ascending order from left to right. Continuing with the above example, in strip number 1 (farthest left), the volume fader would be controlled by CC number 0; pan by 16; solo by 32 and mute by 48. As we have specified 8 consecutive controllers for each parameter, this would give us MIDI control over 8 strips (volume, pan, solo and mute in each one) in the mixer window. The next strip would be controlled by 1, 17, 33 and 49, and so forth. *Note*: Jamulus does not provide feedback on the state of the Solo and Mute buttons, meaning that your controller must keep track and toggle LEDs (if any) to 'on' or 'off' itself. From a08203060d9af332d7d710691228136a3f89d2cd Mon Sep 17 00:00:00 2001 From: ignotus Date: Mon, 15 Feb 2021 22:09:30 +0100 Subject: [PATCH 36/43] Removed spaces --- wiki/en/en-Client-Troubleshooting.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wiki/en/en-Client-Troubleshooting.md b/wiki/en/en-Client-Troubleshooting.md index 8ff62e5f0..0f1d34aa0 100644 --- a/wiki/en/en-Client-Troubleshooting.md +++ b/wiki/en/en-Client-Troubleshooting.md @@ -67,8 +67,8 @@ See [this forum discussion](https://sourceforge.net/p/llcon/discussion/533517/th (With thanks to [Mark Anthony De Souza](https://www.facebook.com/groups/619274602254947/permalink/765122847670121/?comment_id=765525034296569)) Maybe you did not answer "Yes" to the `"Jamulus wants to access your microphone"` challenge. To fix this: -* Go to `Preferences` > `Security & Privacy` > `Privacy` tab -* Find `Microphone` on the left and then make sure `Jamulus` is enabled on the right-hand list +* Go to `Preferences` > `Security & Privacy` > `Privacy` tab +* Find `Microphone` on the left and then make sure `Jamulus` is enabled on the right-hand list *** From 9b29c60b1edad6244e7b5c054552f7e86ab7a837 Mon Sep 17 00:00:00 2001 From: ignotus Date: Mon, 15 Feb 2021 22:10:17 +0100 Subject: [PATCH 37/43] Removed spaces --- wiki/en/en-Contribution.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wiki/en/en-Contribution.md b/wiki/en/en-Contribution.md index a348fdbe1..0ebae6547 100644 --- a/wiki/en/en-Contribution.md +++ b/wiki/en/en-Contribution.md @@ -15,9 +15,9 @@ See the [Jamulus GitHub repo](https://github.com/jamulussoftware/jamulus) for fu ## Jamulus Website -* If you find a mistake, typo or something out of date (in any language) on the website, you can [open an issue on GitHub](https://github.com/jamulussoftware/jamuluswebsite/issues) or, if you don't have a GitHub account, on [the relevant discussion forum](https://sourceforge.net/p/llcon/discussion/) on SourceForge. +* If you find a mistake, typo or something out of date (in any language) on the website, you can [open an issue on GitHub](https://github.com/jamulussoftware/jamuluswebsite/issues) or, if you don't have a GitHub account, on [the relevant discussion forum](https://sourceforge.net/p/llcon/discussion/) on SourceForge. -* If you think some documentation or information is missing or can be improved, post about that on [the relevant discussion forum](https://sourceforge.net/p/llcon/discussion/) so that it can be discussed first. +* If you think some documentation or information is missing or can be improved, post about that on [the relevant discussion forum](https://sourceforge.net/p/llcon/discussion/) so that it can be discussed first. Have a look at the [CONTRIBUTING file](https://github.com/jamulussoftware/jamuluswebsite/blob/changes/CONTRIBUTING.md) for the website and the [Website GitHub repo](https://github.com/jamulussoftware/jamuluswebsite) for further information. From 1a5a7b32e2ea8d964a6452b17637da5ff3e1e342 Mon Sep 17 00:00:00 2001 From: ignotus Date: Mon, 15 Feb 2021 22:12:08 +0100 Subject: [PATCH 38/43] Correction --- wiki/en/en-Installation-for-Linux.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/en/en-Installation-for-Linux.md b/wiki/en/en-Installation-for-Linux.md index 1dbc5875a..ad2292538 100644 --- a/wiki/en/en-Installation-for-Linux.md +++ b/wiki/en/en-Installation-for-Linux.md @@ -91,7 +91,7 @@ You can now delete the sources directory you compiled from. ### Configure JACK with QjackCtl Jamulus clients need [JACK](https://jackaudio.org/) to run, but you need to configure that first. The recommended method is to use `QjackCtl`. 1. Open the command shell e.g. with Ctrl-Alt-T and -1. Execute the command `qjackctl`. You will see the **JACK Audio Connection Kit** +1. Execute the command `qjackctl`. You will see the **Qt JACK Control utility main page** 2. Configure your audio interface as follows (the exact settings for JACK will depend on what your audio interface/sound card is capable of): - Set the audio **Interface** to the one you want (there may be several in the list) From 0934150ee62912a429ba8634166f645ef65da925 Mon Sep 17 00:00:00 2001 From: ignotus Date: Mon, 15 Feb 2021 22:14:33 +0100 Subject: [PATCH 39/43] Correction --- wiki/en/en-Server-Troubleshooting.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/en/en-Server-Troubleshooting.md b/wiki/en/en-Server-Troubleshooting.md index 984b77f13..64af26ec9 100644 --- a/wiki/en/en-Server-Troubleshooting.md +++ b/wiki/en/en-Server-Troubleshooting.md @@ -37,7 +37,7 @@ Yes. Please see [Server Types](Choosing-a-Server-Type) ### Can I convert my private server to being a public one? -Yes. Simply check the "Make my Server Public" box in the server window and fill out the details. Remember also that you do not need to port forward if you have a public server. +Yes. Simply check the "Make my Server Public" box in the server window and fill out the details. If you register your server, do not use port forwarding as it may prevent others using your server. ### **_Headless Linux_**: I have created a server but it is joining the Central Server and I don't want it to. From 3f0f50571a77e5ca0aa4e6f136810378d85d7c8f Mon Sep 17 00:00:00 2001 From: ignotus Date: Mon, 15 Feb 2021 22:15:40 +0100 Subject: [PATCH 40/43] Update --- wiki/en/en-Server-Win-Mac.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/en/en-Server-Win-Mac.md b/wiki/en/en-Server-Win-Mac.md index d130d518f..72ad8009a 100644 --- a/wiki/en/en-Server-Win-Mac.md +++ b/wiki/en/en-Server-Win-Mac.md @@ -24,7 +24,7 @@ permalink: "/wiki/Server-Win-Mac" 1. Type in the name, city and country so that other users can easily identify you. -1. Specify a music genre if you wish. This will make your server appear in the relevant server list for clients (see more [details on Central Servers](Central-Servers)). +1. Specify a music genre. This will make your server appear in the relevant server list for clients (see more [details on Central Servers](Central-Servers)). _The Chat Welcome Message appears to all users when they join the server (the chat window will open automatically for them)._ From 10d700d1ac85521f6944e250b460e1e8d853e50c Mon Sep 17 00:00:00 2001 From: ignotus Date: Mon, 15 Feb 2021 22:28:24 +0100 Subject: [PATCH 41/43] Some rephrasing --- wiki/en/en-Software-Manual.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/en/en-Software-Manual.md b/wiki/en/en-Software-Manual.md index 85f766271..8eeb40f49 100644 --- a/wiki/en/en-Software-Manual.md +++ b/wiki/en/en-Software-Manual.md @@ -72,7 +72,7 @@ pressing this button will end the session. ![Connect dialog](https://user-images.githubusercontent.com/20726856/97360965-31d76b00-189f-11eb-870b-f58be6e30f04.png) -The Connection Setup window shows a list of available servers together with the number of occupants and the maximum number supported. Server operators can optionally list their servers by music genre. Use the List dropdown to select a genre, click on the server you want to join and press the Connect button to connect to it. Alternatively, double-click on the server name. Permanent servers (those that have been listed for longer than 24 hours) are shown in bold. +The Connection Setup window shows a list of available servers together with the number of occupants and the maximum number supported. Server operators register their servers on lists (mostly defined by genre, though some could be location-specific or for all genres). Use the List dropdown to select a genre, click on the server you want to join and press the Connect button to connect to it. Alternatively, double-click on the server name. Permanent servers (those that have been listed for longer than 24 hours) are shown in bold. You can filter the list by server name or location. To list only occupied servers, enter a "#" character. From f45ae7153f2b671f08b37195cd897a90532b3ccb Mon Sep 17 00:00:00 2001 From: ignotus Date: Tue, 16 Feb 2021 10:40:12 +0100 Subject: [PATCH 42/43] Just realised the next release will be 3.7.0 --- wiki/en/en-Tips-Tricks-More.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/en/en-Tips-Tricks-More.md b/wiki/en/en-Tips-Tricks-More.md index fcf16d762..1caa67006 100644 --- a/wiki/en/en-Tips-Tricks-More.md +++ b/wiki/en/en-Tips-Tricks-More.md @@ -96,7 +96,7 @@ jack_connect Jamulus:'output right' system:playback_2 ## Using ctrlmidich for MIDI controllers -The volume fader, pan control and mute & solo buttons in the client's mixer window strips can be controlled using a MIDI controller by using the `--ctrlmidich` parameter (note: only available for use with macOS and Linux using Jamulus version 3.6.3 or higher). To enable this feature, Jamulus must be launched with `--ctrlmidich`. There is one global MIDI channel parameter (1-16) and two parameters you can set for each item controlled: `offset` and `consecutive CC numbers`. Set the first parameter to the channel you want Jamulus to listen on (0 for all channels) and then specify the items you want to control (f = volume fader; p = pan; m = mute; s = solo) with the offset (CC number to start from) and number of consecutive CC numbers. Take the following example: +The volume fader, pan control and mute & solo buttons in the client's mixer window strips can be controlled using a MIDI controller by using the `--ctrlmidich` parameter (note: only available for use with macOS and Linux using Jamulus version 3.7.0 or higher). To enable this feature, Jamulus must be launched with `--ctrlmidich`. There is one global MIDI channel parameter (1-16) and two parameters you can set for each item controlled: `offset` and `consecutive CC numbers`. Set the first parameter to the channel you want Jamulus to listen on (0 for all channels) and then specify the items you want to control (f = volume fader; p = pan; m = mute; s = solo) with the offset (CC number to start from) and number of consecutive CC numbers. Take the following example: `--ctrlmidich '1;f0*8;p16*8;s32*8;m48*8'` From eb92cc27ea55ee4b2189bcf9a29c158f092f87f7 Mon Sep 17 00:00:00 2001 From: ignotus Date: Wed, 17 Feb 2021 14:02:35 +0100 Subject: [PATCH 43/43] Update en-Tips-Tricks-More.md --- wiki/en/en-Tips-Tricks-More.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/en/en-Tips-Tricks-More.md b/wiki/en/en-Tips-Tricks-More.md index 1caa67006..d830d8716 100644 --- a/wiki/en/en-Tips-Tricks-More.md +++ b/wiki/en/en-Tips-Tricks-More.md @@ -96,7 +96,7 @@ jack_connect Jamulus:'output right' system:playback_2 ## Using ctrlmidich for MIDI controllers -The volume fader, pan control and mute & solo buttons in the client's mixer window strips can be controlled using a MIDI controller by using the `--ctrlmidich` parameter (note: only available for use with macOS and Linux using Jamulus version 3.7.0 or higher). To enable this feature, Jamulus must be launched with `--ctrlmidich`. There is one global MIDI channel parameter (1-16) and two parameters you can set for each item controlled: `offset` and `consecutive CC numbers`. Set the first parameter to the channel you want Jamulus to listen on (0 for all channels) and then specify the items you want to control (f = volume fader; p = pan; m = mute; s = solo) with the offset (CC number to start from) and number of consecutive CC numbers. Take the following example: +The volume fader, pan control and mute and solo buttons in the client's mixer window strips can be controlled using a MIDI controller by using the `--ctrlmidich` parameter (note: only available for use with macOS and Linux using Jamulus version 3.7.0 or higher). To enable this feature, Jamulus must be launched with `--ctrlmidich`. There is one global MIDI channel parameter (1-16) and two parameters you can set for each item controlled: `offset` and `consecutive CC numbers`. Set the first parameter to the channel you want Jamulus to listen on (0 for all channels) and then specify the items you want to control (f = volume fader; p = pan; m = mute; s = solo) with the offset (CC number to start from) and number of consecutive CC numbers. Take the following example: `--ctrlmidich '1;f0*8;p16*8;s32*8;m48*8'`