diff --git a/wiki/en/en-Installation-for-Macintosh.md b/wiki/en/en-Installation-for-Macintosh.md index bc89e07f1..0676d21b8 100644 --- a/wiki/en/en-Installation-for-Macintosh.md +++ b/wiki/en/en-Installation-for-Macintosh.md @@ -10,13 +10,12 @@ permalink: "/wiki/Installation-for-Macintosh" 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. **Open the downloaded `.dmg` file**. Agree to the license. You will now see two icons (Jamulus client and server). -1. **Drag and drop both icons into your Applications folder** to install Jamulus. +1. **Install Jamulus**: Open the downloaded `.dmg` file, agree to the license, *drag and drop* the two icons you see in the window (Jamulus client and server) into your *Applications folder*. After that, you can close this window. 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. _You can remove the folder in the Downloads directory containing the `.dmg` and eject the "Jamulus" drive on your desktop. They are no longer needed._ -You can also [compile your own binary](Compiling#macos) if you feel so inclined. +*** ## "Jamulus" can't be opened because the developer cannot be verified diff --git a/wiki/en/en-Installation-for-Windows.md b/wiki/en/en-Installation-for-Windows.md index b414480cf..cbe16b594 100644 --- a/wiki/en/en-Installation-for-Windows.md +++ b/wiki/en/en-Installation-for-Windows.md @@ -7,23 +7,21 @@ 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)](https://www.asio4all.org){: target="_blank" rel="noopener noreferrer"} before installing Jamulus. -1. [Download Jamulus](https://sourceforge.net/projects/llcon/files/latest/download){: .button target="_blank" rel="noopener noreferrer"}. -1. **Install Jamulus** 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 an ASIO Driver**. It is recommended to use a sound card/interface with a native ASIO driver. If you don't have an external sound card, you probably need to install [this free ASIO driver (ASIO4ALL)](https://www.asio4all.org){: target="_blank" rel="noopener noreferrer"} before installing Jamulus. +1. [Download Jamulus](https://sourceforge.net/projects/llcon/files/latest/download){: .button target="_blank" rel="noopener noreferrer"} +1. **Install Jamulus**: Double click the Jamulus installer. 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#windows) if you feel so inclined. +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). *** ## Setting up ASIO4ALL -*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.* +*Most internal sound cards need this driver. ASIO4ALL is not recommended if your audio interface provides its own ASIO driver, since that might have better latency.* -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. +For ASIO4ALL, you may need to experiment a bit to find the right configuration since every computer is a bit different. 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. 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. **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. 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) @@ -31,13 +29,13 @@ Before you start with Jamulus: 1. Open Jamulus's settings 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 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. 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. Now enable the correct inputs/outputs in the list under your soundcard and disable everything else -**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. +**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. +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. ### Having trouble with ASIO4ALL setup? diff --git a/wiki/en/en-Onboarding.md b/wiki/en/en-Onboarding.md index 4934d58e2..9ad4058c9 100644 --- a/wiki/en/en-Onboarding.md +++ b/wiki/en/en-Onboarding.md @@ -9,11 +9,17 @@ Let's have a look at what Jamulus looks like and what you should do after having ## First start Before you start Jamulus: 1. For now, **close all other applications**. It's best to start from zero at first. -2. **Connect everything** (Ethernet cable, audio gear, etc.) +1. **Connect everything** (Ethernet cable, audio gear, etc.) ... to *minimise load* on your computer and to ensure that *no other application* tries to use your sound card. -You can have a look at [Hardware Setup](Hardware-Setup) for more information on what to do with your equipment. If you need help setting up ASIO4ALL on Windows, have a look at the [ASIO4ALL Setup guide on the Windows installation page](Installation-for-Windows#setting-up-asio4all). +### Setting up your audio +If you haven't done this already, please do so by plugging in your hardware (if you need to), opening Jamulus's settings and selecting your input/output devices. + +* If you need help setting up ASIO4ALL on Windows, have a look at the [ASIO4ALL Setup guide on the Windows installation page](Installation-for-Windows#setting-up-asio4all). +* macOS users just need to select their input/output devices in Jamulus's settings. + +You can also have a look at [Hardware Setup](Hardware-Setup) for more information on what to do with your equipment. ### Jamulus main window When you open Jamulus, you will see a window which looks like this: @@ -29,7 +35,12 @@ Now you will see this: Fill in at least "Alias/Name" to set your name and close the window. ### 2. Connecting to a server -Now you are set up, you can use the "Connect" button in the Jamulus main window to join a server. A window will now open in which you can find *servers grouped by genre*. To select another genre, select one from the list in the top left. After having selected a genre and server, join a server by clicking on "Connect". If you have problems here, they are most likely due to wrongly configured audio gear or network issues. Have a look at the [Troubleshooting page](Client-Troubleshooting). +Now you are set up, you can use the "Connect" button in the Jamulus main window to join a server. A window will now open: + +![Connection Setup](https://user-images.githubusercontent.com/20726856/102825226-a1b92c00-43de-11eb-9aa9-21d7a8576f5c.png) + +This window shows *servers grouped by genre*. To select another genre, select one from the list in the top left. After having selected a genre and server, join a server by clicking on "Connect". If you have problems here, they are most likely due to wrongly configured audio gear or network issues. Have a look at the [Troubleshooting page](Client-Troubleshooting). + ### The first Jam Congrats! You can now start jamming with Jamulus. The sliders you see on the right are your own personal mix. Everything you change here will change what you hear, but won't affect others. If you move a slider down, that user will be quieter, if you move it up, that user will be louder for you.