From 747f23294670d831271c179a3385d5608914cc06 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Sat, 28 Nov 2020 21:46:43 +0100 Subject: [PATCH 01/11] Restructure wiki a bit --- Gemfile.lock | 4 ++-- wiki/en/en-Getting-Started.md | 14 ++++++------ wiki/en/en-Hardware-Setup.md | 14 +++++------- wiki/en/en-Installation-for-Linux.md | 3 ++- wiki/en/en-Installation-for-Macintosh.md | 16 ++++++-------- wiki/en/en-Installation-for-Windows.md | 27 ++++++++++++------------ wiki/en/en-Jamulus-Walk-Through.md | 22 +++++++++++++++++++ 7 files changed, 57 insertions(+), 43 deletions(-) create mode 100644 wiki/en/en-Jamulus-Walk-Through.md diff --git a/Gemfile.lock b/Gemfile.lock index c4a1f9282..0acd41092 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -52,7 +52,7 @@ GEM kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) liquid (4.0.3) - listen (3.2.1) + listen (3.3.2) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.4.0) @@ -63,7 +63,7 @@ GEM rb-inotify (0.10.1) ffi (~> 1.0) rexml (3.2.4) - rouge (3.23.0) + rouge (3.25.0) safe_yaml (1.0.5) sassc (2.4.0) ffi (~> 1.9) diff --git a/wiki/en/en-Getting-Started.md b/wiki/en/en-Getting-Started.md index bff85e0a5..305ab4f99 100644 --- a/wiki/en/en-Getting-Started.md +++ b/wiki/en/en-Getting-Started.md @@ -15,13 +15,13 @@ permalink: "/wiki/Getting-Started" ## Maximise quality, minimise delay -### 1. Use an audio interface/external microphone, not your internal sound card +### 1. Minimize internet traffic and close all programs on your PC -Unless you are a musician with a (USB) microphone, you are strongly advised to use an audio interface: a box that you can plug your instrument(s) into. This will connect to your PC usually via USB. See [Hardware Setup](Hardware-Setup). +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. Minimize internet traffic and close all programs on your PC +### 2. Use an audio interface/external microphone, not your internal sound card -Try to make sure nothing on your machine or your network (like a video stream) is competing against Jamulus when you are using it. +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 an USB microphone. See [recommended hardware](#recommended-hardware). ### 3. Connect to the servers with the lowest ping times @@ -37,11 +37,9 @@ Now that you have the basics down, let's go: Also - [Jamulus OS!](https://sourceforge.net/projects/jamulus-os/files/JamulusOS/) Run Jamulus on any computer using a USB stick (64-bit systems only). Checks your hardware and sets you up like a boss straight out of the box! -## All installed? +## Recommended hardware -If you set up Jamulus, have a look [Hardware Setup](Hardware-Setup) - -For detailed information on using Jamulus, please see the [Help Manual](https://github.com/corrados/jamulus/blob/master/src/res/homepage/manual.md). +See [the list of known good hardware](Sound-Devices) and [Hardware Setup](Hardware-Setup). ## Other guides * [This excellent guide](https://www.facebook.com/notes/jamulus-online-musicianssingers-jamming/idiots-guide-to-jamulus-app/510044532903831/){: target="_blank" rel="noopener noreferrer"} by [Simon Tomlinson](https://www.facebook.com/simon.james.tomlinson?eid=ARBQoY3KcZAtS3pGdLJuqvQTeRSOo4gHdQZT7nNzOt1oPMGgZ4_3GERe-rOyH5PxsSHVYYXjWwcqd71a){: target="_blank" rel="noopener noreferrer"} (_Facebook_) might also be worth a view. diff --git a/wiki/en/en-Hardware-Setup.md b/wiki/en/en-Hardware-Setup.md index ad3ede7e7..6afdadb75 100644 --- a/wiki/en/en-Hardware-Setup.md +++ b/wiki/en/en-Hardware-Setup.md @@ -25,26 +25,26 @@ 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){: target="_blank" rel="noopener noreferrer"}. 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 +#### 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 the 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)](http://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. #### 2. Start Jamulus -Configure Jamulus to use the correct sound setup (see [this excellent guide](https://www.facebook.com/notes/jamulus-online-musicianssingers-jamming/idiots-guide-to-jamulus-app/510044532903831/) by [Simon Tomlinson](https://www.facebook.com/simon.james.tomlinson?eid=ARBQoY3KcZAtS3pGdLJuqvQTeRSOo4gHdQZT7nNzOt1oPMGgZ4_3GERe-rOyH5PxsSHVYYXjWwcqd71a) on Facebook). +Configure Jamulus to use the correct sound setup (see [this excellent guide](https://www.facebook.com/notes/jamulus-online-musicianssingers-jamming/idiots-guide-to-jamulus-app/510044532903831/) by [Simon Tomlinson](https://www.facebook.com/simon.james.tomlinson?eid=ARBQoY3KcZAtS3pGdLJuqvQTeRSOo4gHdQZT7nNzOt1oPMGgZ4_3GERe-rOyH5PxsSHVYYXjWwcqd71a) on Facebook). Make sure you have switched off the monitor button on your Behringer U-CONTROL UCA202 (otherwise you will hear both the original sound you are sending to the Jamulus server as well as the returning sound, and may get feedback). -#### 3. Plug in your instrument and headphones +#### 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. @@ -71,10 +71,6 @@ You might want to install [Ubuntu Studio](https://ubuntustudio.org/){: target="_ _(Thanks to [pcar75](https://github.com/pcar75) for this information)_ - - - - ## Other examples **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 Mbps down / 1 Mbps upstream via DSL. diff --git a/wiki/en/en-Installation-for-Linux.md b/wiki/en/en-Installation-for-Linux.md index 83d213fa4..e1f07f403 100644 --- a/wiki/en/en-Installation-for-Linux.md +++ b/wiki/en/en-Installation-for-Linux.md @@ -5,7 +5,6 @@ lang: "en" permalink: "/wiki/Installation-for-Linux" --- - # Installation for Linux Make sure you read the [Getting Started](Getting-Started) page. @@ -88,6 +87,8 @@ Jamulus puts itself into `/usr/local/bin`. You can now delete the sources direct If you get problems with sound breaking up (in particular XRUN errors reported by Jack/QJackCtl) try setting bigger values (eg 256 frames or 3 periods) in step 3 above. Lower ones (eg 64 frames) could bring better performance but maybe more sound problems. See the [troubleshooting page](Client-Troubleshooting) otherwise. ## All installed? +Move on to the [Jamulus walk through page](Jamulus-Walk-Through) + Have a look at [Hardware Setup](Hardware-Setup). For detailed information on using Jamulus, please see the [help manual](https://github.com/corrados/jamulus/blob/master/src/res/homepage/manual.md). diff --git a/wiki/en/en-Installation-for-Macintosh.md b/wiki/en/en-Installation-for-Macintosh.md index 089739c3c..5b406727d 100644 --- a/wiki/en/en-Installation-for-Macintosh.md +++ b/wiki/en/en-Installation-for-Macintosh.md @@ -11,7 +11,7 @@ Make sure you've already read the [Getting Started](Getting-Started) page. 1. [Download Jamulus](https://sourceforge.net/projects/llcon/files/latest/download){: target="_blank" rel="noopener noreferrer" .button} 1. **Extract the downloaded .zip file.** Double-click on the .zip file, which will create a new folder with the same name. The folder contains the license file and a `.dmg` file containing the application. -1. **Double-click the `.dmg` file** to open it. It will unpack and you will see two files (Jamulus client and server) +1. **Double-click the `.dmg` file** to open it. It will unpack and you will see two files (Jamulus client and server). Agree to the license. 1. **Drag and drop both icons into your Applications folder** to install Jamulus. 1. **Run Jamulus**. Now you should be able to use Jamulus just like any other application. If you see a message which tells you that Jamulus can't be opened because the developer can't be verified, read on and have a look at the following section. @@ -23,17 +23,13 @@ You can also [compile your own binary](Compiling) if you feel so inclined. ![Jamulus blocked by Gatekeeper](https://user-images.githubusercontent.com/20726856/99886769-67256d80-2c3f-11eb-91e9-9cb2b6f80f95.png) -**The first time you try to double-click Jamulus to run it, you will probably see a message saying it cannot be opened since we don't code-sign Jamulus yet (it's quite expensive)** +The first time you try to double-click Jamulus to run it, you will probably see a message saying it cannot be opened. We don't code-sign Jamulus yet (it's quite expensive). -To fix this, navigate to the Applications folder via Finder click on Jamulus, right-click (or control-click), and select "Open" from the top of the menu. +To open Jamulus, navigate to the Applications folder via Finder click on Jamulus, right-click (or control-click), and select "Open" from the top of the menu. -You will then get a slightly different version of the same message, which allows you to click Open and go ahead with running it. You will not be shown this warning again - just double-click it to run after that. -For further information see [this Apple Support Page](https://support.apple.com/en-gb/guide/mac-help/mh40616/mac){: target="_blank" rel="noopener noreferrer"}. - -**See also [this excellent guide](http://web.archive.org/web/20200406181452/https://www.facebook.com/notes/jamulus-online-musicianssingers-jamming/idiots-guide-to-jamulus-app/510044532903831/){: target="_blank" rel="noopener noreferrer"} by [Simon Tomlinson](https://www.facebook.com/simon.james.tomlinson?eid=ARBQoY3KcZAtS3pGdLJuqvQTeRSOo4gHdQZT7nNzOt1oPMGgZ4_3GERe-rOyH5PxsSHVYYXjWwcqd71a){: target="_blank" rel="noopener noreferrer"} (or [directly on Facebook](https://www.facebook.com/notes/jamulus-online-musicianssingers-jamming/idiots-guide-to-jamulus-app/510044532903831/){: target="_blank" rel="noopener noreferrer"}).** +You will then get a slightly different version of the same message, which allows you to click "Open" and go ahead with running it. You will not be shown this warning again - just double-click it to run after that. +For further information about this warning see [this Apple Support Page](https://support.apple.com/en-gb/guide/mac-help/mh40616/mac){: target="_blank" rel="noopener noreferrer"}. ## All installed? -Jamulus has been installed and can be used now. If you haven't set up your audio gear yet, have a look at [Hardware Setup](Hardware-Setup). - -For detailed information on using Jamulus, please see the [help manual](https://github.com/corrados/jamulus/blob/master/src/res/homepage/manual.md). +Move on to the [Jamulus walk through page](Jamulus-Walk-Through) diff --git a/wiki/en/en-Installation-for-Windows.md b/wiki/en/en-Installation-for-Windows.md index 348204449..dcb3a67e4 100644 --- a/wiki/en/en-Installation-for-Windows.md +++ b/wiki/en/en-Installation-for-Windows.md @@ -8,7 +8,8 @@ permalink: "/wiki/Installation-for-Windows" # Installation for Windows Make sure you read the [Getting Started](Getting-Started) page. 1. **Download and install an ASIO Driver**. It is recommended to use a sound card/interface with a native ASIO driver. If you don't have one (especially internal sound cards), install [this free ASIO driver (ASIO4All)](http://www.asio4all.org){: target="_blank" rel="noopener noreferrer"} before installing Jamulus. -1. **Download and install Jamulus** from the [Jamulus project page](https://sourceforge.net/projects/llcon/files/latest/download){: target="_blank" rel="noopener noreferrer"}. If you get a warning notice from SmartScreen, click on "More info" and "Run anyway" to install Jamulus. This is needed since we don't pay for code signing yet. +1. [Download and install Jamulus](https://sourceforge.net/projects/llcon/files/latest/download){: target="_blank" rel="noopener noreferrer"}. If you get a warning notice from SmartScreen, click on "More info" and "Run anyway" to install Jamulus. This is needed since we don't pay for code signing yet. +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 ([scroll down](#setting-up-asio4all)), and afterwards at [Hardware Setup](Hardware-Setup). You can also [compile your own binary](Compiling) if you feel so inclined. @@ -16,34 +17,34 @@ You can also [compile your own binary](Compiling) if you feel so inclined. *** ## Setting up ASIO4All -*ASIO4All is not recommended if your audio interface provides its own ASIO driver, since that might have better latency.* +*Most internal soundcards need this driver. ASIO4All is not recommended if your audio interface provides its own ASIO driver, since that might have better latency.* -First of all **close all applications** (especially those which could access your soundcard like your browser) to minimize conflicts since Jamulus needs exclusive access to your sound card. If the audio doesn’t work out of the box, make sure that only the **correct inputs/outputs** in its control panel **are switched on**. -You may need to experiment a bit to find the right ones since every computer is a bit different. Do this while you're connected to a server to hear your instrument or voice and check if everything is correctly setup. +For ASIO4All, you may need to experiment a bit to find the right configuration since every computer is a bit different. Setup your soundcard while you're connected to a server to hear your instrument or voice and check if everything is correctly setup. + +Before you start with Jamulus: +1. **Close all applications** (especially those which could access your soundcard like your browser/media player) since Jamulus needs exclusive access to your sound card. +1. If the 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) 1. Open Jamulus's settings 1. Go to _"ASIO Settings"_ 1. Enable _advanced view_ in ASIO4All (click the tool icon on the bottom right) -1. Open your soundcard inputs by clicking the _plus icon_ next to the soundcard name. -1. Now enable/disable the correct inputs/outputs +1. Enable only the soundcard you want to use by clicking on the button next to its name +1. Open your soundcard inputs by clicking the _plus icon_ next to this soundcard +1. Now enable the correct inputs/outputs in the list under your soundcard and disable everything else -Many internal sound cards are named Realtek High Definition Audio, Conexant or similar. -Headphones and speakers are often labeled as output and microphones as inputs. +**Hint:** Many internal sound cards are named Realtek High Definition Audio, Conexant or similar. Concerning the inputs/outputs: Headphones and speakers are often labeled 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. ### Having trouble with ASIO4All setup? -Although ASIO4All might work out of the box, you might also experience problems with its setup. - If nothing works, first of all try to **restart Jamulus and/or your PC**. Afterwards try to **setup the inputs/outputs again**. Enabled and accessible inputs/outputs show a lit up on/off button and a play button. If you see a red cross or a yellow symbol, you might need to close other applications like your browser, Zoom, ... Have a look at [this video](https://youtu.be/_GzOsitVgLI){: target="_blank" rel="noopener noreferrer"} from @trombonepizza which gives more detailed setup information on ASIO4All. -Official and more detailed info 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. This can most likely be found on your desktop or in the folder where the ASIO4All binary is installed (usually `C:\Program Files (x86)\ASIO4ALL v2\`). +Official and more detailed 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. This can most likely be found on your desktop or in the folder where the ASIO4All binary is installed (usually `C:\Program Files (x86)\ASIO4ALL v2\`). ## All installed? -Jamulus has been installed and can be used now. If you haven't set up your audio gear yet, have a look at [Hardware Setup](Hardware-Setup). -For detailed information on using Jamulus, please see the [help manual](https://github.com/corrados/jamulus/blob/master/src/res/homepage/manual.md). +Move on to the [Jamulus walk through page](Jamulus-Walk-Through) diff --git a/wiki/en/en-Jamulus-Walk-Through.md b/wiki/en/en-Jamulus-Walk-Through.md new file mode 100644 index 000000000..7e462d0de --- /dev/null +++ b/wiki/en/en-Jamulus-Walk-Through.md @@ -0,0 +1,22 @@ +--- +layout: wiki +title: "Jamulus walk-through" +lang: "en" +permalink: "/wiki/Jamulus-Walk-Through" +--- +# Jamulus walk-through +Let's have a look what Jamulus looks like and what you should do if you've installed it. +## GUI description +### Setting a profile +### Connecting to a server +### The first online Jam +## Advanced +* See the tips & tricks sections +* See setting up a server + +## Help and Community +### Discussion Forums +Description; Link to SourceForge +### Development and contribution +Link to contributing page (do we even need this page in the documentation? Is the contributing file on the documentation Repo and Jamulus repo not enough?) and GitHub +* See compiling From e54aabd7b6815c1f3ef32bd287c1c12308f91b94 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Sat, 28 Nov 2020 22:51:39 +0100 Subject: [PATCH 02/11] Update en-Installation-for-Linux.md --- 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 e1f07f403..ae8349aa8 100644 --- a/wiki/en/en-Installation-for-Linux.md +++ b/wiki/en/en-Installation-for-Linux.md @@ -87,7 +87,7 @@ Jamulus puts itself into `/usr/local/bin`. You can now delete the sources direct If you get problems with sound breaking up (in particular XRUN errors reported by Jack/QJackCtl) try setting bigger values (eg 256 frames or 3 periods) in step 3 above. Lower ones (eg 64 frames) could bring better performance but maybe more sound problems. See the [troubleshooting page](Client-Troubleshooting) otherwise. ## All installed? -Move on to the [Jamulus walk through page](Jamulus-Walk-Through) +Jamulus has been installed and can be used now. You can now have a look at the [Jamulus walk through page](Jamulus-Walk-Through) Have a look at [Hardware Setup](Hardware-Setup). For detailed information on using Jamulus, please see the [help manual](https://github.com/corrados/jamulus/blob/master/src/res/homepage/manual.md). From 90e5fbb232179af498807d0b9ba5fdcf428e91fa Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Sat, 28 Nov 2020 22:52:42 +0100 Subject: [PATCH 03/11] 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 5b406727d..4dee2f561 100644 --- a/wiki/en/en-Installation-for-Macintosh.md +++ b/wiki/en/en-Installation-for-Macintosh.md @@ -32,4 +32,4 @@ For further information about this warning see [this Apple Support Page](https:/ ## All installed? -Move on to the [Jamulus walk through page](Jamulus-Walk-Through) +Jamulus has been installed and can be used now. You can now take a look at the [Jamulus walk through page](Jamulus-Walk-Through). From 63aaa3deb020b83b113707106693566a5ea4568c Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Sat, 28 Nov 2020 22:53:56 +0100 Subject: [PATCH 04/11] 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 dcb3a67e4..97b729fdd 100644 --- a/wiki/en/en-Installation-for-Windows.md +++ b/wiki/en/en-Installation-for-Windows.md @@ -47,4 +47,4 @@ Official and more detailed information about how to configure ASIO4All is docume ## All installed? -Move on to the [Jamulus walk through page](Jamulus-Walk-Through) +Jamulus has been installed and can be used now. You can now take a look at the [Jamulus walk through page](Jamulus-Walk-Through) From 534f93cc0d051c475e07d38596b215fe578c3bfb Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Sat, 28 Nov 2020 22:54:37 +0100 Subject: [PATCH 05/11] Update en-Installation-for-Linux.md --- 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 ae8349aa8..d2ae5390f 100644 --- a/wiki/en/en-Installation-for-Linux.md +++ b/wiki/en/en-Installation-for-Linux.md @@ -87,7 +87,7 @@ Jamulus puts itself into `/usr/local/bin`. You can now delete the sources direct If you get problems with sound breaking up (in particular XRUN errors reported by Jack/QJackCtl) try setting bigger values (eg 256 frames or 3 periods) in step 3 above. Lower ones (eg 64 frames) could bring better performance but maybe more sound problems. See the [troubleshooting page](Client-Troubleshooting) otherwise. ## All installed? -Jamulus has been installed and can be used now. You can now have a look at the [Jamulus walk through page](Jamulus-Walk-Through) +Jamulus has been installed and can be used now. You can now take a look at the [Jamulus walk through page](Jamulus-Walk-Through) Have a look at [Hardware Setup](Hardware-Setup). For detailed information on using Jamulus, please see the [help manual](https://github.com/corrados/jamulus/blob/master/src/res/homepage/manual.md). From bbc99c4469cdcfc082b5e5fcd89aa9669d04d1e8 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Sat, 28 Nov 2020 23:05:29 +0100 Subject: [PATCH 06/11] Add packages --- wiki/en/en-Installation-for-Linux.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/wiki/en/en-Installation-for-Linux.md b/wiki/en/en-Installation-for-Linux.md index d2ae5390f..32c8baecb 100644 --- a/wiki/en/en-Installation-for-Linux.md +++ b/wiki/en/en-Installation-for-Linux.md @@ -8,9 +8,11 @@ permalink: "/wiki/Installation-for-Linux" # Installation for Linux Make sure you read the [Getting Started](Getting-Started) page. -**Right now, we don't provide official packages for Jamulus** +## Jamulus packages -There is a list of unofficial [packages for different distributions here](https://github.com/corrados/jamulus/issues/223#issue-619038918){: target="_blank" rel="noopener noreferrer"}, but compiling the sources is quite easy: +Although we don't provide official packages, you might find Jamulus in the package manager if your distro. Have a look at this table: +[![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){: target="_blank" rel="noopener noreferrer"}. If you don't find it in your package manager, you needto compile Jamulus from source. That's quite easy: ## Get Jamulus sources From 38b98e6f5de8f118d431e28be125fc589af95501 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Sat, 28 Nov 2020 23:08:01 +0100 Subject: [PATCH 07/11] Update en-Installation-for-Linux.md --- 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 32c8baecb..f7dcb15e5 100644 --- a/wiki/en/en-Installation-for-Linux.md +++ b/wiki/en/en-Installation-for-Linux.md @@ -10,9 +10,9 @@ Make sure you read the [Getting Started](Getting-Started) page. ## Jamulus packages -Although we don't provide official packages, you might find Jamulus in the package manager if your distro. Have a look at this table: +Although we don't provide official packages, you might find Jamulus in the package manager of your distro. Have a look at this table: [![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){: target="_blank" rel="noopener noreferrer"}. If you don't find it in your package manager, you needto compile Jamulus from source. That's quite easy: +There is also list of unofficial [packages for different distributions here](https://github.com/corrados/jamulus/issues/223){: target="_blank" rel="noopener noreferrer"}. If you don't find it in your package manager, you need to compile Jamulus from source. That's quite easy: ## Get Jamulus sources From 4498aadf83130531097447d83797ef09cf620ee6 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Sun, 29 Nov 2020 22:25:21 +0100 Subject: [PATCH 08/11] Delete en-Jamulus-Walk-Through.md --- wiki/en/en-Jamulus-Walk-Through.md | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 wiki/en/en-Jamulus-Walk-Through.md diff --git a/wiki/en/en-Jamulus-Walk-Through.md b/wiki/en/en-Jamulus-Walk-Through.md deleted file mode 100644 index 7e462d0de..000000000 --- a/wiki/en/en-Jamulus-Walk-Through.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -layout: wiki -title: "Jamulus walk-through" -lang: "en" -permalink: "/wiki/Jamulus-Walk-Through" ---- -# Jamulus walk-through -Let's have a look what Jamulus looks like and what you should do if you've installed it. -## GUI description -### Setting a profile -### Connecting to a server -### The first online Jam -## Advanced -* See the tips & tricks sections -* See setting up a server - -## Help and Community -### Discussion Forums -Description; Link to SourceForge -### Development and contribution -Link to contributing page (do we even need this page in the documentation? Is the contributing file on the documentation Repo and Jamulus repo not enough?) and GitHub -* See compiling From 18cfc3613197d6192586ba1736d777992a824764 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Sun, 29 Nov 2020 22:29:36 +0100 Subject: [PATCH 09/11] Remove walk through references --- wiki/en/en-Installation-for-Linux.md | 2 +- wiki/en/en-Installation-for-Macintosh.md | 5 ++++- wiki/en/en-Installation-for-Windows.md | 5 ++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/wiki/en/en-Installation-for-Linux.md b/wiki/en/en-Installation-for-Linux.md index f7dcb15e5..149014f66 100644 --- a/wiki/en/en-Installation-for-Linux.md +++ b/wiki/en/en-Installation-for-Linux.md @@ -89,7 +89,7 @@ Jamulus puts itself into `/usr/local/bin`. You can now delete the sources direct If you get problems with sound breaking up (in particular XRUN errors reported by Jack/QJackCtl) try setting bigger values (eg 256 frames or 3 periods) in step 3 above. Lower ones (eg 64 frames) could bring better performance but maybe more sound problems. See the [troubleshooting page](Client-Troubleshooting) otherwise. ## All installed? -Jamulus has been installed and can be used now. You can now take a look at the [Jamulus walk through page](Jamulus-Walk-Through) +Jamulus has been installed and can be used now. Have a look at [Hardware Setup](Hardware-Setup). For detailed information on using Jamulus, please see the [help manual](https://github.com/corrados/jamulus/blob/master/src/res/homepage/manual.md). diff --git a/wiki/en/en-Installation-for-Macintosh.md b/wiki/en/en-Installation-for-Macintosh.md index 4dee2f561..0a77a34f9 100644 --- a/wiki/en/en-Installation-for-Macintosh.md +++ b/wiki/en/en-Installation-for-Macintosh.md @@ -32,4 +32,7 @@ For further information about this warning see [this Apple Support Page](https:/ ## All installed? -Jamulus has been installed and can be used now. You can now take a look at the [Jamulus walk through page](Jamulus-Walk-Through). +Jamulus has been installed and can be used now. + +Have a look at [Hardware Setup](Hardware-Setup). +For detailed information on using Jamulus, please see the [help manual](https://github.com/corrados/jamulus/blob/master/src/res/homepage/manual.md). diff --git a/wiki/en/en-Installation-for-Windows.md b/wiki/en/en-Installation-for-Windows.md index 97b729fdd..45c1dc14f 100644 --- a/wiki/en/en-Installation-for-Windows.md +++ b/wiki/en/en-Installation-for-Windows.md @@ -47,4 +47,7 @@ Official and more detailed information about how to configure ASIO4All is docume ## All installed? -Jamulus has been installed and can be used now. You can now take a look at the [Jamulus walk through page](Jamulus-Walk-Through) +Jamulus has been installed and can be used now. + +Have a look at [Hardware Setup](Hardware-Setup). +For detailed information on using Jamulus, please see the [help manual](https://github.com/corrados/jamulus/blob/master/src/res/homepage/manual.md). From abbcce77bc33cf18fc56128b27d22226fddb62ee Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Sun, 29 Nov 2020 22:39:11 +0100 Subject: [PATCH 10/11] 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 45c1dc14f..9fb7c049c 100644 --- a/wiki/en/en-Installation-for-Windows.md +++ b/wiki/en/en-Installation-for-Windows.md @@ -49,5 +49,5 @@ Official and more detailed information about how to configure ASIO4All is docume Jamulus has been installed and can be used now. -Have a look at [Hardware Setup](Hardware-Setup). +If you haven't set up your audio gear yet, have a look at [Hardware Setup](Hardware-Setup). For detailed information on using Jamulus, please see the [help manual](https://github.com/corrados/jamulus/blob/master/src/res/homepage/manual.md). From 18dd1b1306f24205f4b78f4fe7fc24447c299933 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Sat, 5 Dec 2020 12:47:56 +0100 Subject: [PATCH 11/11] Typography and grammar fix --- wiki/en/en-Getting-Started.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/en/en-Getting-Started.md b/wiki/en/en-Getting-Started.md index 305ab4f99..cf1af9afd 100644 --- a/wiki/en/en-Getting-Started.md +++ b/wiki/en/en-Getting-Started.md @@ -21,7 +21,7 @@ Try to make sure nothing on your machine or your network (like a video stream) i ### 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 an USB microphone. See [recommended hardware](#recommended-hardware). +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). ### 3. Connect to the servers with the lowest ping times