From 7ce58d8cf0768426aaaac5bbaa1e6e00ab8e791c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9rald=20Niel?= Date: Sat, 28 Nov 2020 19:50:52 +0100 Subject: [PATCH 001/280] W: [en] fix #88 --- _data/en/navigation.yml | 2 +- wiki/en/en-Command-Line-Options.md | 2 +- wiki/en/en-Compiling.md | 2 +- wiki/en/en-Installation-for-Macintosh.md | 4 ++-- wiki/en/en-Multiple-Audio-Interfaces.md | 3 +-- wiki/en/en-Running-a-Server.md | 2 +- wiki/en/en-Server-Win-Mac.md | 6 +++--- wiki/en/en-Software-Manual.md | 6 +++--- wiki/en/en-Software-Synth.md | 14 +++++++------- wiki/en/en-Tips-Tricks-More.md | 18 +++++++++--------- 10 files changed, 29 insertions(+), 30 deletions(-) diff --git a/_data/en/navigation.yml b/_data/en/navigation.yml index 61a531025..ffb1099b2 100644 --- a/_data/en/navigation.yml +++ b/_data/en/navigation.yml @@ -6,7 +6,7 @@ nav: subsubfolderitems: - page: Windows url: /wiki/Installation-for-Windows - - page: Macintosh + - page: macOS url: /wiki/Installation-for-Macintosh - page: Linux url: /wiki/Installation-for-Linux diff --git a/wiki/en/en-Command-Line-Options.md b/wiki/en/en-Command-Line-Options.md index 1fc218ddc..8747bdaeb 100644 --- a/wiki/en/en-Command-Line-Options.md +++ b/wiki/en/en-Command-Line-Options.md @@ -15,7 +15,7 @@ For example, on Windows to enable recording with the `-R` option: right-click on "C:\Program Files (x86)\Jamulus\Jamulus.exe" -s -R "C:\path\to\your\Jam Recordings" ``` -For Macintosh, start a Terminal window and run Jamulus with the desired options like this: +For macOS, start a Terminal window and run Jamulus with the desired options like this: ```shell /Applications/Jamulus.app/Contents/MacOS/Jamulus -s -R "/path/to/your/jam recordings" diff --git a/wiki/en/en-Compiling.md b/wiki/en/en-Compiling.md index b8a6454d0..105462bf1 100644 --- a/wiki/en/en-Compiling.md +++ b/wiki/en/en-Compiling.md @@ -11,7 +11,7 @@ permalink: "/wiki/Compiling" Please refer to the [client installation page](Installation-for-Linux) or these instructions if you wish to [compile a headless server](Server-Linux#running-a-headless-server) -## MacOS +## macOS You don't need to compile Jamulus for macOS since we provide official binaries, but if you really want to, follow the instructions below. ### Requirements diff --git a/wiki/en/en-Installation-for-Macintosh.md b/wiki/en/en-Installation-for-Macintosh.md index 089739c3c..ae8ca0952 100644 --- a/wiki/en/en-Installation-for-Macintosh.md +++ b/wiki/en/en-Installation-for-Macintosh.md @@ -1,11 +1,11 @@ --- layout: wiki -title: "Installation for Macintosh" +title: "Installation for macOS" lang: "en" permalink: "/wiki/Installation-for-Macintosh" --- -# Installation for Macintosh +# Installation for macOS Make sure you've already read the [Getting Started](Getting-Started) page. diff --git a/wiki/en/en-Multiple-Audio-Interfaces.md b/wiki/en/en-Multiple-Audio-Interfaces.md index 3fd043a5f..3e25bf45f 100644 --- a/wiki/en/en-Multiple-Audio-Interfaces.md +++ b/wiki/en/en-Multiple-Audio-Interfaces.md @@ -37,7 +37,7 @@ Under Windows, the best option to run multiple interfaces through Jamulus at the * If you set your default playback device under Windows to one of VoiceMeeter's virtual inputs, you can route audio from your computer into JackRouter (and consequently, into Jamulus) by enabling the _A1_ button on the relevant input under _Virtual Inputs_. This is useful if you wish to play some audio through Jamulus (backing tracks, youtube, recordings, etc...) -### MacOS X +### macOS [Aggregate devices](https://support.apple.com/en-us/HT202000) lets you do this. Just make sure your Jamulus version is 3.5.3 or higher. @@ -56,4 +56,3 @@ On Linux, it is possible to route additional devices to Jack by using alsa_in. 2. Jamulus should automatically route the JACK configured interface, adjustments can be made through the _Connect_ button. 3. Connect the device configured on step 1 into jamulus input. 4. Use Patchbay as described on Windows section to make connections permanent. - diff --git a/wiki/en/en-Running-a-Server.md b/wiki/en/en-Running-a-Server.md index dbe050ae0..eca8b3a75 100644 --- a/wiki/en/en-Running-a-Server.md +++ b/wiki/en/en-Running-a-Server.md @@ -56,7 +56,7 @@ A typical jam might have 4 people, for which you would need 200Kbps * 4 = 800Kbs ## All OK? Get set up! -### [For Windows or Macintosh users](Server-Win-Mac) +### [For Windows or macOS users](Server-Win-Mac) ### [For Linux users](Server-Linux) ### [For Raspberry Pi](Server-Rpi) diff --git a/wiki/en/en-Server-Win-Mac.md b/wiki/en/en-Server-Win-Mac.md index 069640ae7..b8fb7b3c6 100644 --- a/wiki/en/en-Server-Win-Mac.md +++ b/wiki/en/en-Server-Win-Mac.md @@ -1,18 +1,18 @@ --- layout: wiki -title: "Server Installation - Windows and Macintosh" +title: "Server Installation - Windows and macOS" lang: "en" permalink: "/wiki/Server-Win-Mac" --- -# Installation for Windows and Macintosh +# Installation for Windows and macOS **_Please ensure you have read the [server overview](Running-a-Server)_** * **Windows users** - Start the server using the entry for "Jamulus server" in the Windows start menu. -* **Macintosh users** - Double-click the "Jamulus server" icon in Applications (assuming you put the files from the install there as per [these instructions](Installation-for-Macintosh)). +* **macOS users** - Double-click the "Jamulus server" icon in Applications (assuming you put the files from the install there as per [these instructions](Installation-for-Macintosh)). * **Linux users** - Please refer to the [GUI server instructions](Server-Linux#running-a-server-with-the-gui). diff --git a/wiki/en/en-Software-Manual.md b/wiki/en/en-Software-Manual.md index 99f7a3f1f..3e9f647a6 100644 --- a/wiki/en/en-Software-Manual.md +++ b/wiki/en/en-Software-Manual.md @@ -143,10 +143,10 @@ Settings Window ### Sound card device ![Sound card device Windows](https://user-images.githubusercontent.com/20726856/97361494-e70a2300-189f-11eb-9095-2c34ad07314d.png) -![Sound card device Mac](https://user-images.githubusercontent.com/20726856/97361570-02752e00-18a0-11eb-8475-e92a57ce6ae7.png) +![Sound card device macOS](https://user-images.githubusercontent.com/20726856/97361570-02752e00-18a0-11eb-8475-e92a57ce6ae7.png) The ASIO driver (sound card) can be selected using Jamulus under the Windows operating system. If the selected ASIO -driver is not valid an error message is shown and the previous valid driver is selected. Under the Mac operating +driver is not valid an error message is shown and the previous valid driver is selected. Under the macOS operating system the input and output hardware can be selected. ### Input/output channel mapping @@ -238,7 +238,7 @@ The higher the audio quality, the higher your audio stream's data rate. Make sur This setting defines the fader level of a newly connected client in percent. If a new musician connects to the current server, they will get the specified initial fader level if no other fader level from a previous connection of that client was already stored. You can set all clients in an occupied server to this level using Edit > "Set All Faders to New Client Level". - + ### Fancy skin diff --git a/wiki/en/en-Software-Synth.md b/wiki/en/en-Software-Synth.md index 1adc03a21..5352d2845 100644 --- a/wiki/en/en-Software-Synth.md +++ b/wiki/en/en-Software-Synth.md @@ -8,9 +8,9 @@ permalink: "/wiki/Software-Synth" # Software Synth in Jamulus ## Linux -We will elaborate the concept of playing a software synth on Linux as example and transfer that to other operating systems (e.g. Windows, MacOSX). +We will elaborate the concept of playing a software synth on Linux as example and transfer that to other operating systems (e.g. Windows, macOS). * **(Hammond Organ Synth)** As an example we talk open source software synth [setBfree](https://github.com/pantherb/setBfree), which is a hammond organ emulator that outputs through JACK on Linux. -* **(MIDI Keyboard)** The MIDI keyboard is used to generate the key pressed events, that are transmitted through a USB-MIDI interface to Linux system and the Synthesizer [setBfree](https://github.com/pantherb/setBfree) generates the corresponding tone for the pressed key. In general the MIDI keyboard can also be replaced by a digital wind midi controller, that does the same but the tone is dependent on how the musician blows air into the digital wind controller. +* **(MIDI Keyboard)** The MIDI keyboard is used to generate the key pressed events, that are transmitted through a USB-MIDI interface to Linux system and the Synthesizer [setBfree](https://github.com/pantherb/setBfree) generates the corresponding tone for the pressed key. In general the MIDI keyboard can also be replaced by a digital wind midi controller, that does the same but the tone is dependent on how the musician blows air into the digital wind controller. * **(Connector to Jamulus)** You may hear the audio output of your Linux system on your speakers but the audio output may not be use as input for your Jamulus session. So another step is to connect the audio out to Jamulus client (with QJackCtl). ### General Information about ALSA, JACK and MIDI @@ -29,14 +29,14 @@ For ALSA2JACK MIDI (`a2jmidid`) connection it is necessary to install the a2j pa ### Connecting ALSA, JACK and MIDI for a Synth for Jamulus Now we look an the workflow to use the whole infrastructure in Jamulus. -* **(Jamulus Installation and JACK)** Use the [install script](https://github.com/corrados/jamulus/wiki/Linux-Client-Install-Script) for Jamulus on Linux or [install Jamulus with the manual in the wiki](https://github.com/corrados/jamulus/wiki/Installation-for-Linux). With this installation we have JACK and QJackCtl installed for Jamulus. -* **(ALSA to JACK - MIDI)** Next we must create a connection from ALSA to JACK to route the MIDI input from the keyboard to the [Hammond Emulator setBfree](https://github.com/pantherb/setBfree). +* **(Jamulus Installation and JACK)** Use the [install script](https://github.com/corrados/jamulus/wiki/Linux-Client-Install-Script) for Jamulus on Linux or [install Jamulus with the manual in the wiki](https://github.com/corrados/jamulus/wiki/Installation-for-Linux). With this installation we have JACK and QJackCtl installed for Jamulus. +* **(ALSA to JACK - MIDI)** Next we must create a connection from ALSA to JACK to route the MIDI input from the keyboard to the [Hammond Emulator setBfree](https://github.com/pantherb/setBfree). * ***(Command Line: `qjackctl`)*** For this step you can start JACK-Control (QJackCtl) from the command line by `qjackctl`, - * ***(Command Line: `a2jmidid -e`)*** Then you launch the ALSA2JACK MIDI connector with command: `a2jmidid -e`. As long as this connector runs in the shell the `a2j` connection interface is visible in `QJackCtl`. + * ***(Command Line: `a2jmidid -e`)*** Then you launch the ALSA2JACK MIDI connector with command: `a2jmidid -e`. As long as this connector runs in the shell the `a2j` connection interface is visible in `QJackCtl`. * ***(QJackCtl: `ALSA-MIDI`)*** Connect your USB MIDI as input to `MIDI through` in the ALSA-MIDI tab of QJackCtl. Now the midi events from your keyboard reach JACK and are ready to connect. * ***(Start Synth)*** Start the Hammond Synthesizer too e.g. from the command line with `setBfree`. You will see the `setBfree` graphical user interface GUI (see http://setbfree.org/gui_3d). Press with your mouse on the visualised organ keyboard to test if the synth generates an organ sound on your speakers. - * ***(QJackCtl: `JACK-MIDI`)*** Now we can connect `a2j` in JACK-MIDI as input to the synth `setBfree`, that generates the sound as output for each key pressed on the keyboard. Keep in mind that you can connect synths if they are started and visible for QJackCtl. So you can connect after starting the [Hammond Emulator setBfree](https://github.com/pantherb/setBfree), i.e. connect `a2j` to the `setbfree` if you also see the Hammond Synth SetBFree in QJackCtl. - * ***(Test Software Synth with MIDI Keyboard)*** If you have speakers attached to your Linux Computer you would hear the emulated Hammond sound on your Linux PC for all the keys your press on your MIDI keyboard. If you just want to play the software synth with your keyboard you are ready to play from here. The only remaining step is to connect the audio to Jamulus. + * ***(QJackCtl: `JACK-MIDI`)*** Now we can connect `a2j` in JACK-MIDI as input to the synth `setBfree`, that generates the sound as output for each key pressed on the keyboard. Keep in mind that you can connect synths if they are started and visible for QJackCtl. So you can connect after starting the [Hammond Emulator setBfree](https://github.com/pantherb/setBfree), i.e. connect `a2j` to the `setbfree` if you also see the Hammond Synth SetBFree in QJackCtl. + * ***(Test Software Synth with MIDI Keyboard)*** If you have speakers attached to your Linux Computer you would hear the emulated Hammond sound on your Linux PC for all the keys your press on your MIDI keyboard. If you just want to play the software synth with your keyboard you are ready to play from here. The only remaining step is to connect the audio to Jamulus. * **(Synth to Jamulus - Audio)** In the previous step we connected the MIDI signals from your keyboard to the MIDI input of JACK via a2j - MIDI through connection. Now JACK the MIDI which tell JACK which keys are pressed on the keyboard. Now create an audio connection in JACK (i.e. the generated Hammond sound of the synth). We connect the [Hammond Emulator setBfree](https://github.com/pantherb/setBfree) output to Jamulus. Therefore Jamulus must be started so that you see also Jamulus in the audio connection of QJackCtl. Now you can the audio output of the [Hammond Emulator setBfree](https://github.com/pantherb/setBfree) to the audio input of Jamulus in JACK. In general `QJackCtrl` is used similar operations like for plugging in instruments in mixer and the mixer into an amplifier and the amplifier again to the speakers. Have fun with your other OpenSource synths like QSynth, [ZynAddSubFX](https://sourceforge.net/projects/zynaddsubfx/) than can be installed on your Linux system and/or used within LMMS. diff --git a/wiki/en/en-Tips-Tricks-More.md b/wiki/en/en-Tips-Tricks-More.md index 7ecd3ff22..84b3cda6b 100644 --- a/wiki/en/en-Tips-Tricks-More.md +++ b/wiki/en/en-Tips-Tricks-More.md @@ -15,9 +15,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 the 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 Mac 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 Jamulus output to multiple destinations, for example to your headphones and the meeting application at the same time. ## Recording Jamulus on Windows with Reaper @@ -31,7 +31,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 a 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`): @@ -51,7 +51,7 @@ function loadserverstat ( $statfilename ) ~~~ -## Saving and loading client mix states +## Saving and loading client mix states You can save and restore the mix you have for your band rehearsals (fader, mute, pan, solo etc.) and load these any time (even while you are playing). Do this with "File > Save Mixer Channels Setup" in your client and load them using "Load Mixer Channels Setup" (or drag/drop them to the mixer window). @@ -62,11 +62,11 @@ You can run a public server long enough for your band to connect, then go privat ## Jamulus client Linux start script -Here's a Linux start script for Jamulus using an old Audigy4 sound card, the large number of available audio faders for which makes it hard to get the correct settings. +Here's a Linux start script for Jamulus using an old Audigy4 sound card, the large number of available audio faders for which makes it hard to get the correct settings. -This script therefore includes the most important audio fader settings. The second part of the script deals with the jack connections. I use Guitarix as my guitar effect processor which I plug in in the jack audio path. +This script therefore includes the most important audio fader settings. The second part of the script deals with the jack connections. I use Guitarix as my guitar effect processor which I plug in in the jack audio path. -Finally I start Jamulus automatically connecting to the central server. +Finally I start Jamulus automatically connecting to the central server. Here is the script: @@ -100,8 +100,8 @@ 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 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. 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"` -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. +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 018d6a010eeecd9caca8b493277fab19938a4fd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9rald=20Niel?= Date: Sat, 28 Nov 2020 20:09:53 +0100 Subject: [PATCH 002/280] W: redrafting macOS version --- wiki/en/en-Getting-Started.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wiki/en/en-Getting-Started.md b/wiki/en/en-Getting-Started.md index bff85e0a5..37a6ffc40 100644 --- a/wiki/en/en-Getting-Started.md +++ b/wiki/en/en-Getting-Started.md @@ -9,7 +9,7 @@ permalink: "/wiki/Getting-Started" ## You will need -1. **A computer** running either **Windows 10**, **MacOS X** El Capitan (v10.11) or higher, or **Linux**. +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]. @@ -21,7 +21,7 @@ Unless you are a musician with a (USB) microphone, you are strongly advised to u ### 2. Minimize 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. +Try to make sure nothing on your machine or your network (like a video stream) is competing against Jamulus when you are using it. ### 3. Connect to the servers with the lowest ping times 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 003/280] 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 004/280] 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 005/280] 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 006/280] 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 007/280] 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 008/280] 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 009/280] 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 010/280] 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 011/280] 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 a92dbc71e66c0363df86435130da8644a17342ad Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Sun, 29 Nov 2020 22:33:32 +0100 Subject: [PATCH 012/280] Add basic walk through page structure --- wiki/en/en-Installation-for-Linux.md | 3 +-- wiki/en/en-Installation-for-Macintosh.md | 5 +---- wiki/en/en-Installation-for-Windows.md | 2 +- wiki/en/en-Walk-Through.md | 22 ++++++++++++++++++++++ 4 files changed, 25 insertions(+), 7 deletions(-) create mode 100644 wiki/en/en-Walk-Through.md diff --git a/wiki/en/en-Installation-for-Linux.md b/wiki/en/en-Installation-for-Linux.md index e8e9532ca..c4e6311f2 100644 --- a/wiki/en/en-Installation-for-Linux.md +++ b/wiki/en/en-Installation-for-Linux.md @@ -88,8 +88,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? -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). +Jamulus has been installed and can be used now. You can now take a look at the [Jamulus walk through page](Walk-Through). ## To update your installation to a new release diff --git a/wiki/en/en-Installation-for-Macintosh.md b/wiki/en/en-Installation-for-Macintosh.md index 089739c3c..2923579e2 100644 --- a/wiki/en/en-Installation-for-Macintosh.md +++ b/wiki/en/en-Installation-for-Macintosh.md @@ -33,7 +33,4 @@ For further information see [this Apple Support Page](https://support.apple.com/ **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"}).** ## 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). +Jamulus has been installed and can be used now. You can now take a look at the [Jamulus walk through page](Walk-Through). diff --git a/wiki/en/en-Installation-for-Windows.md b/wiki/en/en-Installation-for-Windows.md index 348204449..9a95c1853 100644 --- a/wiki/en/en-Installation-for-Windows.md +++ b/wiki/en/en-Installation-for-Windows.md @@ -44,6 +44,6 @@ Have a look at [this video](https://youtu.be/_GzOsitVgLI){: target="_blank" rel= 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\`). ## 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). +Jamulus has been installed and can be used now. You can now take a look at the [Jamulus walk through page](Walk-Through). 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-Walk-Through.md b/wiki/en/en-Walk-Through.md new file mode 100644 index 000000000..6b8698108 --- /dev/null +++ b/wiki/en/en-Walk-Through.md @@ -0,0 +1,22 @@ +--- +layout: wiki +title: "Jamulus Walk-Through" +lang: "en" +permalink: "/wiki/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 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 013/280] 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 2d28e643b789a7fb616f49f7a11ff73cc1e016e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9rald=20Niel?= Date: Mon, 30 Nov 2020 22:23:35 +0100 Subject: [PATCH 014/280] Add buttons --- wiki/en/en-Running-a-Server.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/wiki/en/en-Running-a-Server.md b/wiki/en/en-Running-a-Server.md index eca8b3a75..ab9fd4d6f 100644 --- a/wiki/en/en-Running-a-Server.md +++ b/wiki/en/en-Running-a-Server.md @@ -55,10 +55,11 @@ A typical jam might have 4 people, for which you would need 200Kbps * 4 = 800Kbs ## All OK? Get set up! - -### [For Windows or macOS users](Server-Win-Mac) -### [For Linux users](Server-Linux) -### [For Raspberry Pi](Server-Rpi) +
+ For Windows or macOS users + For Linux users + or Raspberry Pi +
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`). From 33ea5455e396ffad22c31c90b0fe76883465abfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9rald=20Niel?= Date: Mon, 30 Nov 2020 23:26:41 +0100 Subject: [PATCH 015/280] Use CSS for margin --- assets/css/wiki.css | 4 ++++ wiki/en/en-Running-a-Server.md | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/assets/css/wiki.css b/assets/css/wiki.css index a79abbaaa..937ac3466 100644 --- a/assets/css/wiki.css +++ b/assets/css/wiki.css @@ -33,6 +33,10 @@ padding: 20px; } +.wikisite .margin_button { + margin-top: .5em; +} + @media (prefers-color-scheme: dark) { .wikisite #ftext { border-top-color: #0a5067; diff --git a/wiki/en/en-Running-a-Server.md b/wiki/en/en-Running-a-Server.md index ab9fd4d6f..a921b8470 100644 --- a/wiki/en/en-Running-a-Server.md +++ b/wiki/en/en-Running-a-Server.md @@ -55,7 +55,7 @@ A typical jam might have 4 people, for which you would need 200Kbps * 4 = 800Kbs ## All OK? Get set up! -
+
For Windows or macOS users For Linux users or Raspberry Pi From 670d07f01e059dc822ef219d0019fe54ad39f3d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9rald=20Niel?= Date: Tue, 1 Dec 2020 13:12:34 +0100 Subject: [PATCH 016/280] Remove css margin --- assets/css/wiki.css | 4 ---- wiki/en/en-Running-a-Server.md | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/assets/css/wiki.css b/assets/css/wiki.css index 937ac3466..a79abbaaa 100644 --- a/assets/css/wiki.css +++ b/assets/css/wiki.css @@ -33,10 +33,6 @@ padding: 20px; } -.wikisite .margin_button { - margin-top: .5em; -} - @media (prefers-color-scheme: dark) { .wikisite #ftext { border-top-color: #0a5067; diff --git a/wiki/en/en-Running-a-Server.md b/wiki/en/en-Running-a-Server.md index a921b8470..a40481b85 100644 --- a/wiki/en/en-Running-a-Server.md +++ b/wiki/en/en-Running-a-Server.md @@ -55,7 +55,7 @@ A typical jam might have 4 people, for which you would need 200Kbps * 4 = 800Kbs ## All OK? Get set up! -
+
For Windows or macOS users For Linux users or Raspberry Pi From 3154d466b9a477c8758665ab4e9e3ad7a83de334 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9rald=20Niel?= Date: Tue, 1 Dec 2020 18:40:14 +0100 Subject: [PATCH 017/280] margin (bottom & top) on button-container --- assets/css/wiki.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/assets/css/wiki.css b/assets/css/wiki.css index a79abbaaa..871d9dc23 100644 --- a/assets/css/wiki.css +++ b/assets/css/wiki.css @@ -33,6 +33,10 @@ padding: 20px; } +.wikisite .button-container { + margin: .25em 0; +} + @media (prefers-color-scheme: dark) { .wikisite #ftext { border-top-color: #0a5067; From a1a1f07e74b6df2ab4c0a623d1d669d31ded1643 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Tue, 1 Dec 2020 20:52:54 +0100 Subject: [PATCH 018/280] Update again and try to revert --- 1-index.html | 8 +++----- CONTRIBUTING.md | 4 +++- Gemfile.lock | 4 ++-- README.md | 4 ++-- wiki/en/en-Command-Line-Options.md | 4 ++-- wiki/en/en-Compiling.md | 6 +++--- wiki/en/en-Contribution.md | 6 ++---- wiki/en/en-Demos.md | 3 --- wiki/en/en-Getting-Started.md | 2 +- wiki/en/en-Installation-for-Linux.md | 8 +++----- wiki/en/en-Installation-for-Macintosh.md | 6 ++++-- wiki/en/en-Installation-for-Windows.md | 6 +++--- wiki/en/en-Linux-Install-Script.md | 4 ++-- wiki/en/en-Server-Linux.md | 4 ++-- wiki/en/en-Server-Rpi.md | 2 +- wiki/en/en-Software-Manual.md | 2 +- wiki/en/en-Tips-Tricks-More.md | 18 +++++------------- 17 files changed, 39 insertions(+), 52 deletions(-) diff --git a/1-index.html b/1-index.html index c38a09363..e17a5ab7d 100644 --- a/1-index.html +++ b/1-index.html @@ -44,12 +44,10 @@

Help needed?

-

Jamulus is Open Source

+

Contribute!

- Ideas? Found a bug? Want to contribute? Since Jamulus is open source you can help us! Find the project on SourceForge and the source code on GitHub! - Jamulus is licensed under the (GPL, - GNU General Public License). + Ideas? Found a bug? Want to contribute? Since Jamulus is free and open source software licensed under the GPL you can help us!
+ Take a look at our contribution guidelines to find out how. You're welcome!

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index de8d53ad6..8644bbc53 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,3 +1,5 @@ # Contribute -Thanks for your support! Please open a pull request on GitHub! +Thanks for your support! +Please open an issue on github. More to come soon... +~~Please open a pull request on GitHub!~~ diff --git a/Gemfile.lock b/Gemfile.lock index c4a1f9282..7e39ae7e4 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.3) 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/README.md b/README.md index b592056ad..91ff551e9 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Built with Jekyll and Fox-CSS ## Contribute and translation -Do you want to contribute to the Jamulus Wiki/Website? Please see the [CONTRIBUTING.md](CONTRIBUTING.md) file and the [contributing wiki entry](https://jamulus.io/wiki/Contribution). +Do you want to contribute to the Jamulus Wiki/Website? Please open an issue since we're currently discussing how to fasciliate contribution. ~~See the [CONTRIBUTING.md](CONTRIBUTING.md) file and the [contributing wiki entry](https://jamulus.io/wiki/Contribution).~~ ## Adding pictures Unfortunately GitHub doesn't enable picture upload on the normal md editor. Therefore you can attempt to open an issue, upload your image, copy the link to the page you want to integrate it into and then don't submit the issue. See this answer on stack overflow: https://stackoverflow.com/a/26601810 @@ -31,7 +31,7 @@ To translate a file, please duplicate it and change the `lang:` attribute to the If you want to add a new language, you must follow the instructions on the polyglot site and add the folders/files. - Make sure to add your language to the \_config.yml file (in the languages array.) - At least, the main includes for the wiki (see \_includes/wiki/) have to be translated. -- The navigation and general site wide strings (see the \_data/ folder) and the homepage (see the index.html file in the root of this repo) should be translated. +- The navigation and general site wide strings (see the \_data/ folder) and the homepage (see the 1-index.html file in the root of this repo) should be translated. Have a look at the README.md files in these folders. diff --git a/wiki/en/en-Command-Line-Options.md b/wiki/en/en-Command-Line-Options.md index f8755d11d..1fc218ddc 100644 --- a/wiki/en/en-Command-Line-Options.md +++ b/wiki/en/en-Command-Line-Options.md @@ -35,7 +35,7 @@ You can see all possible options your version supports by starting Jamulus with | `-F` |`--fastupdate` | 64 samples frame size mode. Reduces latency if clients connect with "Enable Small Network Buffers" option. Requires faster CPU to avoid dropouts, and more bandwidth to enabled clients. | (server only) | | `-h,-?` |`--help` | This help text | (client and server) | | `-i` |`--inifile` | Set location of initialization file (overrides default) | (client (always) and server (with GUI)) | -| `-j` |`--nojackconnect` | Disable auto Jack connections | (client only) | +| `-j` |`--nojackconnect` | Disable auto JACK connections | (client only) | | `-l` |`--log` | Enable logging, set path and file name | (server only) | | `-m` |`--htmlstatus` | Enable HTML status file, set path and file name | (server only) | | `-M` |`--mutestream` | Starts Jamulus in muted state | (client only) | @@ -50,5 +50,5 @@ You can see all possible options your version supports by starting Jamulus with | `-u` |`--numchannels` | Maximum number of channels. 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 | (client only) see [Tips & Tricks](Tips-Tricks-More) | +| |`--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) | | |`--clientname` | Window title and jack client name | (client only) | diff --git a/wiki/en/en-Compiling.md b/wiki/en/en-Compiling.md index 240a4daa7..6c1aa409b 100644 --- a/wiki/en/en-Compiling.md +++ b/wiki/en/en-Compiling.md @@ -65,8 +65,8 @@ You don't need to compile Jamulus for Windows since we provide official binaries **Required software**: [QT](https://www.qt.io/download), a compiler like Visual Studio, ASIO development files - get the Jamulus source code e.g. via git or via zip download from the Jamulus Repo -- get and copy the [ASIOSDK](https://www.steinberg.net/de/company/developer.html) development files in jamulus/windows directory so that, e.g., the - directory jamulus/windows/ASIOSDK2/common exists +- get and copy the [ASIOSDK](https://www.steinberg.net/de/company/developer.html) development files in `[\path\to\jamulus\source]\windows` directory so that, e.g., the + directory `[\path\to\jamulus\source]\ASIOSDK2\common` exists - open Jamulus.pro in Qt Creator then compile & run @@ -80,4 +80,4 @@ Compiling with the `headless` flag means you can avoid installing some of the de 1. If you are running Jamulus on Ubuntu/Debian, you will need all dependent packages to **compile** the binary, but to **run** the resulting headless Jamulus server you should only need `libqt5core5a`, `libqt5network5`, `libqt5xml5` and probably `libqt5concurrent5`. This may be useful for compiling/upgrading on one machine to run the binary on another (a Raspberry Pi, for example). -1. Note that if you want to compile a GUI client on one machine and run it on another (eg a Raspberry Pi) you only need the dependencies listed for a [headless server](Server-Linux#running-a-headless-server) (see point above), only _with_ the Jack sound libraries. +1. Note that if you want to compile a GUI client on one machine and run it on another (eg a Raspberry Pi) you only need the dependencies listed for a [headless server](Server-Linux#running-a-headless-server) (see point above), only _with_ the JACK sound libraries. diff --git a/wiki/en/en-Contribution.md b/wiki/en/en-Contribution.md index 088dd372e..d562e6542 100644 --- a/wiki/en/en-Contribution.md +++ b/wiki/en/en-Contribution.md @@ -7,14 +7,12 @@ permalink: "/wiki/Contribution" # Contributing to the Jamulus Project -You can contribute to [this documentation](https://github.com/jamulussoftware/jamulussoftware.github.io/) by opening a pull request with with the following title: +You can contribute to [this documentation](https://github.com/jamulussoftware/jamuluswebsite) by opening a pull request with with the following title: -`W: [language code (e.g. en)] {short description of your changes}` +`W: [language code (e.g. en)] {short description of your changes}` on the [Documentation repo](https://github.com/jamulussoftware/jamuluswebsite). If your change involves the need of translation, please write that in the description. ### The more people can improve Jamulus, the better! * Have a look at our coding and [contribution guidelines](https://github.com/corrados/jamulus/issues/596) and [Jamulus GitHub repo](https://github.com/corrados/jamulus). * Note also the [compilation guide](/wiki/Compiling) for various platforms. - - diff --git a/wiki/en/en-Demos.md b/wiki/en/en-Demos.md index 26715e8b3..917c1f932 100644 --- a/wiki/en/en-Demos.md +++ b/wiki/en/en-Demos.md @@ -17,10 +17,7 @@ permalink: "/wiki/Demos" * [Live concert with 8 jazz musicians](https://www.youtube.com/watch?v=MpSIYxZMHw8&t=3307s) for International Jazz Day, 30 April 2020 ([more details here](https://sourceforge.net/p/llcon/discussion/533517/thread/070485619d/#6b71)) -* [IP Rockers Live on Jamulus April 17 2020](https://soundcloud.com/dematteoss/sets/ip-rockers-live-on-jamulus-april-17-2020) (broken link) - * [Introductory video showing setup with acoustic instruments](https://www.youtube.com/watch?v=lB4ZxDb9vnU) (not a demo as such) * [WorldJam](https://worldjam.vip/homepage.php) Every saturday night there's a world wide online jam being streamed over the net ![A typical Jamulus jam!](https://user-images.githubusercontent.com/4561747/79686157-1f1c1380-8236-11ea-9fdb-8a791dd2713f.png) - diff --git a/wiki/en/en-Getting-Started.md b/wiki/en/en-Getting-Started.md index 371861a96..bff85e0a5 100644 --- a/wiki/en/en-Getting-Started.md +++ b/wiki/en/en-Getting-Started.md @@ -21,7 +21,7 @@ Unless you are a musician with a (USB) microphone, you are strongly advised to u ### 2. Minimize internet traffic and close all programs on your PC -Try to make sure nothing on your machine or your network is competing against Jamulus when you are using it. +Try to make sure nothing on your machine or your network (like a video stream) is competing against Jamulus when you are using it. ### 3. Connect to the servers with the lowest ping times diff --git a/wiki/en/en-Installation-for-Linux.md b/wiki/en/en-Installation-for-Linux.md index 9ce7f7f47..55106b712 100644 --- a/wiki/en/en-Installation-for-Linux.md +++ b/wiki/en/en-Installation-for-Linux.md @@ -11,9 +11,7 @@ Make sure you read the [Getting Started](Getting-Started) page. **Right now, we don't provide official packages for Jamulus** -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"}. You can also use an [all-in-one script](Linux-Client-Install-Script) if you want. - -Meanwhile, compiling the sources is quite easy: +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: ## Get Jamulus sources @@ -83,8 +81,8 @@ Jamulus clients need [Jack](https://jackaudio.org/){: target="_blank" rel="noope Restart Jack to take any new settings ### Start Jamulus -1. Open the command shell e.g. with Ctrl-Alt-T and -1. Execute the command `Jamulus` (with a capital 'J') and you will start the Jamulus Client + +Open Jamulus e.g. via your command shell. If you use the shell, execute the command `Jamulus` (with a capital 'J') which starts the Jamulus Client Jamulus puts itself into `/usr/local/bin`. You can now delete the sources directory you compiled from. diff --git a/wiki/en/en-Installation-for-Macintosh.md b/wiki/en/en-Installation-for-Macintosh.md index d2090905a..089739c3c 100644 --- a/wiki/en/en-Installation-for-Macintosh.md +++ b/wiki/en/en-Installation-for-Macintosh.md @@ -10,7 +10,7 @@ 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. **Extract the downloaded .zip file.** Double-click on the .zip file, which will create new folder of same name. The folder contains the license file and a `.dmg` file containing the application. +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. **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. @@ -21,7 +21,9 @@ You can also [compile your own binary](Compiling) if you feel so inclined. ## "Jamulus" can't be opened because the developer cannot be verified -**The first time you try to double-click Jamulus to run it, you will probably see a message saying it cannot be opened.** +![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)** 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. diff --git a/wiki/en/en-Installation-for-Windows.md b/wiki/en/en-Installation-for-Windows.md index cff1086eb..da67fc119 100644 --- a/wiki/en/en-Installation-for-Windows.md +++ b/wiki/en/en-Installation-for-Windows.md @@ -8,8 +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, click on "More info" and "Run anyway" to install Jamulus. -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), and afterwards at [Hardware Setup](Hardware-Setup). +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. **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. @@ -18,7 +18,7 @@ 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.* -First of all **close all applications** (especially those which could access your soundcard like your browser) to minimize conflicts. 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**. +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. ### How to setup ASIO4All inputs (Guide) diff --git a/wiki/en/en-Linux-Install-Script.md b/wiki/en/en-Linux-Install-Script.md index 3d951300b..2bae49110 100644 --- a/wiki/en/en-Linux-Install-Script.md +++ b/wiki/en/en-Linux-Install-Script.md @@ -28,14 +28,14 @@ fi The variable `LINVERSION` is currently not used in the following script but it is just a demo how to use the version specific installation commands. ### Adaptation of the Installation Script -If you want to create an installation script for debian just copy the script `install4ubuntu18_4.sh` to `install4debian10_6.sh` and modify the distro variables to +If you want to create an installation script for Debian just copy the script `install4ubuntu18_4.sh` to `install4debian10_6.sh` and modify the distro variables to ```bash #!/bin/sh # set DISTRO either to "Ubuntu", "Debian" or "Fedora" DISTRO="Debian" LINVERSION="10.6" ``` -After that test the installation on debian and modify the commands so that the installation script works on Debian. Please share working installation scripts in this Wiki. The maintainer of this repository might add a folder in this repository `/install_scripts` for working installation scripts. Create a pull request for new installation scripts or create an issue with a request to add a documented and tested installation script to this repository. +After that test the installation on Debian and modify the commands so that the installation script works on Debian. Please share working installation scripts in this Wiki. The maintainer of this repository might add a folder in this repository `/install_scripts` for working installation scripts. Create a pull request for new installation scripts or create an issue with a request to add a documented and tested installation script to this repository. ### The Installation Script Copy the following installation script into a file and save it to the filename `install4ubuntu18_4.sh`. After saving the file e.g. in your `Download` directory change to the directory and call the following script with `sh install4ubuntu18_4.sh`. diff --git a/wiki/en/en-Server-Linux.md b/wiki/en/en-Server-Linux.md index f9f97250d..7b4da915d 100644 --- a/wiki/en/en-Server-Linux.md +++ b/wiki/en/en-Server-Linux.md @@ -34,8 +34,8 @@ The following guide is for running Jamulus as a "pure" server on **hardware with ### Compile sources, create a user -1. [Get the sources](Installation-for-Linux#get-jamulus-sources), install the [dependent packages](Installation-for-Linux#install-dependencies) according to the Linux client install guide. Note that **you don't need to install the Jack package(s)** for a headless build. _If you plan to run headless on Gentoo, or are compiling under Ubuntu for use on another Ubuntu machine, [see the footnote](#what-does-the-headless-build-flag-do)._ -1. Compile the sources to ignore the Jack sound library: +1. [Get the sources](Installation-for-Linux#get-jamulus-sources), install the [dependent packages](Installation-for-Linux#install-dependencies) according to the Linux client install guide. Note that **you don't need to install the JACK package(s)** for a headless build. _If you plan to run headless on Gentoo, or are compiling under Ubuntu for use on another Ubuntu machine, [see the footnote](#what-does-the-headless-build-flag-do)._ +1. Compile the sources to ignore the JACK sound library: ~~~ qmake "CONFIG+=nosound headless" Jamulus.pro diff --git a/wiki/en/en-Server-Rpi.md b/wiki/en/en-Server-Rpi.md index 0dcd27794..4d069dd98 100644 --- a/wiki/en/en-Server-Rpi.md +++ b/wiki/en/en-Server-Rpi.md @@ -15,7 +15,7 @@ _Jamulus has been tested on a Raspberry Pi 4 2Gb by Jamulus user [SIVA Frédéri 1. Edit [config.txt](https://www.raspberrypi.org/documentation/configuration/config-txt/) to enable boot without HDMI by adding `hdmi_force_hotplug=0` -1. [Get the sources](Installation-for-Linux#get-jamulus-sources), install the [dependent packages](Installation-for-Linux#install-dependencies) according to the Linux client install guide **but do NOT install Jack package(s)** - you don't need them on a [headless server](Server-Linux#running-a-headless-server). To run a client, install all listed dependencies. +1. [Get the sources](Installation-for-Linux#get-jamulus-sources), install the [dependent packages](Installation-for-Linux#install-dependencies) according to the Linux client install guide **but do NOT install JACK package(s)** - you don't need them on a [headless server](Server-Linux#running-a-headless-server). To run a client, install all listed dependencies. 1. Compile the source code for a server as per [these instructions](Server-Linux#compile-sources-create-a-user). Compile a client using the [default instructions](Installation-for-Linux#compile-this-bad-boy). diff --git a/wiki/en/en-Software-Manual.md b/wiki/en/en-Software-Manual.md index 04de91608..d27009904 100644 --- a/wiki/en/en-Software-Manual.md +++ b/wiki/en/en-Software-Manual.md @@ -177,7 +177,7 @@ In this case the buffer delay setting is disabled and has to be changed using th ![Buffer delay Windows](https://user-images.githubusercontent.com/20726856/97361808-65ff5b80-18a0-11eb-88d6-fb2131f10c75.png) -On Linux, use the Jack configuration tool to change the buffer size. +On Linux, use the JACK configuration tool to change the buffer size. The actual buffer delay has 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 diff --git a/wiki/en/en-Tips-Tricks-More.md b/wiki/en/en-Tips-Tricks-More.md index 239993182..444d03841 100644 --- a/wiki/en/en-Tips-Tricks-More.md +++ b/wiki/en/en-Tips-Tricks-More.md @@ -15,7 +15,7 @@ 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 the 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 Mac to route Jamulus output to multiple destinations, for example to your headphones and the meeting application at the same time. @@ -98,18 +98,10 @@ jack_connect Jamulus:'output right' system:playback_2 -## Using the --ctrlmidich MIDI controller channel option +## Using ctrlmidich for MIDI controllers -Jamulus user [Ignotus](https://sourceforge.net/u/jammerman/profile/) writes: If you want to use a generic MIDI controller, you will need to either make adjustments to your controller or re-compile the sources: +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. -Note: only available for use with MacOS and Linux. - -MIDI CC messages consist of a Control Number, Controller Value, and Channel. Jamulus listens to the Control Number to know what fader to move, on the channel you specify when launching it with `--ctrlmidich`. - -The Jamulus client is set by default for use with the Behringer X-Touch, which apparently sends Control Numbers starting at 70, when Jamulus' faders are zero-indexed, which means there's a -70 offset coded into the source code that turns that 70 Control Number into a 0 for the first fader, 71 into 1 for the next, etc. - -If you can change the Control Number in your MIDI controller, just set it to 70 (71, 72, etc for subsequent faders). Launch Jamulus with `--ctrlmidich x` where 'x' is the MIDI channel you're using, or launch it with `--ctrlmidich 0` to listen to all channels, and you're done. 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. - -If you can't change the Control Numbers in your controller, you will need to modify and re-compile the sources: -In the file `src/soundbase.cpp`, go to line 290, remove the `- 70` at the end (not the semicolon) to use Control Number 0 for the first fader, or replace that number with the initial Control Number your MIDI device sends. Save, [compile](Compiling) and install. +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"` +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 9bd44d541677f1a20f6c8eb97c49d2207d5b72b4 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Tue, 1 Dec 2020 21:05:38 +0100 Subject: [PATCH 019/280] Remove W: #127 --- 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 d562e6542..6e86593e9 100644 --- a/wiki/en/en-Contribution.md +++ b/wiki/en/en-Contribution.md @@ -9,7 +9,7 @@ permalink: "/wiki/Contribution" You can contribute to [this documentation](https://github.com/jamulussoftware/jamuluswebsite) by opening a pull request with with the following title: -`W: [language code (e.g. en)] {short description of your changes}` on the [Documentation repo](https://github.com/jamulussoftware/jamuluswebsite). If your change involves the need of translation, please write that in the description. +`[language code (e.g. en)] {short description of your changes}` on the [Documentation repo](https://github.com/jamulussoftware/jamuluswebsite). If your change involves the need of translation, please write that in the description. ### The more people can improve Jamulus, the better! From 9f8165b4e37d6951337fadc4918fdd8595d9ee54 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Tue, 1 Dec 2020 21:36:52 +0100 Subject: [PATCH 020/280] Re-Add libqt5Concurrent5 (not confirmed) --- 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 55106b712..d767aa8a5 100644 --- a/wiki/en/en-Installation-for-Linux.md +++ b/wiki/en/en-Installation-for-Linux.md @@ -36,7 +36,7 @@ sudo apt-get install build-essential qt5-qmake qtdeclarative5-dev qt5-default qt On **Fedora**: ```shell -sudo dnf install qt5-qtdeclarative-devel jack-audio-connection-kit-dbus jack-audio-connection-kit-devel +sudo dnf install qt5-qtdeclarative-devel jack-audio-connection-kit-dbus libQt5Concurrent5 jack-audio-connection-kit-devel ``` ### Qjackctl: Optional, but recommended From 86c2e55625e5134a3a946cbc57b01c2429ed567c Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Tue, 1 Dec 2020 22:37:16 +0100 Subject: [PATCH 021/280] Add content to walk through page --- wiki/en/en-Walk-Through.md | 37 +++++++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 10 deletions(-) diff --git a/wiki/en/en-Walk-Through.md b/wiki/en/en-Walk-Through.md index 6b8698108..dc7f7cded 100644 --- a/wiki/en/en-Walk-Through.md +++ b/wiki/en/en-Walk-Through.md @@ -5,18 +5,35 @@ lang: "en" permalink: "/wiki/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 +Let's have a look what Jamulus looks like and what you should do after having installed the software. +## First start +Before each online Jam, you should close all other programs, plugin everything (LAN-cable, Audio Gear, etc) to minimize CPU load and to ensure that no other application wants to access your sound card. You can have a look at [Hardware Setup](Hardware-Setup) for more information how to setup Hardware. 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). + +### Jamulus main page +If you open Jamulus, you will see a window which looks like this: +![Jamulus main page](https://user-images.githubusercontent.com/20726856/100796017-4cfa4500-3420-11eb-9d35-aa206d392a5a.png) +We will now have a look what you should do if this is the first time you open Jamulus. +### 1. Setting a profile +The first thing you should do in Jamulus is to set your profile, so that others can identify you. To do so, click on "View" at the bar on the top. Now click on "My Profile..." and fill at least "Alias/Name". This page looks like this: +![Musician Profile](https://user-images.githubusercontent.com/20726856/100796411-e590c500-3420-11eb-9b62-e50d02cb009b.png) +You can now close this window. + +### 2. Connecting to a server +Now you can connect to a server. Click on "Connect" on the Jamulus main page, select your genre list (list on the top left), select a server and click on connect. Now you should be able to connect to the server. 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 you see on the right are like a mixing board: everything you change here will change your own mix. If you move something down, this user will be quieter, if you move something up, this user will be louder. It's that easy! Everything else like "panning", "solo", "group",... are advanced options. You can of course try them! + +If you don't want others to hear your audio, click on "Mute Myself" (left to the mixing board) which will stop your audio being sent to other musicians. That's sometimes a live saver (you will probably not want to disturb others with nasty phone calls). + +While we're already here: "Settings" opens - of course - the settings window with all the audio settings, and "Chat" the chat window. + +More information about the user interface can be found in the [Jamulus manual](Software-Manual). ## Advanced -* See the tips & tricks sections -* See setting up a server +Of course, you can do a lot more with Jamulus. Just click through the menus! ## Help and Community +If you need help or want to contribute to Jamulus you can have a look at the following links: ### Discussion Forums -Description; Link to SourceForge +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 -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 +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. Besides that, you can also contribute to this documentation: see the [Jamulus Website GitHub repository](https://github.com/jamulussoftware/jamuluswebsite) and have a look at the contribution file there. From c26f1c1ea6fb3007de49c2f64b214ead02974a9b Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Tue, 1 Dec 2020 22:40:10 +0100 Subject: [PATCH 022/280] page --> window --- wiki/en/en-Walk-Through.md | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/wiki/en/en-Walk-Through.md b/wiki/en/en-Walk-Through.md index dc7f7cded..d8964db50 100644 --- a/wiki/en/en-Walk-Through.md +++ b/wiki/en/en-Walk-Through.md @@ -9,17 +9,20 @@ Let's have a look what Jamulus looks like and what you should do after having in ## First start Before each online Jam, you should close all other programs, plugin everything (LAN-cable, Audio Gear, etc) to minimize CPU load and to ensure that no other application wants to access your sound card. You can have a look at [Hardware Setup](Hardware-Setup) for more information how to setup Hardware. 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). -### Jamulus main page +### Jamulus main window If you open Jamulus, you will see a window which looks like this: ![Jamulus main page](https://user-images.githubusercontent.com/20726856/100796017-4cfa4500-3420-11eb-9d35-aa206d392a5a.png) We will now have a look what you should do if this is the first time you open Jamulus. ### 1. Setting a profile -The first thing you should do in Jamulus is to set your profile, so that others can identify you. To do so, click on "View" at the bar on the top. Now click on "My Profile..." and fill at least "Alias/Name". This page looks like this: +The first thing you should do in Jamulus is to set your profile, so that others can identify you. To do so, click on "View" at the bar on the top. +This window looks like this: + ![Musician Profile](https://user-images.githubusercontent.com/20726856/100796411-e590c500-3420-11eb-9b62-e50d02cb009b.png) -You can now close this window. + +Now click on "My Profile..." and fill at least "Alias/Name" and afterwards close the window. ### 2. Connecting to a server -Now you can connect to a server. Click on "Connect" on the Jamulus main page, select your genre list (list on the top left), select a server and click on connect. Now you should be able to connect to the server. 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 can connect to a server. Click on "Connect" on the Jamulus main window, select your genre list (list on the top left), select a server and click on connect. Now you should be able to connect to the server. 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 you see on the right are like a mixing board: everything you change here will change your own mix. If you move something down, this user will be quieter, if you move something up, this user will be louder. It's that easy! Everything else like "panning", "solo", "group",... are advanced options. You can of course try them! From 32f6261554e7ffefc6ed1c0acf30b9921aad3529 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Tue, 1 Dec 2020 22:40:50 +0100 Subject: [PATCH 023/280] Style changes --- wiki/en/en-Walk-Through.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/en/en-Walk-Through.md b/wiki/en/en-Walk-Through.md index d8964db50..3fb1d6f60 100644 --- a/wiki/en/en-Walk-Through.md +++ b/wiki/en/en-Walk-Through.md @@ -19,7 +19,7 @@ This window looks like this: ![Musician Profile](https://user-images.githubusercontent.com/20726856/100796411-e590c500-3420-11eb-9b62-e50d02cb009b.png) -Now click on "My Profile..." and fill at least "Alias/Name" and afterwards close the window. +Now click on "My Profile...", fill at least "Alias/Name" and afterwards close the window. ### 2. Connecting to a server Now you can connect to a server. Click on "Connect" on the Jamulus main window, select your genre list (list on the top left), select a server and click on connect. Now you should be able to connect to the server. 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). From dbfa7d7253167347e85c10532f8d8aba30af6864 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Tue, 1 Dec 2020 22:45:21 +0100 Subject: [PATCH 024/280] Rephrase --- wiki/en/en-Walk-Through.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/wiki/en/en-Walk-Through.md b/wiki/en/en-Walk-Through.md index 3fb1d6f60..1ca0ed760 100644 --- a/wiki/en/en-Walk-Through.md +++ b/wiki/en/en-Walk-Through.md @@ -11,7 +11,9 @@ Before each online Jam, you should close all other programs, plugin everything ( ### Jamulus main window If you open Jamulus, you will see a window which looks like this: + ![Jamulus main page](https://user-images.githubusercontent.com/20726856/100796017-4cfa4500-3420-11eb-9d35-aa206d392a5a.png) + We will now have a look what you should do if this is the first time you open Jamulus. ### 1. Setting a profile The first thing you should do in Jamulus is to set your profile, so that others can identify you. To do so, click on "View" at the bar on the top. @@ -30,9 +32,9 @@ If you don't want others to hear your audio, click on "Mute Myself" (left to the While we're already here: "Settings" opens - of course - the settings window with all the audio settings, and "Chat" the chat window. -More information about the user interface can be found in the [Jamulus manual](Software-Manual). +More information about the user interface can be found in the [Software Manual](Software-Manual). ## Advanced -Of course, you can do a lot more with Jamulus. Just click through the menus! +Of course, you can do a lot more with Jamulus, like setting up a private server, doing online concerts,... Just click through the navigation! ## Help and Community If you need help or want to contribute to Jamulus you can have a look at the following links: From 83ab080b84e01c5f3495b9d332ec1c366ec6b1b7 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Tue, 1 Dec 2020 22:54:50 +0100 Subject: [PATCH 025/280] Add mixer screenshot --- wiki/en/en-Walk-Through.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/wiki/en/en-Walk-Through.md b/wiki/en/en-Walk-Through.md index 1ca0ed760..23778fe8e 100644 --- a/wiki/en/en-Walk-Through.md +++ b/wiki/en/en-Walk-Through.md @@ -7,7 +7,7 @@ permalink: "/wiki/Walk-Through" # Jamulus walk-through Let's have a look what Jamulus looks like and what you should do after having installed the software. ## First start -Before each online Jam, you should close all other programs, plugin everything (LAN-cable, Audio Gear, etc) to minimize CPU load and to ensure that no other application wants to access your sound card. You can have a look at [Hardware Setup](Hardware-Setup) for more information how to setup Hardware. 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). +Before each online Jam, you should close all other programs, plugin everything (LAN-cable, audio gear, etc) to minimize CPU load and to ensure that no other application wants to access your sound card. You can have a look at [Hardware Setup](Hardware-Setup) for more information how to setup Hardware. 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). ### Jamulus main window If you open Jamulus, you will see a window which looks like this: @@ -16,17 +16,19 @@ If you open Jamulus, you will see a window which looks like this: We will now have a look what you should do if this is the first time you open Jamulus. ### 1. Setting a profile -The first thing you should do in Jamulus is to set your profile, so that others can identify you. To do so, click on "View" at the bar on the top. -This window looks like this: +The first thing you should do in Jamulus is to set your profile, so that others can identify you. To do so, click on "View" at the bar on the top and on "My Profile..." +Now a window like this will open: ![Musician Profile](https://user-images.githubusercontent.com/20726856/100796411-e590c500-3420-11eb-9b62-e50d02cb009b.png) -Now click on "My Profile...", fill at least "Alias/Name" and afterwards close the window. +Fill at least "Alias/Name" and afterwards close the window to make it easier for others to identify who you are. ### 2. Connecting to a server Now you can connect to a server. Click on "Connect" on the Jamulus main window, select your genre list (list on the top left), select a server and click on connect. Now you should be able to connect to the server. 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 you see on the right are like a mixing board: everything you change here will change your own mix. If you move something down, this user will be quieter, if you move something up, this user will be louder. It's that easy! Everything else like "panning", "solo", "group",... are advanced options. You can of course try them! +Congrats! You can now start jamming with Jamulus. The sliders you see on the right are like a mixing board: everything you change here will change your own mix. If you move something down, this user will be quieter, if you move something up, this user will be louder. It's that easy! Everything else like "PAN", "SOLO", "GRP",... are advanced options. You can of course try them! + +![Jamulus Mixer](https://user-images.githubusercontent.com/20726856/100801241-01e43000-3428-11eb-8d61-e03b5e648971.png) If you don't want others to hear your audio, click on "Mute Myself" (left to the mixing board) which will stop your audio being sent to other musicians. That's sometimes a live saver (you will probably not want to disturb others with nasty phone calls). From 00779d303f51f6455c5becb2585c76f8068cf9ae Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Tue, 1 Dec 2020 22:55:15 +0100 Subject: [PATCH 026/280] Rename alt text --- wiki/en/en-Walk-Through.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/en/en-Walk-Through.md b/wiki/en/en-Walk-Through.md index 23778fe8e..629b7c76a 100644 --- a/wiki/en/en-Walk-Through.md +++ b/wiki/en/en-Walk-Through.md @@ -28,7 +28,7 @@ Now you can connect to a server. Click on "Connect" on the Jamulus main window, ### The first Jam Congrats! You can now start jamming with Jamulus. The sliders you see on the right are like a mixing board: everything you change here will change your own mix. If you move something down, this user will be quieter, if you move something up, this user will be louder. It's that easy! Everything else like "PAN", "SOLO", "GRP",... are advanced options. You can of course try them! -![Jamulus Mixer](https://user-images.githubusercontent.com/20726856/100801241-01e43000-3428-11eb-8d61-e03b5e648971.png) +![Jamulus main mixer connected](https://user-images.githubusercontent.com/20726856/100801241-01e43000-3428-11eb-8d61-e03b5e648971.png) If you don't want others to hear your audio, click on "Mute Myself" (left to the mixing board) which will stop your audio being sent to other musicians. That's sometimes a live saver (you will probably not want to disturb others with nasty phone calls). From 4d16eccbc4c66292cc0f205694f9842401336f1a Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Tue, 1 Dec 2020 23:34:30 +0100 Subject: [PATCH 027/280] #60 More specific information added --- wiki/en/en-Contribution.md | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/wiki/en/en-Contribution.md b/wiki/en/en-Contribution.md index 6e86593e9..979e71157 100644 --- a/wiki/en/en-Contribution.md +++ b/wiki/en/en-Contribution.md @@ -7,12 +7,19 @@ permalink: "/wiki/Contribution" # Contributing to the Jamulus Project -You can contribute to [this documentation](https://github.com/jamulussoftware/jamuluswebsite) by opening a pull request with with the following title: +## Jamulus Software +* If you want to contribute code, post your idea on [the developer forum](https://sourceforge.net/p/llcon/discussion/developerforum/) first so that it can be discussed before making a pull request (be sure to read main dev's [Volker's manifesto for contributions](https://github.com/corrados/jamulus/issues/596)) -`[language code (e.g. en)] {short description of your changes}` on the [Documentation repo](https://github.com/jamulussoftware/jamuluswebsite). If your change involves the need of translation, please write that in the description. +See the [Jamulus GitHub repo](https://github.com/corrados/jamulus) for further information. -### The more people can improve Jamulus, the better! +## Jamulus Website -* Have a look at our coding and [contribution guidelines](https://github.com/corrados/jamulus/issues/596) and [Jamulus GitHub repo](https://github.com/corrados/jamulus). +* If you find a mistake, typo or something out of date (in any language) on the website, you can [raise it as an issue here](https://github.com/jamulussoftware/jamuluswebsite/issues). -* Note also the [compilation guide](/wiki/Compiling) for various platforms. +* 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. + +Pull requests for the website should look like this: + +`[language code (e.g. en)] {short description of your changes}` on + +See the [Website GitHub repo](https://github.com/jamulussoftware/jamuluswebsite) for further information. From da26d671d15d0f6a36f9a4ca8c8ed4ede44d72da Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Wed, 2 Dec 2020 22:20:56 +0100 Subject: [PATCH 028/280] Remove macOS OS --- wiki/en/en-Software-Manual.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/wiki/en/en-Software-Manual.md b/wiki/en/en-Software-Manual.md index b94a7c02d..3a533730f 100644 --- a/wiki/en/en-Software-Manual.md +++ b/wiki/en/en-Software-Manual.md @@ -144,8 +144,7 @@ Settings Window ![Sound card device macOS](https://user-images.githubusercontent.com/20726856/97361570-02752e00-18a0-11eb-8475-e92a57ce6ae7.png) The ASIO driver (sound card) can be selected using Jamulus under the Windows operating system. If the selected ASIO -driver is not valid an error message is shown and the previous valid driver is selected. Under the macOS operating -system the input and output hardware can be selected. +driver is not valid an error message is shown and the previous valid driver is selected. Under macOS the input and output hardware can be selected. ### Input/output channel mapping From ce22d7dd04301e30075c7766cc20b8a717679e26 Mon Sep 17 00:00:00 2001 From: Olivier Humbert Date: Wed, 2 Dec 2020 22:30:48 +0100 Subject: [PATCH 029/280] 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 04de91608..d02ffe5f0 100644 --- a/wiki/en/en-Software-Manual.md +++ b/wiki/en/en-Software-Manual.md @@ -78,7 +78,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 maxmium 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 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. You can filter the list by server name or location. To list only occupied servers, enter a "#" character. @@ -117,7 +117,7 @@ The faders allow you to adjust the level of what you hear without affecting what The VU meter shows the input level at the server - that is, the sound being sent. -If you have set your Audio Channel to Stereo or Stereo Out in your Settings, you will also see a pan control (shift-click to reset). +If you have set your Audio Channel to Stereo or Stereo Out in your Settings, you will also see a pan control (shift-right-click to reset). If you see a "mute" icon above a channel, it means that musician cannot hear you. Either they have muted you, soloed one or more channels not including yours, or have set your fader in their mix to zero. @@ -177,7 +177,7 @@ In this case the buffer delay setting is disabled and has to be changed using th ![Buffer delay Windows](https://user-images.githubusercontent.com/20726856/97361808-65ff5b80-18a0-11eb-88d6-fb2131f10c75.png) -On Linux, use the Jack configuration tool to change the buffer size. +On Linux, use the JACK configuration tool to change the buffer size. The actual buffer delay has 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 @@ -261,4 +261,4 @@ your distance to the server is too large or your internet connection is not suff Overall Delay is calculated from the current Ping Time and the delay introduced by the current buffer settings. Audio Upstream Rate depends on the current audio packet size and compression setting. Make sure that the upstream -rate is not higher than your available internet upload speed (check this with a service such as [speedtest.net](http://speedtest.net)). +rate is not higher than your available internet upload speed (check this with a service such as [librespeed.org](https://librespeed.org/)). From 4f678e664279500a08d77f71bad9368db6452cd7 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Thu, 3 Dec 2020 12:35:19 +0100 Subject: [PATCH 030/280] Update en-Walk-Through.md --- wiki/en/en-Walk-Through.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/en/en-Walk-Through.md b/wiki/en/en-Walk-Through.md index 629b7c76a..4b291b5ec 100644 --- a/wiki/en/en-Walk-Through.md +++ b/wiki/en/en-Walk-Through.md @@ -7,7 +7,7 @@ permalink: "/wiki/Walk-Through" # Jamulus walk-through Let's have a look what Jamulus looks like and what you should do after having installed the software. ## First start -Before each online Jam, you should close all other programs, plugin everything (LAN-cable, audio gear, etc) to minimize CPU load and to ensure that no other application wants to access your sound card. You can have a look at [Hardware Setup](Hardware-Setup) for more information how to setup Hardware. 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). +Before each online Jam, you should close all other programs, plugin everything (LAN-cable, audio gear, etc) to minimise CPU load and to ensure that no other application wants to access your sound card. You can have a look at [Hardware Setup](Hardware-Setup) for more information how to setup your hardware. 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). ### Jamulus main window If you open Jamulus, you will see a window which looks like this: From 2e19aaf558b2a9bcb1bff1cb21a28febe1654c85 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Thu, 3 Dec 2020 12:45:01 +0100 Subject: [PATCH 031/280] Update en-Walk-Through.md --- wiki/en/en-Walk-Through.md | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/wiki/en/en-Walk-Through.md b/wiki/en/en-Walk-Through.md index 4b291b5ec..3bb63b58a 100644 --- a/wiki/en/en-Walk-Through.md +++ b/wiki/en/en-Walk-Through.md @@ -7,26 +7,30 @@ permalink: "/wiki/Walk-Through" # Jamulus walk-through Let's have a look what Jamulus looks like and what you should do after having installed the software. ## First start -Before each online Jam, you should close all other programs, plugin everything (LAN-cable, audio gear, etc) to minimise CPU load and to ensure that no other application wants to access your sound card. You can have a look at [Hardware Setup](Hardware-Setup) for more information how to setup your hardware. 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). +Before each time you start Jamulus: +1. Close all other applications +2. Plugin everything (LAN-cable, audio gear, etc) to minimise CPU load and to ensure that no other application wants to access your sound card + +You can have a look at [Hardware Setup](Hardware-Setup) for more information how to setup your hardware. 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). ### Jamulus main window If you open Jamulus, you will see a window which looks like this: ![Jamulus main page](https://user-images.githubusercontent.com/20726856/100796017-4cfa4500-3420-11eb-9d35-aa206d392a5a.png) -We will now have a look what you should do if this is the first time you open Jamulus. -### 1. Setting a profile -The first thing you should do in Jamulus is to set your profile, so that others can identify you. To do so, click on "View" at the bar on the top and on "My Profile..." +We will now have a look what you should do for the first start of Jamulus. +### 1. Setting up a profile +The first thing you should do is to set your profile, so that others can identify you. To do so, click on "View" at the bar on the top and on "My Profile..." Now a window like this will open: ![Musician Profile](https://user-images.githubusercontent.com/20726856/100796411-e590c500-3420-11eb-9b62-e50d02cb009b.png) -Fill at least "Alias/Name" and afterwards close the window to make it easier for others to identify who you are. +Fill at least "Alias/Name" and close the window to make it easier for others to identify who you are. ### 2. Connecting to a server -Now you can connect to a server. Click on "Connect" on the Jamulus main window, select your genre list (list on the top left), select a server and click on connect. Now you should be able to connect to the server. 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 can connect to a server. Click on "Connect" in the Jamulus main window, select your genre list (list on the top left), select a server and click on "Connect". Now you should be able to connect to the server. 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 like a mixing board: everything you change here will change your own mix. If you move something down, this user will be quieter, if you move something up, this user will be louder. It's that easy! Everything else like "PAN", "SOLO", "GRP",... are advanced options. You can of course try them! +Congrats! You can now start jamming with Jamulus. The sliders you see on the right are like a mixing board: everything you change here will change your own mix. If you move a slider down, this user will be quieter, if you move it up, this user will be louder. It's that easy! Everything else like "PAN", "SOLO", "GRP",... are advanced options. You can of course try them! ![Jamulus main mixer connected](https://user-images.githubusercontent.com/20726856/100801241-01e43000-3428-11eb-8d61-e03b5e648971.png) From 7d16c8be9255dbfac86bdfd95c4f3ac54b8210d2 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Thu, 3 Dec 2020 13:16:16 +0100 Subject: [PATCH 032/280] Update en-Walk-Through.md --- wiki/en/en-Walk-Through.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/wiki/en/en-Walk-Through.md b/wiki/en/en-Walk-Through.md index 3bb63b58a..e65f4f531 100644 --- a/wiki/en/en-Walk-Through.md +++ b/wiki/en/en-Walk-Through.md @@ -7,9 +7,9 @@ permalink: "/wiki/Walk-Through" # Jamulus walk-through Let's have a look what Jamulus looks like and what you should do after having installed the software. ## First start -Before each time you start Jamulus: +Before start Jamulus: 1. Close all other applications -2. Plugin everything (LAN-cable, audio gear, etc) to minimise CPU load and to ensure that no other application wants to access your sound card +2. Plugin everything (ethernet cable, audio gear, etc) to minimise CPU load 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 how to setup your hardware. 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). @@ -20,21 +20,21 @@ If you open Jamulus, you will see a window which looks like this: We will now have a look what you should do for the first start of Jamulus. ### 1. Setting up a profile -The first thing you should do is to set your profile, so that others can identify you. To do so, click on "View" at the bar on the top and on "My Profile..." -Now a window like this will open: +To allow others to identify who you are, you should set your profile. To do so, click on "View" (bar on the top) and on "My Profile..." +Now a window will open: ![Musician Profile](https://user-images.githubusercontent.com/20726856/100796411-e590c500-3420-11eb-9b62-e50d02cb009b.png) -Fill at least "Alias/Name" and close the window to make it easier for others to identify who you are. +Fill at least "Alias/Name" and close the window. ### 2. Connecting to a server -Now you can connect to a server. Click on "Connect" in the Jamulus main window, select your genre list (list on the top left), select a server and click on "Connect". Now you should be able to connect to the server. 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 can connect to a server. Click on "Connect" in the Jamulus main window, select your genre list (top left), select a server and click on "Connect". Now you should be able to connect to the server. 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 like a mixing board: everything you change here will change your own mix. If you move a slider down, this user will be quieter, if you move it up, this user will be louder. It's that easy! Everything else like "PAN", "SOLO", "GRP",... are advanced options. You can of course try them! +Congrats! You can now start jamming with Jamulus. The sliders you see on the right work like a mixing board: everything you change here will change what you hear. If you move a slider down, this user will be quieter, if you move it up, this user will be louder for you. It's that easy! Everything else like "PAN", "SOLO", "GRP",... are advanced options. You can try them of course! ![Jamulus main mixer connected](https://user-images.githubusercontent.com/20726856/100801241-01e43000-3428-11eb-8d61-e03b5e648971.png) -If you don't want others to hear your audio, click on "Mute Myself" (left to the mixing board) which will stop your audio being sent to other musicians. That's sometimes a live saver (you will probably not want to disturb others with nasty phone calls). +If you don't want others to hear your audio, click on "Mute Myself" (left to the mixing board) which will stop your audio from being sent to other musicians. That's sometimes a life saver (you will probably not want to disturb others if your phone rings). While we're already here: "Settings" opens - of course - the settings window with all the audio settings, and "Chat" the chat window. @@ -43,7 +43,7 @@ More information about the user interface can be found in the [Software Manual]( Of course, you can do a lot more with Jamulus, like setting up a private server, doing online concerts,... Just click through the navigation! ## Help and Community -If you need help or want to contribute to Jamulus you can have a look at the following links: +If you need help or want to contribute to the Jamulus Project, you can have a look at the following links: ### Discussion Forums 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 From df34b700b3affe5da8df40f9a27cb45cde5656a8 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Thu, 3 Dec 2020 13:21:22 +0100 Subject: [PATCH 033/280] Update en-Walk-Through.md --- wiki/en/en-Walk-Through.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/en/en-Walk-Through.md b/wiki/en/en-Walk-Through.md index e65f4f531..6cc5f6c63 100644 --- a/wiki/en/en-Walk-Through.md +++ b/wiki/en/en-Walk-Through.md @@ -7,7 +7,7 @@ permalink: "/wiki/Walk-Through" # Jamulus walk-through Let's have a look what Jamulus looks like and what you should do after having installed the software. ## First start -Before start Jamulus: +Before you start Jamulus: 1. Close all other applications 2. Plugin everything (ethernet cable, audio gear, etc) to minimise CPU load and to ensure that no other application tries to use your sound card. From e52d4e8cef34d47ebb5444c173e5539a09c336d7 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Thu, 3 Dec 2020 14:00:25 +0100 Subject: [PATCH 034/280] Update en-Walk-Through.md --- wiki/en/en-Walk-Through.md | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/wiki/en/en-Walk-Through.md b/wiki/en/en-Walk-Through.md index 6cc5f6c63..f225299b2 100644 --- a/wiki/en/en-Walk-Through.md +++ b/wiki/en/en-Walk-Through.md @@ -9,42 +9,46 @@ Let's have a look what Jamulus looks like and what you should do after having in ## First start Before you start Jamulus: 1. Close all other applications -2. Plugin everything (ethernet cable, audio gear, etc) to minimise CPU load and to ensure that no other application tries to use your sound card. +2. Plugin everything (ethernet cable, audio gear, etc.) + +...to minimise CPU load 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 how to setup your hardware. 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). ### Jamulus main window If you open Jamulus, you will see a window which looks like this: -![Jamulus main page](https://user-images.githubusercontent.com/20726856/100796017-4cfa4500-3420-11eb-9d35-aa206d392a5a.png) +![Jamulus main window](https://user-images.githubusercontent.com/20726856/100796017-4cfa4500-3420-11eb-9d35-aa206d392a5a.png) -We will now have a look what you should do for the first start of Jamulus. ### 1. Setting up a profile -To allow others to identify who you are, you should set your profile. To do so, click on "View" (bar on the top) and on "My Profile..." -Now a window will open: +To allow others to identify who you are, you should set your profile. To do so, click on "View" (bar on the top)>"My Profile..." +Now you will see this: ![Musician Profile](https://user-images.githubusercontent.com/20726856/100796411-e590c500-3420-11eb-9b62-e50d02cb009b.png) -Fill at least "Alias/Name" and close the window. +Fill at least "Alias/Name" to set your name and close the window. ### 2. Connecting to a server -Now you can connect to a server. Click on "Connect" in the Jamulus main window, select your genre list (top left), select a server and click on "Connect". Now you should be able to connect to the server. 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 can connect to a server. Click on "Connect" in the Jamulus main window, select a genre list (selection box on the top left), select a server and click on "Connect". Now you should be connected to the server. 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 work like a mixing board: everything you change here will change what you hear. If you move a slider down, this user will be quieter, if you move it up, this user will be louder for you. It's that easy! Everything else like "PAN", "SOLO", "GRP",... are advanced options. You can try them of course! +Congrats! You can now start jamming with Jamulus. The sliders you see on the right work like a mixing desk: everything you change here will change what you hear. If you move a slider down, this user will be quieter, if you move it up, this user will be louder for you. It's that easy! Everything else like "PAN", "SOLO", "GRP",... are advanced options. You can try them of course! ![Jamulus main mixer connected](https://user-images.githubusercontent.com/20726856/100801241-01e43000-3428-11eb-8d61-e03b5e648971.png) -If you don't want others to hear your audio, click on "Mute Myself" (left to the mixing board) which will stop your audio from being sent to other musicians. That's sometimes a life saver (you will probably not want to disturb others if your phone rings). +If you don't want others to hear your audio, click on "Mute Myself" (left to the mixing board) which will stop your audio from being sent to other musicians. While we're already here: "Settings" opens - of course - the settings window with all the audio settings, and "Chat" the chat window. More information about the user interface can be found in the [Software Manual](Software-Manual). + ## Advanced Of course, you can do a lot more with Jamulus, like setting up a private server, doing online concerts,... Just click through the navigation! ## Help and Community If you need help or want to contribute to the Jamulus Project, you can have a look at the following links: + ### Discussion Forums 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. Besides that, you can also contribute to this documentation: see the [Jamulus Website GitHub repository](https://github.com/jamulussoftware/jamuluswebsite) and have a look at the contribution file there. From 8cf7ec0f3044f8e7f729e73ea01e57584b662975 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Thu, 3 Dec 2020 14:12:54 +0100 Subject: [PATCH 035/280] Update en-Walk-Through.md --- wiki/en/en-Walk-Through.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/wiki/en/en-Walk-Through.md b/wiki/en/en-Walk-Through.md index f225299b2..b16962ac5 100644 --- a/wiki/en/en-Walk-Through.md +++ b/wiki/en/en-Walk-Through.md @@ -5,7 +5,7 @@ lang: "en" permalink: "/wiki/Walk-Through" --- # Jamulus walk-through -Let's have a look what Jamulus looks like and what you should do after having installed the software. +Let's have a look at what Jamulus looks like and what you should do after having installed the software. ## First start Before you start Jamulus: 1. Close all other applications @@ -13,7 +13,7 @@ Before you start Jamulus: ...to minimise CPU load 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 how to setup your hardware. 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). +You can have a look at [Hardware Setup](Hardware-Setup) for more information on how to set up your hardware. 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). ### Jamulus main window If you open Jamulus, you will see a window which looks like this: @@ -29,9 +29,9 @@ Now you will see this: Fill at least "Alias/Name" to set your name and close the window. ### 2. Connecting to a server -Now you can connect to a server. Click on "Connect" in the Jamulus main window, select a genre list (selection box on the top left), select a server and click on "Connect". Now you should be connected to the server. 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 can connect to a server. Click on "Connect" in the Jamulus main window, select a genre list (selection box on the top left), select a server, and click on "Connect". Now you should be connected to the server. 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 work like a mixing desk: everything you change here will change what you hear. If you move a slider down, this user will be quieter, if you move it up, this user will be louder for you. It's that easy! Everything else like "PAN", "SOLO", "GRP",... are advanced options. You can try them of course! +Congrats! You can now start jamming with Jamulus. The sliders you see on the right work as a mixing desk: everything you change here will change what you hear. If you move a slider down, this user will be quieter, if you move it up, this user will be louder for you. It's that easy! Everything else like "PAN", "SOLO", "GRP",... are advanced options. You can try them of course! ![Jamulus main mixer connected](https://user-images.githubusercontent.com/20726856/100801241-01e43000-3428-11eb-8d61-e03b5e648971.png) @@ -48,7 +48,7 @@ Of course, you can do a lot more with Jamulus, like setting up a private server, If you need help or want to contribute to the Jamulus Project, you can have a look at the following links: ### Discussion Forums -For help, chat and general discussions about Jamulus: Have a look at the [forums on SourceForge](https://sourceforge.net/p/llcon/discussion/). +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. Besides that, you can also contribute to this documentation: see the [Jamulus Website GitHub repository](https://github.com/jamulussoftware/jamuluswebsite) and have a look at the contribution file there. +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. From 9c8609cc4acf9d8b44ebbecec6a55146cc6a1a2f Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Thu, 3 Dec 2020 14:14:41 +0100 Subject: [PATCH 036/280] Update en-Walk-Through.md --- wiki/en/en-Walk-Through.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/wiki/en/en-Walk-Through.md b/wiki/en/en-Walk-Through.md index b16962ac5..7c56ec2e8 100644 --- a/wiki/en/en-Walk-Through.md +++ b/wiki/en/en-Walk-Through.md @@ -52,3 +52,5 @@ For help, chat, and general discussions about Jamulus: Have a look at the [forum ### 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. + +Besides that, you can also contribute to this documentation: see the [Jamulus Website GitHub repository](https://github.com/jamulussoftware/jamuluswebsite) and have a look at the contribution file there. From ac7247d2e5452f17005dd5ff054d941a2c5e7b3c Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Thu, 3 Dec 2020 14:49:01 +0100 Subject: [PATCH 037/280] Update en-Walk-Through.md --- wiki/en/en-Walk-Through.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/wiki/en/en-Walk-Through.md b/wiki/en/en-Walk-Through.md index 7c56ec2e8..d74cfd6f2 100644 --- a/wiki/en/en-Walk-Through.md +++ b/wiki/en/en-Walk-Through.md @@ -9,9 +9,9 @@ Let's have a look at what Jamulus looks like and what you should do after having ## First start Before you start Jamulus: 1. Close all other applications -2. Plugin everything (ethernet cable, audio gear, etc.) +2. Plugin everything (Ethernet cable, audio gear, etc.) -...to minimise CPU load and to ensure that no other application tries to use your sound card. +... to minimise CPU load 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 how to set up your hardware. 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). @@ -31,18 +31,18 @@ Fill at least "Alias/Name" to set your name and close the window. ### 2. Connecting to a server Now you can connect to a server. Click on "Connect" in the Jamulus main window, select a genre list (selection box on the top left), select a server, and click on "Connect". Now you should be connected to the server. 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 work as a mixing desk: everything you change here will change what you hear. If you move a slider down, this user will be quieter, if you move it up, this user will be louder for you. It's that easy! Everything else like "PAN", "SOLO", "GRP",... are advanced options. You can try them of course! +Congrats! You can now start jamming with Jamulus. The sliders you see on the right work as a mixing desk: everything you change here will change what you hear. If you move a slider down, this user will be quieter, if you move it up, this user will be louder for you. It's that easy! Everything else like "PAN", "SOLO", "GRP", ... are advanced options. You can try them of course! ![Jamulus main mixer connected](https://user-images.githubusercontent.com/20726856/100801241-01e43000-3428-11eb-8d61-e03b5e648971.png) If you don't want others to hear your audio, click on "Mute Myself" (left to the mixing board) which will stop your audio from being sent to other musicians. -While we're already here: "Settings" opens - of course - the settings window with all the audio settings, and "Chat" the chat window. +While we're already here: "Settings" opens – of course – the settings window with all the audio settings, and "Chat" the chat window. More information about the user interface can be found in the [Software Manual](Software-Manual). ## Advanced -Of course, you can do a lot more with Jamulus, like setting up a private server, doing online concerts,... Just click through the navigation! +Of course, you can do a lot more with Jamulus, like setting up a private server, doing online concerts, ... Just click through the navigation! ## Help and Community If you need help or want to contribute to the Jamulus Project, you can have a look at the following links: From a7f7ec3de004cc53a02ad6ce465759de47ae5a5d Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Thu, 3 Dec 2020 22:47:18 +0100 Subject: [PATCH 038/280] Create knowledgebaseart --- .github/ISSUE_TEMPLATE/knowledgebaseart | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/knowledgebaseart diff --git a/.github/ISSUE_TEMPLATE/knowledgebaseart b/.github/ISSUE_TEMPLATE/knowledgebaseart new file mode 100644 index 000000000..f76043e9d --- /dev/null +++ b/.github/ISSUE_TEMPLATE/knowledgebaseart @@ -0,0 +1,11 @@ +--- +name: Knowledge Base article +about: Add a new article or discuss an article in the knowledge base +title: '[KB]' +labels: 'enhancement' +assignees: 'KB Entry' +--- + +**Shortly describe what your article should be about (5 sentences)** + +**Do you already have a draft?** From db57d35ed6b8a91e3fdedbec82aedb53cd629765 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Thu, 3 Dec 2020 22:48:46 +0100 Subject: [PATCH 039/280] Rename kb template --- .github/ISSUE_TEMPLATE/{knowledgebaseart => knowledgebaseart.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/ISSUE_TEMPLATE/{knowledgebaseart => knowledgebaseart.md} (100%) diff --git a/.github/ISSUE_TEMPLATE/knowledgebaseart b/.github/ISSUE_TEMPLATE/knowledgebaseart.md similarity index 100% rename from .github/ISSUE_TEMPLATE/knowledgebaseart rename to .github/ISSUE_TEMPLATE/knowledgebaseart.md From 9eadad238f26dbbf9e0a947492cb3a6380561af1 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Thu, 3 Dec 2020 22:51:13 +0100 Subject: [PATCH 040/280] Update knowledgebaseart.md --- .github/ISSUE_TEMPLATE/knowledgebaseart.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/knowledgebaseart.md b/.github/ISSUE_TEMPLATE/knowledgebaseart.md index f76043e9d..023b6931e 100644 --- a/.github/ISSUE_TEMPLATE/knowledgebaseart.md +++ b/.github/ISSUE_TEMPLATE/knowledgebaseart.md @@ -1,11 +1,15 @@ --- name: Knowledge Base article -about: Add a new article or discuss an article in the knowledge base +about: Add a new article or discuss an article of the knowledge base title: '[KB]' labels: 'enhancement' assignees: 'KB Entry' --- +**Is this issue related to an existing article? If yes, please post the url?** -**Shortly describe what your article should be about (5 sentences)** +**Do you want to add a new article?** +**If yes: Shortly describe what your article should be about (5 sentences)** **Do you already have a draft?** + +**Describe your issue** From 8948b3f31d0838642d205fdccd2d39108ad54b58 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Sat, 5 Dec 2020 12:30:30 +0100 Subject: [PATCH 041/280] First fix review --- wiki/en/en-Walk-Through.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wiki/en/en-Walk-Through.md b/wiki/en/en-Walk-Through.md index d74cfd6f2..45fcca9ae 100644 --- a/wiki/en/en-Walk-Through.md +++ b/wiki/en/en-Walk-Through.md @@ -9,7 +9,7 @@ Let's have a look at what Jamulus looks like and what you should do after having ## First start Before you start Jamulus: 1. Close all other applications -2. Plugin everything (Ethernet cable, audio gear, etc.) +2. Connect everything (Ethernet cable, audio gear, etc.) ... to minimise CPU load and to ensure that no other application tries to use your sound card. @@ -51,6 +51,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/corrados/jamulus/) and read the contributing file there. Besides that, you can also contribute to this documentation: see the [Jamulus Website GitHub repository](https://github.com/jamulussoftware/jamuluswebsite) and have a look at the contribution file there. From cee95bf01d20afcd40655bc9b0799e54a0e48fce Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Sat, 5 Dec 2020 12:31:59 +0100 Subject: [PATCH 042/280] second fix review --- wiki/en/en-Walk-Through.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/wiki/en/en-Walk-Through.md b/wiki/en/en-Walk-Through.md index 45fcca9ae..c2caadd0b 100644 --- a/wiki/en/en-Walk-Through.md +++ b/wiki/en/en-Walk-Through.md @@ -11,27 +11,27 @@ Before you start Jamulus: 1. Close all other applications 2. Connect everything (Ethernet cable, audio gear, etc.) -... to minimise CPU load and to ensure that no other application tries to use your sound card. +... 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 how to set up your hardware. 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). +You can have a look at [Hardware Setup](Hardware-Setup) for more information on what to do with that. 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). ### Jamulus main window -If you open Jamulus, you will see a window which looks like this: +When you open Jamulus, you will see a window which looks like this: ![Jamulus main window](https://user-images.githubusercontent.com/20726856/100796017-4cfa4500-3420-11eb-9d35-aa206d392a5a.png) ### 1. Setting up a profile -To allow others to identify who you are, you should set your profile. To do so, click on "View" (bar on the top)>"My Profile..." +To let others know who you are, you should set up your profile. To do so, click on "View" (bar on the top)>"My Profile..." Now you will see this: ![Musician Profile](https://user-images.githubusercontent.com/20726856/100796411-e590c500-3420-11eb-9b62-e50d02cb009b.png) -Fill at least "Alias/Name" to set your name and close the window. +Fill in at least "Alias/Name" to set your name and close the window. ### 2. Connecting to a server -Now you can connect to a server. Click on "Connect" in the Jamulus main window, select a genre list (selection box on the top left), select a server, and click on "Connect". Now you should be connected to the server. 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). +Click on "Connect" in the Jamulus main window, select a genre from the list in the top left, select a server, and click on "Connect". Now you should be connected to the server. 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 work as a mixing desk: everything you change here will change what you hear. If you move a slider down, this user will be quieter, if you move it up, this user will be louder for you. It's that easy! Everything else like "PAN", "SOLO", "GRP", ... are advanced options. You can try them of course! +Congrats! You can now start jamming with Jamulus. The sliders you see on the right work as a mixing desk: everything you change here will change what you hear. If you move a slider down, this user will be quieter, if you move it up, this user will be louder for you. Everything else like "PAN", "SOLO", "GRP", ... are advanced options. You can try them of course! ![Jamulus main mixer connected](https://user-images.githubusercontent.com/20726856/100801241-01e43000-3428-11eb-8d61-e03b5e648971.png) @@ -39,10 +39,10 @@ If you don't want others to hear your audio, click on "Mute Myself" (left to the While we're already here: "Settings" opens – of course – the settings window with all the audio settings, and "Chat" the chat window. -More information about the user interface can be found in the [Software Manual](Software-Manual). +More information about using Jamulus can be found in the [Software Manual](Software-Manual). ## Advanced -Of course, you can do a lot more with Jamulus, like setting up a private server, doing online concerts, ... Just click through the navigation! +Of course, you can do a lot more with Jamulus, like setting up a private server, doing online concerts, ... Have a look at the website! ## Help and Community If you need help or want to contribute to the Jamulus Project, you can have a look at the following links: From 8842bc80aa70c6d67719daad3ea631e712d91546 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Sat, 5 Dec 2020 12:42:42 +0100 Subject: [PATCH 043/280] Third fix --- wiki/en/en-Walk-Through.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/en/en-Walk-Through.md b/wiki/en/en-Walk-Through.md index c2caadd0b..db12942b5 100644 --- a/wiki/en/en-Walk-Through.md +++ b/wiki/en/en-Walk-Through.md @@ -8,7 +8,7 @@ permalink: "/wiki/Walk-Through" Let's have a look at what Jamulus looks like and what you should do after having installed the software. ## First start Before you start Jamulus: -1. Close all other applications +1. For now, close all other applications. It's best to start from zero at first. 2. 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. 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 044/280] 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 From 470c08993ab8ddfd9bba0ef93250b97d3c977c61 Mon Sep 17 00:00:00 2001 From: Olivier Humbert Date: Sat, 5 Dec 2020 23:52:01 +0100 Subject: [PATCH 045/280] Update en-Software-Manual.md --- 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 d02ffe5f0..ff595c672 100644 --- a/wiki/en/en-Software-Manual.md +++ b/wiki/en/en-Software-Manual.md @@ -117,7 +117,7 @@ The faders allow you to adjust the level of what you hear without affecting what The VU meter shows the input level at the server - that is, the sound being sent. -If you have set your Audio Channel to Stereo or Stereo Out in your Settings, you will also see a pan control (shift-right-click to reset). +If you have set your Audio Channel to Stereo or Stereo Out in your Settings, you will also see a pan control (shift-click to reset). If you see a "mute" icon above a channel, it means that musician cannot hear you. Either they have muted you, soloed one or more channels not including yours, or have set your fader in their mix to zero. From 3ad9914939e735d22f2c93924cebe3dce4c76323 Mon Sep 17 00:00:00 2001 From: Olivier Humbert Date: Sat, 5 Dec 2020 23:57:02 +0100 Subject: [PATCH 046/280] Update en-Software-Manual.md --- 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 ff595c672..d682fc8b5 100644 --- a/wiki/en/en-Software-Manual.md +++ b/wiki/en/en-Software-Manual.md @@ -261,4 +261,4 @@ your distance to the server is too large or your internet connection is not suff Overall Delay is calculated from the current Ping Time and the delay introduced by the current buffer settings. Audio Upstream Rate depends on the current audio packet size and compression setting. Make sure that the upstream -rate is not higher than your available internet upload speed (check this with a service such as [librespeed.org](https://librespeed.org/)). +rate is not higher than your available internet upload speed (check this with a service such as [speedtest.net](https://librespeed.org/)). From 13c9df652c81142e835042124edbf5ad300bc155 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Sun, 6 Dec 2020 09:28:12 +0100 Subject: [PATCH 047/280] Revert librespeed --- 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 d682fc8b5..ff595c672 100644 --- a/wiki/en/en-Software-Manual.md +++ b/wiki/en/en-Software-Manual.md @@ -261,4 +261,4 @@ your distance to the server is too large or your internet connection is not suff Overall Delay is calculated from the current Ping Time and the delay introduced by the current buffer settings. Audio Upstream Rate depends on the current audio packet size and compression setting. Make sure that the upstream -rate is not higher than your available internet upload speed (check this with a service such as [speedtest.net](https://librespeed.org/)). +rate is not higher than your available internet upload speed (check this with a service such as [librespeed.org](https://librespeed.org/)). From 2eae009c5665da8792ee6970c7f6c4f0c65133ff Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 6 Dec 2020 12:57:59 +0100 Subject: [PATCH 048/280] W: [fr] fr-Software-Manual.md (#106) (#152) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Changes (#51) * Update en-Tips-Tricks-More.md Remove links to unmaintainable content (at bottom of page). Will delete en-Multiple-Audio-Interfaces.md and en-Software-Synth.md later. * Update en-Installation-for-Linux.md Ubuntu and Debian get same dependencies * Update es-Installation-for-Linux.md * Update es-Tips-Tricks-More.md * UPDATE 1 GERMAN TRANSLATION * Small typo fix * translation fr 1 (#47) * fr-index translation * begin of franch translation of the wiki * fr translation ended wiki/getting started * Update fr-Getting-Started.md * Update general.yml * Update navigation.yml * Update navigation.yml * Update fr-index.html * Update fr-index.html * Update fr-index.html * Update general.yml * Update fr-index.html * Update fr-Getting-Started.md * Update navigation.yml * Update navigation.yml * Update general.yml * Update fr-Getting-Started.md * Update fr-Getting-Started.md * Update footertext.md * Update fr-index.html * Update fr-Demos.md * Update fr-index.md * Update fr-Getting-Started.md * Update fr-Getting-Started.md * Update fr-Demos.md * Update fr-index.html * Update fr-Getting-Started.md * Update fr-Getting-Started.md link * W: [fr] Software Manual * fix grammar * Rewriting, ready for review * forgot one mélangeur -> console de mixage * fix some mistake and forgot * redrafting silence instead of sourdine * review and redraft close to EN * Remove index.html * Some fixes after review * Missing some fixes * Update fr-Software-Manual.md * Update fr-Software-Manual.md Réverb -> Réverberation * Update fr-Software-Manual.md Missed changes and fix missed typo * Other fixes and rewording after review. Hope latest! * Update fr-Software-Manual.md * fix broken link (footnote) * Add no breaking spaces Co-authored-by: Jonathan <4561747+gilgongo@users.noreply.github.com> Co-authored-by: ignotus Co-authored-by: ann0see <20726856+ann0see@users.noreply.github.com> Co-authored-by: saimyx <44293594+Saimyx@users.noreply.github.com> Co-authored-by: Olivier Humbert Co-authored-by: Gérald Niel Co-authored-by: Jonathan <4561747+gilgongo@users.noreply.github.com> Co-authored-by: ignotus Co-authored-by: ann0see <20726856+ann0see@users.noreply.github.com> Co-authored-by: saimyx <44293594+Saimyx@users.noreply.github.com> Co-authored-by: Olivier Humbert --- wiki/fr/fr-Software-Manual.md | 226 ++++++++++++++++++++++++++++++++++ 1 file changed, 226 insertions(+) create mode 100644 wiki/fr/fr-Software-Manual.md diff --git a/wiki/fr/fr-Software-Manual.md b/wiki/fr/fr-Software-Manual.md new file mode 100644 index 000000000..b0d559d4f --- /dev/null +++ b/wiki/fr/fr-Software-Manual.md @@ -0,0 +1,226 @@ +--- +layout: wiki +title: "Manuel du logiciel" +lang: "fr" +permalink: "/wiki/Software-Manual" +--- +Aide Jamulus (manuel du logiciel) +================================= +_(Note : les copies d'écran ont été faites avec l'interface en anglais, les termes utilisés dans ce manuel correspondent aux termes employés dans l'interface du logiciel en français.)_ + +Fenêtre principale +------------------ + +![Fenêtre principale](https://user-images.githubusercontent.com/20726856/97360410-77476880-189e-11eb-99c6-f4a68258bf31.png) + +### LEDs d'état + +La LED du **status de délai** indique l'état actuel du délai : + +* **Vert** - Le délai est parfait pour une session de bœuf + +![image](https://user-images.githubusercontent.com/4561747/99384024-b6c60b00-28c6-11eb-9e7d-aa1e4245353f.png) + +* **Jaune** - Une session est toujours possible mais elle peut être plus difficile à jouer + +![image](https://user-images.githubusercontent.com/4561747/99384041-bb8abf00-28c6-11eb-96ab-c1c08acf2a85.png) + +* **Rouge** - Le délai est trop important pour bœuffer + +![image](https://user-images.githubusercontent.com/4561747/99384044-bded1900-28c6-11eb-8971-9ab6ee1908b5.png) + + +**Tampons** indique l'état actuel de l'audio/du streaming. Si le voyant est **rouge**, le flux audio est interrompu. Cela peut être dû à l'un des problèmes suivants : + +- Le tampon de gigue[^1] réseau n'est pas assez grand pour la gigue actuelle de l'interface réseau/audio. +- Le délai du tampon de la carte son (taille du tampon) est trop faible (voir la fenêtre des paramètres). +- Le débit montant ou descendant est trop élevé pour votre bande passante internet. +- Le processeur du client ou du serveur est à 100 %. + +### Niveau d'entrée + +![Niveau d'entrée](https://user-images.githubusercontent.com/20726856/97363247-9516cc80-18a2-11eb-8195-1e887ee8040f.png) + +Ceci indique le niveau des deux canaux stéréo pour votre entrée audio. +Veillez à ne pas écrêter le signal d'entrée pour éviter une distorsion du signal audio (les LEDs indiquent l'écrêtage lorsqu'il se produit). + +### Bouton Tchate + +![Fenêtre de tchate](https://user-images.githubusercontent.com/20726856/97360717-d7d6a580-189e-11eb-84db-80536e17dc30.png) + +Le texte de tchate saisi dans cette fenêtre est envoyé à tous les clients connectés. +Si un nouveau message de tchate arrive et que la fenêtre du tchate n'est pas encore ouverte, elle sera ouverte automatiquement pour tous les clients. + +### Fenêtre de profil + +![Fenêtre de mon profil](https://user-images.githubusercontent.com/20726856/97360811-f9379180-189e-11eb-98bf-7f44f884adaa.png) + +Dans le menu Vue, sélectionnez Mon profil… pour définir votre pseudo/nom qui s'affiche sous votre chariot dans la console de mixage audio du serveur. Si un instrument et/ou un pays est défini, les icônes correspondant à ces choix seront également affichées sous votre chariot. Le paramètre de compétence modifie la couleur de fond de l'étiquette du chariot et l'entrée de la ville apparaît dans l'info-bulle à son survol (voir la capture d'écran ci-dessous). + +![Info-bulle de l'étiquette de chariot](https://user-images.githubusercontent.com/20726856/97360889-166c6000-189f-11eb-802d-330e761ed017.png) + +### Bouton de connexion/déconnexion + +Ouvre une boîte de dialogue dans laquelle vous pouvez sélectionner un serveur auquel vous connecter. Si vous êtes connecté, appuyer sur ce bouton mettra fin à la session. + +![Dialogue de connexion](https://user-images.githubusercontent.com/20726856/97360965-31d76b00-189f-11eb-870b-f58be6e30f04.png) + +La fenêtre de configuration de la connexion affiche une liste des serveurs disponibles avec le nombre d'occupants et le nombre maximum possible. Les administrateurs de serveur peuvent optionellement référencer leurs serveurs par genre musical. Utilisez le menu déroulant Liste pour sélectionner un genre, cliquez sur le serveur que vous souhaitez rejoindre et appuyez sur le bouton Se connecter pour vous y connecter. Vous pouvez également double-cliquer sur le nom du serveur. Les serveurs permanents (ceux qui ont été listés pendant plus de 24 heures) sont indiqués en gras. + +Vous pouvez filtrer la liste par nom de serveur ou par emplacement. Pour ne répertorier que les serveurs occupés, entrez un caractère « # ». + +Si vous connaissez l'adresse IP ou l'URL d'un serveur, vous pouvez vous y connecter en utilisant le champ Adresse du serveur. Un numéro de port optionnel peut être ajouté après l'adresse IP ou l'URL en utilisant le deux-points comme séparateur, par ex. jamulus.example.com:22124. Le champ affichera également une liste des adresses de serveur les plus utilisées récemment. + +### Bouton Me silencer + +Coupe votre flux audio vers le serveur afin que vous puissiez vous entendre et voir vos propres niveaux d'entrée, mais pas les autres musiciens. Sachez que les autres musiciens ne sauront pas si vous vous êtes mis en silence. + +### L'effet de réverbération + +![Réverbération](https://user-images.githubusercontent.com/20726856/97361142-6e0acb80-189f-11eb-8fd7-e03aa4ffc662.png) + +La réverbération peut être appliquée à un canal audio mono local ou aux deux canaux en mode stéréo. +La sélection du canal mono et le niveau de réverbération peuvent être modifiés. Par exemple, si le signal d'un micro est envoyé sur le canal audio de droite de la carte son et qu'un effet de réverbération doit y être appliqué, réglez le sélecteur de canal sur le canal de droite et déplacez le chariot vers le haut jusqu'à ce que le niveau de réverbération souhaité soit atteint. + +### Contrôle local du panoramique/de la balance audio + +![Contrôle de panoramique/balance audio locale](https://user-images.githubusercontent.com/20726856/97361250-8c70c700-189f-11eb-82c2-9a9d768dcfff.png) + +Contrôle les niveaux relatifs des canaux audio locaux gauche et droite. Pour un signal mono, il agit comme un panoramique entre les deux canaux. Par exemple, si un micro est connecté au canal d'entrée de droite et qu'un instrument est connecté au canal d'entrée de gauche qui est beaucoup plus fort que le micro, déplacez le chariot audio dans une direction où l'étiquette au-dessus du chariot indique G -x, où x est l'indicateur d'atténuation actuelle. + +### Console de mixage audio du serveur + +![Chariots audio](https://user-images.githubusercontent.com/20726856/97361324-a5797800-189f-11eb-80d4-3a93e5728b99.png) + +Dans le cadre de la console de mixage, un chariot est affiché pour chaque client connecté au serveur (y compris vous-même). Les chariots vous permettent d'ajuster le niveau de ce que vous entendez sans affecter ce que les autres entendent. + +Le VU-mètre indique le niveau d'entrée au serveur, c'est-à-dire le son envoyé. + +Si vous avez réglé votre canal audio sur Stéréo ou Sortie Stéréo dans vos paramètres, vous verrez alors un contrôle de balance audio (Maj-clic pour réinitialiser). + +Si vous voyez une icône « muet » au-dessus d'un canal, cela signifie que ce musicien ne peut pas vous entendre. Soit il vous a mis en silence, soit il a mis en solo un ou plusieurs canaux sans inclure le vôtre, soit il a réglé votre chariot dans son mixage à zéro. + +L'utilisation du **bouton Muet** empêche d'entendre le canal indiqué dans votre mixage local. Sachez que lorsque vous mettez un musicien en silence, il verra une icône « muet » au-dessus de votre chariot pour indiquer que vous ne l'entendez pas. Notez également que vous continuerez à voir son VU-mètre bouger si le signal du musicien mis en sourdine atteint le serveur. La position de votre chariot pour eux n'est pas affectée non plus. + +Le **bouton Solo** vous permet d'entendre un ou plusieurs musiciens seuls. Ceux qui ne sont pas en solo seront mis en silence. Notez également que ces musiciens qui ne sont pas en solo verront une icône « muet » au-dessus de votre chariot. + +Les canaux sont listés de gauche à droite dans l'ordre dans lequel les clients se connectent jusqu'à ce qu'ils partent, leur « créneau » sera alors occupé par le nouvel arrivant suivant. Vous pouvez modifier l'ordre de tri en utilisant l'option Éditer dans le menu de l'application. + +Vous pouvez regrouper les chariots en utilisant le commutateur « groupe ». Déplacer le chariot de n'importe quel membre du groupe déplacera les autres chariots de ce groupe de la même proportion. Vous pouvez temporairement isoler un canal du groupe avec Maj-clic-glisser. + +Si l'administrateur du serveur a activé l'enregistrement, vous verrez un message au-dessus de la console de mixage indiquant que vous êtes en train d'être enregistré. + + + +Fenêtre des paramètres +---------------------- + +![image](https://user-images.githubusercontent.com/20726856/97361399-c4780a00-189f-11eb-8ad0-6b94f7eb1dcc.png) + +### Périphérique de carte son + +![Périphérique de carte son sous Windows](https://user-images.githubusercontent.com/20726856/97361494-e70a2300-189f-11eb-9095-2c34ad07314d.png) +![Périphérique de carte son sous MacOS](https://user-images.githubusercontent.com/20726856/97361570-02752e00-18a0-11eb-8475-e92a57ce6ae7.png) + +Le pilote ASIO (Périphérique) peut être sélectionné en utilisant Jamulus sous le système d'exploitation Windows. Si le pilote ASIO sélectionné n'est pas valide, un message d'erreur s'affiche et le pilote valide précédent est sélectionné. Sous le système d'exploitation Mac, le matériel d'entrée et de sortie peut être sélectionné. + +### Assignation de canal d'entrée/sortie + +![Cartographie de canal](https://user-images.githubusercontent.com/20726856/97361637-1caf0c00-18a0-11eb-9b65-81225b7e3dd5.png) + +Si le périphérique de carte son sélectionnée fournit plus d'un canal d'entrée ou de sortie, les _cartographie des canaux d'entrée_ et _cartographie des canaux de sortie_ sont visibles. Pour chaque canal d'entrée/sortie Jamulus (canal gauche et droite), un canal différent de la carte son actuelle peut être sélectionné. + +### Activer les petits tampons de réseau + +Permet la prise en charge des très petits paquets audio réseau. Ils ne sont utilisés que si le délai du tampon de la carte son est inférieur à 128 échantillons. Plus les tampons réseau sont petits, plus la latence audio est faible. Mais en même temps, la charge réseau augmente et la probabilité de décrochage audio augmente également. + +### Délai de tampon + +![Délai de tampon](https://user-images.githubusercontent.com/20726856/97361710-3c463480-18a0-11eb-8d5c-07ed6590ccac.png) + +Le réglage du délai de tampon est un réglage fondamental pour le logiciel Jamulus. Ce réglage a une influence sur de nombreuses propriétés de la connexion. Trois tailles de tampon sont prises en charge : + +- 64 échantillons : le paramètre à choisir de préférence, fournit la latence la plus faible mais ne fonctionne pas avec toutes les cartes son. +- 128 échantillons : devrait fonctionner pour la plupart des cartes son disponibles. +- 256 échantillons : ne devrait être utilisé que sur des ordinateurs très lents, ou avec une connexion internet lente. + +Certains pilotes de carte son ne permettent pas de modifier le délai de tampon à partir du logiciel Jamulus. +Dans ce cas, le réglage du délai de tampon est désactivé et doit être modifié à l'aide du pilote de la carte son. Sous Windows, appuyez sur le bouton Configuration ASIO pour ouvrir le panneau des paramètres du pilote. + +![Délai de tampon Windows](https://user-images.githubusercontent.com/20726856/97361808-65ff5b80-18a0-11eb-88d6-fb2131f10c75.png) + +Sous Linux, utilisez l'outil de configuration Jack pour modifier la taille du tampon. + +Le délai actuel du tampon a une influence sur l'état de la connexion, le taux de transfert courant et le délai global. +Plus la taille du tampon est faible, plus la probabilité d'un voyant rouge dans l'indicateur d'état (décrochages) est élevée et plus le taux de transfert est élevé et le délai global est faible. + +![Dépendances du délai de tampon](https://user-images.githubusercontent.com/20726856/97361878-816a6680-18a0-11eb-8c1f-fbf956be4b81.png) + +Le réglage du tampon est donc un compromis entre la qualité audio et le délai global. + +### Tampon de gigue avec indicateur de statut du tampon + +![Tampon de gigue](https://user-images.githubusercontent.com/20726856/97361956-9b0bae00-18a0-11eb-85de-dc2ded891175.png) + +Le tampon de gigue compense les gigues de synchronisation du réseau et de la carte son. La taille du tampon influence donc la qualité du flux audio (le nombre de décrochages) et le délai global (plus le tampon est long, plus le délai est important). + +Vous pouvez définir manuellement la taille du tampon de gigue pour le client local et le serveur distant. Pour le tampon de gigue local, les décrochages dans le flux audio sont indiqués par le voyant lumineux situé sous les chariots de taille de tampon de gigue. +Si le voyant devient rouge, un dépassement ou une sous-utilisation du tampon a eu lieu et le flux audio est interrompu. + +Le réglage du tampon de gigue est donc aussi un compromis entre la qualité audio et le délai global. + +Si le paramètre Auto est activé, les tampons de gigue du client local et du serveur distant sont automatiquement réglés en fonction des mesures de la gigue de synchronisation du réseau et de la carte son. Si la vérification automatique est activée, les chariots de la taille de tampon de gigue sont désactivés (ils ne peuvent pas être déplacés avec la souris). + +### Canaux audio + +![Canaux audio](https://user-images.githubusercontent.com/20726856/97362020-b24a9b80-18a0-11eb-8a55-ee536b29460b.png) + +Sélectionne le nombre de canaux audio à utiliser pour la communication entre le client et le serveur. Trois modes sont disponibles : + +Les modes mono et stéréo utilisent respectivement un et deux canaux audio. + +Mono-entrée/stéréo-sortie : le signal audio envoyé au serveur est mono mais le signal de retour est stéréo. C'est utile si la carte son a l'instrument sur un canal d'entrée et le micro sur l'autre. Dans ce cas, les deux signaux d'entrée peuvent être mélangés sur un canal mono mais le mixage du serveur est entendu en stéréo. + +L'activation du mode stéréo augmentera le débit de données de votre flux. Assurez-vous que votre débit montant ne dépasse pas la vitesse montante disponible pour votre connexion internet. + +En mode de flux stéréo, aucune sélection de canal audio pour l'effet de réverb ne sera disponible dans la fenêtre principale puisque l'effet est appliqué aux deux canaux dans ce cas. + +### Qualité audio + +![Qualité audio](https://user-images.githubusercontent.com/20726856/97362080-c42c3e80-18a0-11eb-87ac-9a4ca948bbcf.png) + +Plus la qualité audio est élevée, plus le débit de données de votre flux audio est élevé. Assurez-vous que votre débit montant ne dépasse pas la vitesse montante disponible pour votre connexion internet. + +### Niveau de nouveau client + +![Niveau de nouveau client](https://user-images.githubusercontent.com/20726856/97362173-e2923a00-18a0-11eb-8401-9ad71866f6b1.png) + +Ce paramètre définit le niveau du chariot d'un client nouvellement connecté, en pourcentage. Si un nouveau musicien se connecte au serveur courant, il obtiendra le niveau de chariot initial spécifié si aucun autre niveau de canal provenant d'une connexion précédente de ce même client n'a déjà été stocké. Vous pouvez configurer tous les clients d'un serveur occupé à ce niveau en utilisant Éditer > « Régler tous les chariots sur niveau d'un nouveau client ». + +### Thème fantaisie + +![Thème fantaisie](https://user-images.githubusercontent.com/20726856/97362214-f9389100-18a0-11eb-9adb-ebf2c1d18007.png) + +Ceci applique un thème fantaisie à la fenêtre principale. + +### Adresse personnalisée du serveur central + +![Adresse du serveur central](https://user-images.githubusercontent.com/20726856/97362265-0a819d80-18a1-11eb-9b0c-2f7ecf21841c.png) + +Laissez ce champ vide, sauf si vous devez entrer l'adresse d'un serveur central autre que celui par défaut. + +### Paramètre de l'état actuel de la connexion + +![Indicateurs](https://user-images.githubusercontent.com/20726856/97362338-271dd580-18a1-11eb-99b7-02c9371a6258.png) + +Le temps de « ping » est le temps nécessaire au flux audio pour faire l'aller-retour entre le client et le serveur. +Ce délai est introduit par le réseau et devrait être d'environ 20 à 30 ms. Si le délai est supérieur à environ 50 ms, la distance qui vous sépare du serveur est trop importante ou votre connexion internet n'est pas suffisante. + +Le délai global est calculé à partir du « ping » actuel et du délai introduit par les paramètres actuel du tampon. + +Le débit montant de l'audio dépend de la taille actuelle des paquets audio et du réglage de compression. Assurez-vous que le débit montant n'est pas supérieur à votre vitesse montante internet disponible (vérifiez ça avec un service tel que [speedtest.net](http://speedtest.net)). + +---- +## Notes + +[^1]: dans le domaine des réseaux informatiques, la **gigue** (en anglais **jitter**) est la variation de la latence au fil du temps. _(Source : [Wikipédia FR](https://fr.wikipedia.org/wiki/Gigue_(informatique)){: target="_blank" rel="noopener noreferrer"})_ From 4c449a3822a36af1d574c9cf2f777a9568832a37 Mon Sep 17 00:00:00 2001 From: Jonathan <4561747+gilgongo@users.noreply.github.com> Date: Sun, 6 Dec 2020 15:59:53 +0000 Subject: [PATCH 049/280] Update en-Software-Manual.md Standardise on "user". Default sort order described correctly. Minor amends. --- wiki/en/en-Software-Manual.md | 39 ++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/wiki/en/en-Software-Manual.md b/wiki/en/en-Software-Manual.md index dffbfbc71..3482dde23 100644 --- a/wiki/en/en-Software-Manual.md +++ b/wiki/en/en-Software-Manual.md @@ -15,28 +15,29 @@ Main Window ### Status LEDs -The **Delay Status** LED shows the current audio delay status: - -* **Green** - The delay is perfect for a jam session - +The **Delay** status LED shows the current audio delay status: ![image](https://user-images.githubusercontent.com/4561747/99384024-b6c60b00-28c6-11eb-9e7d-aa1e4245353f.png) -* **Yellow** - A session is still possible but it may be harder to play - +**Green** - The delay is perfect for a jam session ![image](https://user-images.githubusercontent.com/4561747/99384041-bb8abf00-28c6-11eb-96ab-c1c08acf2a85.png) -* **Red** - The delay is too large for jamming +**Yellow** - A session is still possible but it may be harder to play ![image](https://user-images.githubusercontent.com/4561747/99384044-bded1900-28c6-11eb-8971-9ab6ee1908b5.png) +**Red** - The delay is too large for jamming + + + + -**Buffers** shows the current audio/streaming status. If the light is **red**, the audio stream is interrupted. This is caused by one of the following problems: +The **Buffers** status LED shows the current audio/streaming status. If the light is **red**, the audio stream is interrupted. This is caused by one of the following problems: - The network jitter buffer is not large enough for the current network/audio interface jitter. - The sound card's buffer delay (buffer size) is too small (see Settings window). @@ -112,22 +113,22 @@ in a direction where the label above the fader shows L -x, where x is the curren ![Audio faders](https://user-images.githubusercontent.com/20726856/97361324-a5797800-189f-11eb-80d4-3a93e5728b99.png) -In the audio mixer frame, a fader is shown for each connected client at the server (including yourself). +The audio mixer screen shows each user connected to the server (including yourself). The faders allow you to adjust the level of what you hear without affecting what others hear. The VU meter shows the input level at the server - that is, the sound being sent. If you have set your Audio Channel to Stereo or Stereo Out in your Settings, you will also see a pan control (shift-click to reset). -If you see a "mute" icon above a channel, it means that musician cannot hear you. Either they have muted you, soloed one or more channels not including yours, or have set your fader in their mix to zero. +If you see a "mute" icon above a user, it means that person cannot hear you. Either they have muted you, soloed one or more users not including you, or have set your fader in their mix to zero. -Using the **Mute button** prevents the indicated channel being heard in your local mix. Be aware that when you mute a musician, they will see a "muted" icon above your fader to indicate that you cannot hear them. Note also that you will continue to see their VU meters moving if sound from the muted musician is reaching the server. Your fader position for them is also unaffected. +Using the **Mute button** prevents users being heard in your local mix. Be aware that when you mute someone, they will see a "muted" icon above your fader to indicate that you cannot hear them. Note also that you will continue to see their VU meters moving if sound from the muted user is reaching the server. Your fader position for them is also unaffected. -The **Solo button** allows you to hear one or more musicians on their own. Those not soloed will be muted. Note also that those musicians who are not soloed will see a "muted" icon above your fader. +The **Solo button** allows you to hear one or more users on their own. Those not soloed will be muted. Note also that those people who are not soloed will see a "muted" icon above your fader. -Channels are listed left to right in the order that clients connect until they leave, at which point their "slot" is filled by the next new arrival. You can change the sort order using the Edit option in the application menu. +Users are listed left to right in the order that they connect. You can change the sort order using the Edit option in the application menu. -You can group faders together using the "group" toggle. Moving the fader of any member of the group will move the other faders in that group by the same amount. You can isolate a channel from the group temporarily with shift-click-drag +You can group users together using the "group" toggle. Moving the fader of any member of the group will move the other faders in that group by the same amount. You can isolate a channel from the group temporarily with shift-click-drag. If the server operator has enabled recording, you will see a message above the mixer showing that you are being recorded. @@ -178,7 +179,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 influence on the connection status, the current upload rate and the overall delay. +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 higher the upload rate and the lower the overall delay. @@ -194,14 +195,14 @@ The jitter buffer compensates for network and sound card timing jitters. The siz therefore influences the quality of the audio stream (how many dropouts occur) and the overall delay (the longer the buffer, the higher the delay). -You can set the jitter buffer size manually for the local client and the remote server. For the local jitter +You can set the jitter buffer size manually for your local client and the remote server. For the local jitter buffer, dropouts in the audio stream are indicated by the light below the jitter buffer size faders. If the light turns to red, a buffer overrun/underrun has taken place and the audio stream is interrupted. The jitter buffer setting is therefore a trade-off between audio quality and overall delay. If the Auto setting is enabled, the jitter buffers -of the local client and the remote server are set automatically based on measurements of the network and sound card +of your local client and the remote server are set automatically based on measurements of the network and sound card timing jitter. If the Auto check is enabled, the jitter buffer size faders are disabled (they cannot be moved with the mouse). ### Audio channels @@ -232,9 +233,9 @@ The higher the audio quality, the higher your audio stream's data rate. Make sur ![New client level](https://user-images.githubusercontent.com/20726856/97362173-e2923a00-18a0-11eb-8401-9ad71866f6b1.png) -This setting defines the fader level of a newly connected client in percent. If a new musician connects +This setting defines the fader level of a newly connected client in percent. If a new user connects to the current server, they will get the specified initial fader level if no other fader level from a previous connection of -that client was already stored. You can set all clients in an occupied server to this level using Edit > "Set All Faders to New Client Level". +that user was already stored. You can set all users in an occupied server to this level using Edit > "Set All Faders to New Client Level". ### Fancy skin From d63c5b6de7a55b35f4f7cdcddefb0666cb3a283f Mon Sep 17 00:00:00 2001 From: Jonathan <4561747+gilgongo@users.noreply.github.com> Date: Sun, 6 Dec 2020 16:04:29 +0000 Subject: [PATCH 050/280] Update en-Command-Line-Options.md Standardise on "users". --- 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 8747bdaeb..0feeaef27 100644 --- a/wiki/en/en-Command-Line-Options.md +++ b/wiki/en/en-Command-Line-Options.md @@ -47,7 +47,7 @@ You can see all possible options your version supports by starting Jamulus with | `-s` |`--server` | Start in server mode | (server only) [See note](Choosing-a-Server-Type) | | `-t` |`--notranslation` | Disable translations | (client and server) | | `-T` |`--multithreading` | Enable multithreading | (server only) | -| `-u` |`--numchannels` | Maximum number of channels. Default is 10, maximum is 50 | (server only) | +| `-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) | From 8a9e5708ee29d7ef92917db5c8fea9a951b328f2 Mon Sep 17 00:00:00 2001 From: Jonathan <4561747+gilgongo@users.noreply.github.com> Date: Sun, 6 Dec 2020 16:07:18 +0000 Subject: [PATCH 051/280] Update en-Running-a-Server.md Use "fader" to refer to the UI element, use "channel" to refer to audio channel only. --- 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 1b5fbb6e1..aa7d252c5 100644 --- a/wiki/en/en-Running-a-Server.md +++ b/wiki/en/en-Running-a-Server.md @@ -15,7 +15,7 @@ NO. You can just choose somebody else's server from your list and get going. -**Don't want strangers interrupting?** Once you and your friends are connected to a public server, press the "solo" buttons on the musicians each of you want to play with. Anyone you don't solo will see a "muted" icon on your channel. And you won't hear them. +**Don't want strangers interrupting?** Once you and your friends are connected to a public server, press the "solo" buttons on the musicians each of you want to play with. Anyone you don't solo will see a "muted" icon on your fader. And you won't hear them. ## That sounds too easy. From 615839917432b557edc7c5724e0e76c5f853950c Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Mon, 7 Dec 2020 11:39:10 +0100 Subject: [PATCH 052/280] Rename to onboarding --- wiki/en/en-Installation-for-Linux.md | 4 +++- wiki/en/en-Installation-for-Macintosh.md | 4 +++- wiki/en/en-Installation-for-Windows.md | 4 ++-- wiki/en/{en-Walk-Through.md => en-Onboarding.md} | 6 +++--- 4 files changed, 11 insertions(+), 7 deletions(-) rename wiki/en/{en-Walk-Through.md => en-Onboarding.md} (97%) diff --git a/wiki/en/en-Installation-for-Linux.md b/wiki/en/en-Installation-for-Linux.md index c4e6311f2..363109ce3 100644 --- a/wiki/en/en-Installation-for-Linux.md +++ b/wiki/en/en-Installation-for-Linux.md @@ -88,7 +88,9 @@ 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](Walk-Through). +Jamulus has been installed and can be used now. You can now take a look at the + +[Jamulus Onboarding page](Onboarding){: .button} ## To update your installation to a new release diff --git a/wiki/en/en-Installation-for-Macintosh.md b/wiki/en/en-Installation-for-Macintosh.md index 2923579e2..7c9178619 100644 --- a/wiki/en/en-Installation-for-Macintosh.md +++ b/wiki/en/en-Installation-for-Macintosh.md @@ -33,4 +33,6 @@ For further information see [this Apple Support Page](https://support.apple.com/ **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"}).** ## All installed? -Jamulus has been installed and can be used now. You can now take a look at the [Jamulus walk through page](Walk-Through). +Jamulus has been installed and can be used now. You can now take a look at the + +[Jamulus Onboarding page](Onboarding){: .button} diff --git a/wiki/en/en-Installation-for-Windows.md b/wiki/en/en-Installation-for-Windows.md index 9a95c1853..dbc71690d 100644 --- a/wiki/en/en-Installation-for-Windows.md +++ b/wiki/en/en-Installation-for-Windows.md @@ -44,6 +44,6 @@ Have a look at [this video](https://youtu.be/_GzOsitVgLI){: target="_blank" rel= 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\`). ## All installed? -Jamulus has been installed and can be used now. You can now take a look at the [Jamulus walk through page](Walk-Through). +Jamulus has been installed and can be used now. You can now take a look at the -For detailed information on using Jamulus, please see the [help manual](https://github.com/corrados/jamulus/blob/master/src/res/homepage/manual.md). +[Jamulus Onboarding page](Onboarding){: .button} diff --git a/wiki/en/en-Walk-Through.md b/wiki/en/en-Onboarding.md similarity index 97% rename from wiki/en/en-Walk-Through.md rename to wiki/en/en-Onboarding.md index db12942b5..c96838421 100644 --- a/wiki/en/en-Walk-Through.md +++ b/wiki/en/en-Onboarding.md @@ -1,10 +1,10 @@ --- layout: wiki -title: "Jamulus Walk-Through" +title: "Jamulus Onboardings" lang: "en" -permalink: "/wiki/Walk-Through" +permalink: "/wiki/Onboarding" --- -# Jamulus walk-through +# Jamulus onboarding Let's have a look at what Jamulus looks like and what you should do after having installed the software. ## First start Before you start Jamulus: From 05f9212c669c02569ed2e678edf312793ef2ed59 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Mon, 7 Dec 2020 11:51:22 +0100 Subject: [PATCH 053/280] Smaller fixes review --- wiki/en/en-Onboarding.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/wiki/en/en-Onboarding.md b/wiki/en/en-Onboarding.md index c96838421..5b6486315 100644 --- a/wiki/en/en-Onboarding.md +++ b/wiki/en/en-Onboarding.md @@ -13,7 +13,7 @@ Before you start Jamulus: ... 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 that. 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). +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). ### Jamulus main window When you open Jamulus, you will see a window which looks like this: @@ -29,15 +29,15 @@ Now you will see this: Fill in at least "Alias/Name" to set your name and close the window. ### 2. Connecting to a server -Click on "Connect" in the Jamulus main window, select a genre from the list in the top left, select a server, and click on "Connect". Now you should be connected to the server. 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 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 a 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 work as a mixing desk: everything you change here will change what you hear. If you move a slider down, this user will be quieter, if you move it up, this user will be louder for you. Everything else like "PAN", "SOLO", "GRP", ... are advanced options. You can try them of course! +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. ![Jamulus main mixer connected](https://user-images.githubusercontent.com/20726856/100801241-01e43000-3428-11eb-8d61-e03b5e648971.png) -If you don't want others to hear your audio, click on "Mute Myself" (left to the mixing board) which will stop your audio from being sent to other musicians. +If you don't want others to hear your audio, click on "Mute Myself" (left to your personal mix) which will stop your audio from being sent to other musicians. -While we're already here: "Settings" opens – of course – the settings window with all the audio settings, and "Chat" the chat window. +While we're already here: "Settings" opens – of course – the settings window with all the audio settings. More information about using Jamulus can be found in the [Software Manual](Software-Manual). From d5b38efb2e11bd59ee124db803c3a2efcd3b8ebe Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Mon, 7 Dec 2020 11:52:51 +0100 Subject: [PATCH 054/280] Add some info --- 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 5b6486315..117018959 100644 --- a/wiki/en/en-Onboarding.md +++ b/wiki/en/en-Onboarding.md @@ -37,7 +37,7 @@ Congrats! You can now start jamming with Jamulus. The sliders you see on the rig If you don't want others to hear your audio, click on "Mute Myself" (left to your personal mix) which will stop your audio from being sent to other musicians. -While we're already here: "Settings" opens – of course – the settings window with all the audio settings. +While we're already here: "Settings" opens – of course – the settings window with all the audio settings which you probably want to change for your needs. More information about using Jamulus can be found in the [Software Manual](Software-Manual). From d0d2e9fb965d2780b30c346d74a3845ebfc3061b Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Mon, 7 Dec 2020 11:53:28 +0100 Subject: [PATCH 055/280] Fix typo --- 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 117018959..676c18783 100644 --- a/wiki/en/en-Onboarding.md +++ b/wiki/en/en-Onboarding.md @@ -1,6 +1,6 @@ --- layout: wiki -title: "Jamulus Onboardings" +title: "Jamulus Onboarding" lang: "en" permalink: "/wiki/Onboarding" --- From 0ca1a8893f333e3217d235192a6e4284eef68a3e Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Mon, 7 Dec 2020 13:25:59 +0100 Subject: [PATCH 056/280] Update de-Installation-for-Macintosh.md --- wiki/de/de-Installation-for-Macintosh.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/de/de-Installation-for-Macintosh.md b/wiki/de/de-Installation-for-Macintosh.md index 7654be666..53df83c16 100644 --- a/wiki/de/de-Installation-for-Macintosh.md +++ b/wiki/de/de-Installation-for-Macintosh.md @@ -22,7 +22,7 @@ Du kannst Jamulus auch selbst [kompilieren](Compiling), wenn du das willst. **Wenn du Jamulus zum ersten Mal öffnen willst, wirst du wahrscheinlich eine Meldung sehen, dass Jamulus nicht geöffnet werden kann, da der Entwickler unbekannt sei.** -Um Jamulus trotzdem öffnen zu können, navigiere mit dem Finder in den Programme (Applications) Ordner, doppelklicke auf Jamulus, warte die Meldung ab, klicke dann mit der rechten Maustaste (oder ctrl/strg und Klick) auf Jamulus und wähle dann „Öffnen“ oben im Menü aus. +Um Jamulus trotzdem öffnen zu können, navigiere mit dem Finder in den Programme (Applications) Ordner, doppelklicke auf Jamulus, warte die Meldung ab, klicke dann mit der rechten Maustaste (oder ctrl/strg und Linksklick) auf Jamulus und wähle dann „Öffnen“ oben im Menü aus. Jetzt siehst du eine leicht veränderte Version der gleichen Meldung, die jetzt durch einen Klick auf „Öffnen“ Jamulus öffnen kann. Diese Warnung wird nur einmal angezeigt – Danach kann Jamulus ganz normal z.B. über das Launchpad geöffnet werden. Für weitere Informationen siehe [diese Apple Support-Seite](https://support.apple.com/de-de/guide/mac-help/mh40616/mac){: target="_blank" rel="noopener noreferrer"}. From bce6040fae195621a3cbf5db5730f221c6a4dc6a Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Mon, 7 Dec 2020 13:34:12 +0100 Subject: [PATCH 057/280] Update de-Installation-for-Macintosh.md --- wiki/de/de-Installation-for-Macintosh.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/de/de-Installation-for-Macintosh.md b/wiki/de/de-Installation-for-Macintosh.md index 53df83c16..dc2523e8c 100644 --- a/wiki/de/de-Installation-for-Macintosh.md +++ b/wiki/de/de-Installation-for-Macintosh.md @@ -22,7 +22,7 @@ Du kannst Jamulus auch selbst [kompilieren](Compiling), wenn du das willst. **Wenn du Jamulus zum ersten Mal öffnen willst, wirst du wahrscheinlich eine Meldung sehen, dass Jamulus nicht geöffnet werden kann, da der Entwickler unbekannt sei.** -Um Jamulus trotzdem öffnen zu können, navigiere mit dem Finder in den Programme (Applications) Ordner, doppelklicke auf Jamulus, warte die Meldung ab, klicke dann mit der rechten Maustaste (oder ctrl/strg und Linksklick) auf Jamulus und wähle dann „Öffnen“ oben im Menü aus. +Um Jamulus trotzdem öffnen zu können, navigiere mit dem Finder in den Programme (Applications) Ordner, doppelklicke auf Jamulus, warte die Meldung ab, klicke dann mit der rechten Maustaste (oder klicke mit gedrückter ctrl/strg Taste) auf Jamulus und wähle dann „Öffnen“ oben im Menü aus. Jetzt siehst du eine leicht veränderte Version der gleichen Meldung, die jetzt durch einen Klick auf „Öffnen“ Jamulus öffnen kann. Diese Warnung wird nur einmal angezeigt – Danach kann Jamulus ganz normal z.B. über das Launchpad geöffnet werden. Für weitere Informationen siehe [diese Apple Support-Seite](https://support.apple.com/de-de/guide/mac-help/mh40616/mac){: target="_blank" rel="noopener noreferrer"}. From 5f98b76b7d91aeacd595f76e4ee79929485b98db Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Mon, 7 Dec 2020 19:53:40 +0100 Subject: [PATCH 058/280] Removed comment to knowledge base --- 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 676c18783..95551f6bb 100644 --- a/wiki/en/en-Onboarding.md +++ b/wiki/en/en-Onboarding.md @@ -42,7 +42,7 @@ While we're already here: "Settings" opens – of course – the settings window More information about using Jamulus can be found in the [Software Manual](Software-Manual). ## Advanced -Of course, you can do a lot more with Jamulus, like setting up a private server, doing online concerts, ... Have a look at the website! + ## Help and Community If you need help or want to contribute to the Jamulus Project, you can have a look at the following links: From 54fa1f3ecd7fe2bf5e3d19699edbe5cc9ae7a2a0 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Mon, 7 Dec 2020 19:55:11 +0100 Subject: [PATCH 059/280] Comment contribution to Jamulus website --- 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 95551f6bb..37d119913 100644 --- a/wiki/en/en-Onboarding.md +++ b/wiki/en/en-Onboarding.md @@ -53,4 +53,4 @@ For help, chat, and general discussions about Jamulus: Have a look at the [forum ### 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. -Besides that, you can also contribute to this documentation: see the [Jamulus Website GitHub repository](https://github.com/jamulussoftware/jamuluswebsite) and have a look at the contribution file there. + From c84878dc80e1e07fa9873274cab1e159fbfeb3be Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Mon, 7 Dec 2020 19:57:56 +0100 Subject: [PATCH 060/280] Add onboarding to navigation --- _data/en/navigation.yml | 2 ++ wiki/en/en-Onboarding.md | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/_data/en/navigation.yml b/_data/en/navigation.yml index ffb1099b2..d3d25885c 100644 --- a/_data/en/navigation.yml +++ b/_data/en/navigation.yml @@ -10,6 +10,8 @@ nav: url: /wiki/Installation-for-Macintosh - page: Linux url: /wiki/Installation-for-Linux + - page: Onboarding + url: /wiki/Onboarding - page: Software Manual url: /wiki/Software-Manual - page: Troubleshooting diff --git a/wiki/en/en-Onboarding.md b/wiki/en/en-Onboarding.md index 37d119913..c03aff704 100644 --- a/wiki/en/en-Onboarding.md +++ b/wiki/en/en-Onboarding.md @@ -1,6 +1,6 @@ --- layout: wiki -title: "Jamulus Onboarding" +title: "Jamulus onboarding" lang: "en" permalink: "/wiki/Onboarding" --- From bf732d1fbab4283562968f6a094650299f6e27e0 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Mon, 7 Dec 2020 19:58:53 +0100 Subject: [PATCH 061/280] Fix wrong layout --- wiki/en/en-Installation-for-Linux.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/wiki/en/en-Installation-for-Linux.md b/wiki/en/en-Installation-for-Linux.md index be0afdcea..d64930b6b 100644 --- a/wiki/en/en-Installation-for-Linux.md +++ b/wiki/en/en-Installation-for-Linux.md @@ -11,7 +11,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 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 need to compile Jamulus from source. That's quite easy: ## Get Jamulus sources From baac08257bee0a21ebfbb034f6506735b4812b45 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Mon, 7 Dec 2020 20:06:52 +0100 Subject: [PATCH 062/280] Update to explorer.jamulus.io --- wiki/en/en-Client-Troubleshooting.md | 14 +++++++------- wiki/en/en-Privacy-Statement.md | 4 ++-- wiki/en/en-Server-Troubleshooting.md | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/wiki/en/en-Client-Troubleshooting.md b/wiki/en/en-Client-Troubleshooting.md index 9d4fa7eb1..c217f3535 100644 --- a/wiki/en/en-Client-Troubleshooting.md +++ b/wiki/en/en-Client-Troubleshooting.md @@ -14,7 +14,7 @@ Start with the simple stuff: make sure your instrument/microphone and headphones ### You all sound OK, but it's difficult to keep together -**If at all possible, DO NOT listen to your direct signal.** Make sure you are listening as much as you can to the sound of your own instrument/voice _coming back from the server_. This signal has you and your playing partners mixed together in sync, and will be the signal that your bandmates are hearing too. So listening to that means you will be in sync with each other (assuming you all have reasonably low latency). Note that if one or more musicians are not following this rule, they will slow down as they play or sing. +**If at all possible, DO NOT listen to your direct signal.** Make sure you are listening as much as you can to the sound of your own instrument/voice _coming back from the server_. This signal has you and your playing partners mixed together in sync, and will be the signal that your bandmates are hearing too. So listening to that means you will be in sync with each other (assuming you all have reasonably low latency). Note that if one or more musicians are not following this rule, they will slow down as they play or sing. You can test whether you are hearing your signal correctly by doing the following: @@ -24,9 +24,9 @@ You can test whether you are hearing your signal correctly by doing the followin 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. +**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. -Be aware that while listening to the server's signal will ensure you will be in sync with other musicians, you may also experience problems if your overall latency (indicated by the "Delay" light in Jamulus) is not green or at least yellow most of the time. Consult the [software manual](https://github.com/corrados/jamulus/blob/master/src/res/homepage/manual.md) to understand how to adjust your setup to help with this. +Be aware that while listening to the server's signal will ensure you will be in sync with other musicians, you may also experience problems if your overall latency (indicated by the "Delay" light in Jamulus) is not green or at least yellow most of the time. Consult the [software manual](https://github.com/corrados/jamulus/blob/master/src/res/homepage/manual.md) to understand how to adjust your setup to help with this. ### Can't work out your mic settings? @@ -46,19 +46,19 @@ It's usually far easier and more reliable to have a [mixing desk](https://www.th ### Getting blasted by somebody joining your jam with feedback or noise? -You can set your "New Client Level" to a low value (eg 10), or set the musicians you are playing with to "Solo" state (in the mixer panel on the right side). That way, either new entrants will be very quiet, or you won't hear them at all. +You can set your "New Client Level" to a low value (eg 10), or set the musicians you are playing with to "Solo" state (in the mixer panel on the right side). That way, either new entrants will be very quiet, or you won't hear them at all. ### 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](http://jamulus.softins.co.uk/). 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 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](http://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? In the UK (and possibly other regions/routers) the Virgin Media Cable Internet Modem setting can cause an issue. "Block Fragmented IP Packets" should not be checked. For other routers/ISP, also try turning off SPI (Stateful Packet Inspection) and if that fixes it, you can make a judgment about whether to leave that off or not. -In some cases, it may be your ISP that is blocking your use of Jamulus. See the note on the [server troubleshooting page](Server-Troubleshooting#nobody-can-connect-to-my-server---but-i-can-connect-locally) about "Nobody can connect to my server" +In some cases, it may be your ISP that is blocking your use of Jamulus. See the note on the [server troubleshooting page](Server-Troubleshooting#nobody-can-connect-to-my-server---but-i-can-connect-locally) about "Nobody can connect to my server" -### Trouble using Garageband (or other DAW) with Jamulus? +### Trouble using Garageband (or other DAW) with Jamulus? See [this forum discussion](https://sourceforge.net/p/llcon/discussion/533517/thread/d3dd58eedc/#b994) diff --git a/wiki/en/en-Privacy-Statement.md b/wiki/en/en-Privacy-Statement.md index f41c7fcba..a9178ca17 100644 --- a/wiki/en/en-Privacy-Statement.md +++ b/wiki/en/en-Privacy-Statement.md @@ -16,13 +16,13 @@ We do not set tracking cookies, although SourceForge might do so. If you do not When you connect to a public or private Jamulus server, whatever you put in My Profile (in Settings) will be shown to others on that server while you are connected to it. The server does not otherwise store or record your Profile information and the server operator has no access to it unless they are also connected as a client. -When you connect to a public server, your profile is also available to third parties from the Central Server to which that server is registered. This is can be for informational purposes about the status of the public Jamulus network (for example, [here](http://jamulus.softins.co.uk/)), but may not be limited to that. Profile information is not otherwise logged or stored by the Jamulus server you are connected to, or by the Jamulus Central Server, but may be stored or processed by third parties. +When you connect to a public server, your profile is also available to third parties from the Central Server to which that server is registered. This is can be for informational purposes about the status of the public Jamulus network (for example, [here](http://explorer.jamulus.io/)), but may not be limited to that. Profile information is not otherwise logged or stored by the Jamulus server you are connected to, or by the Jamulus Central Server, but may be stored or processed by third parties. ### Use of IP Addresses When you connect to a public or private server, the server operator can see your IP address while you are connected. If the server operator has enabled logging (which is off by default) your IP address will also be logged and stored in the server's log file. -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](http://jamulus.softins.co.uk/)). Your public IP address is otherwise not logged or stored by Jamulus, but may be stored or processed by third parties. +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](http://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)_ diff --git a/wiki/en/en-Server-Troubleshooting.md b/wiki/en/en-Server-Troubleshooting.md index 6ae3776e9..e4f6c2fb5 100644 --- a/wiki/en/en-Server-Troubleshooting.md +++ b/wiki/en/en-Server-Troubleshooting.md @@ -11,11 +11,11 @@ permalink: "/wiki/Server-Troubleshooting" ### Why doesn't my server show up in the list? Why isn't in registering? -If you are registered OK (you can [see it here](http://jamulus.softins.co.uk/)) 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). +If you are registered OK (you can [see it here](http://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). If you are seeing a message that says the server is full, please [see this note](Central-Servers) on Central Servers. -You can verify that your server is listed in the relevant genre by [checking it here](http://jamulus.softins.co.uk/). +You can verify that your server is listed in the relevant genre by [checking it here](http://explorer.jamulus.io/). ## Servers - Private @@ -29,7 +29,7 @@ This should be your **public** IP address (find that with [Google](https://www.g ### What port numbers can I use? -Keep the default UDP ports. The actual default port is documented by the [command line](Command-Line-Options). At the time of writing this documentation, the port number is **22124**. +Keep the default UDP ports. The actual default port is documented by the [command line](Command-Line-Options). At the time of writing this documentation, the port number is **22124**. ### Is a private server a direct server without contact to the Jamulus Central Server? From 3ff24c8fc695d639ef049e3f0f694bb3ac6e1a56 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Mon, 7 Dec 2020 20:08:02 +0100 Subject: [PATCH 063/280] Remove target blank --- 1-index.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/1-index.html b/1-index.html index e17a5ab7d..fc5cfcf57 100644 --- a/1-index.html +++ b/1-index.html @@ -26,7 +26,7 @@

What is Jamulus?

- + Jamulus Banner. Links to getting started page
@@ -34,8 +34,8 @@

What is Jamulus?

Jamulus worldwide

- All over the world Jamulus allows huge choirs to sing, loud rock bands to play, and brings folk and classical musicians together. It's being used for remote music lessons, - in schools and universities, in private and in public. Even just for the spoken word – all in real time on the Internet, as if you were there in person. + All over the world Jamulus allows huge choirs to sing, loud rock bands to play, and brings folk and classical musicians together. It's being used for remote music lessons, + in schools and universities, in private and in public. Even just for the spoken word – all in real time on the Internet, as if you were there in person.

Help needed?

Have a look at the documentation. Especially consider the Date: Mon, 7 Dec 2020 20:12:27 +0100 Subject: [PATCH 064/280] Small fix --- wiki/en/en-Onboarding.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/wiki/en/en-Onboarding.md b/wiki/en/en-Onboarding.md index c03aff704..d20f3c197 100644 --- a/wiki/en/en-Onboarding.md +++ b/wiki/en/en-Onboarding.md @@ -8,10 +8,10 @@ permalink: "/wiki/Onboarding" Let's have a look at what Jamulus looks like and what you should do after having installed the software. ## 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. For now, **close all other applications**. It's best to start from zero at first. +2. **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. +... 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). @@ -21,7 +21,7 @@ When you open Jamulus, you will see a window which looks like this: ![Jamulus main window](https://user-images.githubusercontent.com/20726856/100796017-4cfa4500-3420-11eb-9d35-aa206d392a5a.png) ### 1. Setting up a profile -To let others know who you are, you should set up your profile. To do so, click on "View" (bar on the top)>"My Profile..." +To let others know who you are, you should set up your *profile*. To do so, click on "View" (bar on the top)>"My Profile..." Now you will see this: ![Musician Profile](https://user-images.githubusercontent.com/20726856/100796411-e590c500-3420-11eb-9b62-e50d02cb009b.png) @@ -29,7 +29,7 @@ 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 a 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 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). ### 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. From 53355f1798d32de728f52147490c9adb9b8c72c6 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Mon, 7 Dec 2020 20:14:27 +0100 Subject: [PATCH 065/280] Typo fix --- 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 aa7d252c5..1bff40cdf 100644 --- a/wiki/en/en-Running-a-Server.md +++ b/wiki/en/en-Running-a-Server.md @@ -58,7 +58,7 @@ A typical jam might have 4 people, for which you would need 200Kbps * 4 = 800Kbs

For Windows or macOS users For Linux users - or Raspberry Pi + Raspberry Pi
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`). From d7a546a1b94cbf031e30897546112ac575573a77 Mon Sep 17 00:00:00 2001 From: Jonathan <4561747+gilgongo@users.noreply.github.com> Date: Mon, 7 Dec 2020 21:22:55 +0000 Subject: [PATCH 066/280] Update en-Demos.md (re)add IP rockers with correct link --- wiki/en/en-Demos.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/wiki/en/en-Demos.md b/wiki/en/en-Demos.md index 917c1f932..2f97bf6b7 100644 --- a/wiki/en/en-Demos.md +++ b/wiki/en/en-Demos.md @@ -17,6 +17,8 @@ permalink: "/wiki/Demos" * [Live concert with 8 jazz musicians](https://www.youtube.com/watch?v=MpSIYxZMHw8&t=3307s) for International Jazz Day, 30 April 2020 ([more details here](https://sourceforge.net/p/llcon/discussion/533517/thread/070485619d/#6b71)) +* [The IP Rockers LIVE on Jamulus](https://soundcloud.com/dematteoss/sets/the-ip-rockers-live-on-jamulus) + * [Introductory video showing setup with acoustic instruments](https://www.youtube.com/watch?v=lB4ZxDb9vnU) (not a demo as such) * [WorldJam](https://worldjam.vip/homepage.php) Every saturday night there's a world wide online jam being streamed over the net From 703d458b7b409bd3ac7ecf2ad24dda791e0d36bc Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Tue, 8 Dec 2020 19:28:54 +0100 Subject: [PATCH 067/280] Jamulus explorer is now acessible via https --- wiki/en/en-Client-Troubleshooting.md | 2 +- wiki/en/en-Privacy-Statement.md | 4 ++-- wiki/en/en-Server-Troubleshooting.md | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/wiki/en/en-Client-Troubleshooting.md b/wiki/en/en-Client-Troubleshooting.md index c217f3535..e105ab952 100644 --- a/wiki/en/en-Client-Troubleshooting.md +++ b/wiki/en/en-Client-Troubleshooting.md @@ -50,7 +50,7 @@ You can set your "New Client Level" to a low value (eg 10), or set the musicians ### 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](http://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 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. ### Not seeing a list of servers at all? diff --git a/wiki/en/en-Privacy-Statement.md b/wiki/en/en-Privacy-Statement.md index a9178ca17..14b1b01d6 100644 --- a/wiki/en/en-Privacy-Statement.md +++ b/wiki/en/en-Privacy-Statement.md @@ -16,13 +16,13 @@ We do not set tracking cookies, although SourceForge might do so. If you do not When you connect to a public or private Jamulus server, whatever you put in My Profile (in Settings) will be shown to others on that server while you are connected to it. The server does not otherwise store or record your Profile information and the server operator has no access to it unless they are also connected as a client. -When you connect to a public server, your profile is also available to third parties from the Central Server to which that server is registered. This is can be for informational purposes about the status of the public Jamulus network (for example, [here](http://explorer.jamulus.io/)), but may not be limited to that. Profile information is not otherwise logged or stored by the Jamulus server you are connected to, or by the Jamulus Central Server, but may be stored or processed by third parties. +When you connect to a public server, your profile is also available to third parties from the Central Server to which that server is registered. This is can be for informational purposes about the status of the public Jamulus network (for example, [here](https://explorer.jamulus.io/)), but may not be limited to that. Profile information is not otherwise logged or stored by the Jamulus server you are connected to, or by the Jamulus Central Server, but may be stored or processed by third parties. ### Use of IP Addresses When you connect to a public or private server, the server operator can see your IP address while you are connected. If the server operator has enabled logging (which is off by default) your IP address will also be logged and stored in the server's log file. -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](http://explorer.jamulus.io/)). Your public IP address is otherwise not logged or stored by Jamulus, but may be stored or processed by third parties. +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)_ diff --git a/wiki/en/en-Server-Troubleshooting.md b/wiki/en/en-Server-Troubleshooting.md index e4f6c2fb5..a36e11564 100644 --- a/wiki/en/en-Server-Troubleshooting.md +++ b/wiki/en/en-Server-Troubleshooting.md @@ -11,11 +11,11 @@ permalink: "/wiki/Server-Troubleshooting" ### Why doesn't my server show up in the list? Why isn't in registering? -If you are registered OK (you can [see it here](http://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). +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). If you are seeing a message that says the server is full, please [see this note](Central-Servers) on Central Servers. -You can verify that your server is listed in the relevant genre by [checking it here](http://explorer.jamulus.io/). +You can verify that your server is listed in the relevant genre by [checking it here](https://explorer.jamulus.io/). ## Servers - Private From 34631c341b299883c859dee7bd646834aede1a5c Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Tue, 8 Dec 2020 19:32:19 +0100 Subject: [PATCH 068/280] ASIO4All uses https now --- 1-index.html | 2 +- wiki/en/en-Hardware-Setup.md | 2 +- wiki/en/en-Installation-for-Windows.md | 2 +- wiki/en/en-Sound-Devices.md | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/1-index.html b/1-index.html index fc5cfcf57..51adf0265 100644 --- a/1-index.html +++ b/1-index.html @@ -46,7 +46,7 @@

Help needed?

Contribute!

- Ideas? Found a bug? Want to contribute? Since Jamulus is free and open source software licensed under the GPL you can help us!
+ Ideas? Found a bug? Want to contribute? Since Jamulus is free and open source software licensed under the GPL you can help us!
Take a look at our contribution guidelines to find out how. You're welcome!

diff --git a/wiki/en/en-Hardware-Setup.md b/wiki/en/en-Hardware-Setup.md index 6afdadb75..155449aad 100644 --- a/wiki/en/en-Hardware-Setup.md +++ b/wiki/en/en-Hardware-Setup.md @@ -35,7 +35,7 @@ _**The exact method of connecting your instrument will of course vary depending 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. +**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. #### 2. Start Jamulus diff --git a/wiki/en/en-Installation-for-Windows.md b/wiki/en/en-Installation-for-Windows.md index 4077e4209..3f5afb9aa 100644 --- a/wiki/en/en-Installation-for-Windows.md +++ b/wiki/en/en-Installation-for-Windows.md @@ -7,7 +7,7 @@ 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 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 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). diff --git a/wiki/en/en-Sound-Devices.md b/wiki/en/en-Sound-Devices.md index fe5ba526c..5e1d7a44f 100644 --- a/wiki/en/en-Sound-Devices.md +++ b/wiki/en/en-Sound-Devices.md @@ -23,11 +23,11 @@ This page lists hardware known to work or not work with Jamulus (although it may * Ammoon [AGM02](https://www.ammoon.com/p-i3974.html) and [AGM04](https://www.ammoon.com/p-i4049.html) USB mixer: relatively inexpensive 4 channel USB mixers, both tested on MacOS Catalina, the AGM02 tested on Windows 10. On Windows 10, with ASIO4ALL, the AGM02 can be used as an input, and the onboard audio as the output. There is no way to monitor only the USB return signal on the AGM02. (USB Audio) **Note:** The Ammoon AGM04 appears to be a re-branded [ART USBMix4](https://artproaudio.com/product/usbmix4-four-channel-mixer-usb-audio-interface/). -* ART USB Mix4 (USB audio interface + 4 channel mixer). +* ART USB Mix4 (USB audio interface + 4 channel mixer). * Audient EVO 4, [driver download and install](https://evo.audio/driver-installation/) (USB Audio) -* Behringer UCA222 & UCA202 U-Control (USB audio) _Note: Works best on Mac and Linux. On Windows, [ASIO4ALL](http://www.asio4all.org/) driver works OK but not great. There is also the [native driver](http://www.behringerdownload.de/_software/BEHRINGER_2902_X64_2.8.40.zip) which Behringer withdrew support for a while ago, and therefore removed from their download section._ +* Behringer UCA222 & UCA202 U-Control (USB audio) _Note: Works best on Mac and Linux. On Windows, [ASIO4ALL](https://www.asio4all.org/) driver works OK but not great. There is also the [native driver](http://www.behringerdownload.de/_software/BEHRINGER_2902_X64_2.8.40.zip) which Behringer withdrew support for a while ago, and therefore removed from their download section._ * Behringer UGC102 (USB interface for guitar/bass) _Note: On Mac, appears as "USB Audio Codec" - when selected for input and output in Jamulus, the UGC102 headphone jack is the output (and cannot be used for input)._ From b2296a16a31fc68f4c658186130dae0fe4955abd Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Tue, 8 Dec 2020 22:17:12 +0100 Subject: [PATCH 069/280] Update en-Installation-for-Macintosh.md --- wiki/en/en-Installation-for-Macintosh.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/wiki/en/en-Installation-for-Macintosh.md b/wiki/en/en-Installation-for-Macintosh.md index a5d19db0c..baa0e1ba0 100644 --- a/wiki/en/en-Installation-for-Macintosh.md +++ b/wiki/en/en-Installation-for-Macintosh.md @@ -10,8 +10,7 @@ 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. **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). Agree to the license. +1. **Double-click the `.dmg` file** to open it. Agree to the license. It will then unpack and you will see two files (Jamulus client and server). 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. @@ -25,7 +24,7 @@ You can also [compile your own binary](Compiling) if you feel so inclined. 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 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. +To open Jamulus, navigate to the Applications folder via Finder double-click on Jamulus, wait for the mentioned message, close this message, then 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 about this warning see [this Apple Support Page](https://support.apple.com/en-gb/guide/mac-help/mh40616/mac){: target="_blank" rel="noopener noreferrer"}. From 0b4f18a9cd81fee0c12aa2309c1110d5bf8c35ca Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Tue, 8 Dec 2020 22:18:38 +0100 Subject: [PATCH 070/280] 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 baa0e1ba0..7bd3aca83 100644 --- a/wiki/en/en-Installation-for-Macintosh.md +++ b/wiki/en/en-Installation-for-Macintosh.md @@ -24,7 +24,7 @@ You can also [compile your own binary](Compiling) if you feel so inclined. 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 open Jamulus, navigate to the Applications folder via Finder double-click on Jamulus, wait for the mentioned message, close this message, then right-click (or control-click), and select "Open" from the top of the menu. +To open Jamulus, navigate to the Applications folder via Finder double-click on Jamulus, wait for the mentioned message, close this message by clicking on "Cancel", then control-click (or right-click) on Jamulus, 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 about this warning see [this Apple Support Page](https://support.apple.com/en-gb/guide/mac-help/mh40616/mac){: target="_blank" rel="noopener noreferrer"}. From e5e8587410387496d47503770ae6108192d137d5 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Tue, 8 Dec 2020 22:22:57 +0100 Subject: [PATCH 071/280] Clarify macOS installation (we don't use zip here) --- wiki/en/en-Installation-for-Macintosh.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/wiki/en/en-Installation-for-Macintosh.md b/wiki/en/en-Installation-for-Macintosh.md index 7bd3aca83..25174e5bc 100644 --- a/wiki/en/en-Installation-for-Macintosh.md +++ b/wiki/en/en-Installation-for-Macintosh.md @@ -24,7 +24,11 @@ You can also [compile your own binary](Compiling) if you feel so inclined. 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 open Jamulus, navigate to the Applications folder via Finder double-click on Jamulus, wait for the mentioned message, close this message by clicking on "Cancel", then control-click (or right-click) on Jamulus, and select "Open" from the top of the menu. +To open Jamulus +1. Navigate to the Applications folder via Finder +1. Double-click on Jamulus and wait for the 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. 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"}. From a752c78cbb6d33429bb2152fdbd191ea5b92e34e Mon Sep 17 00:00:00 2001 From: Jonathan <4561747+gilgongo@users.noreply.github.com> Date: Fri, 11 Dec 2020 08:41:26 +0000 Subject: [PATCH 072/280] Update en-Client-Troubleshooting.md Fix link --- wiki/en/en-Client-Troubleshooting.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/en/en-Client-Troubleshooting.md b/wiki/en/en-Client-Troubleshooting.md index e105ab952..c993a2cd1 100644 --- a/wiki/en/en-Client-Troubleshooting.md +++ b/wiki/en/en-Client-Troubleshooting.md @@ -26,7 +26,7 @@ You can test whether you are hearing your signal correctly by doing the followin **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. -Be aware that while listening to the server's signal will ensure you will be in sync with other musicians, you may also experience problems if your overall latency (indicated by the "Delay" light in Jamulus) is not green or at least yellow most of the time. Consult the [software manual](https://github.com/corrados/jamulus/blob/master/src/res/homepage/manual.md) to understand how to adjust your setup to help with this. +Be aware that while listening to the server's signal will ensure you will be in sync with other musicians, you may also experience problems if your overall latency (indicated by the "Delay" light in Jamulus) is not green or at least yellow most of the time. Consult the [software manual](/wiki/Software-Manual) to understand how to adjust your setup to help with this. ### Can't work out your mic settings? From 7cb48c9cbeb2fcf71f69cc473642156141a8702b Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Fri, 11 Dec 2020 22:04:00 +0100 Subject: [PATCH 073/280] Update en-Installation-for-Windows.md --- wiki/en/en-Installation-for-Windows.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wiki/en/en-Installation-for-Windows.md b/wiki/en/en-Installation-for-Windows.md index 3f5afb9aa..b724a56c8 100644 --- a/wiki/en/en-Installation-for-Windows.md +++ b/wiki/en/en-Installation-for-Windows.md @@ -28,10 +28,10 @@ Before you start with Jamulus: ### How to setup ASIO4All inputs (Guide) 1. Open Jamulus's settings -1. Go to _"ASIO 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 soundcard inputs by clicking the _plus icon_ next to this soundcard to show its inputs/outputs 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 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. From 6006812d37c8b307f75756bf817713964da555f1 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Fri, 11 Dec 2020 22:28:36 +0100 Subject: [PATCH 074/280] Update en-Installation-for-Windows.md --- wiki/en/en-Installation-for-Windows.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/wiki/en/en-Installation-for-Windows.md b/wiki/en/en-Installation-for-Windows.md index b724a56c8..dafb97fb0 100644 --- a/wiki/en/en-Installation-for-Windows.md +++ b/wiki/en/en-Installation-for-Windows.md @@ -34,7 +34,9 @@ Before you start with Jamulus: 1. Open your soundcard inputs by clicking the _plus icon_ next to this soundcard to show its inputs/outputs 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 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. +**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? From c267fc2b9c3a93817d80a5c74ba34b4c938600a9 Mon Sep 17 00:00:00 2001 From: Jonathan <4561747+gilgongo@users.noreply.github.com> Date: Sat, 12 Dec 2020 15:49:53 +0000 Subject: [PATCH 075/280] Update en-Software-Manual.md Remove reference to the UI to avoid confusion https://github.com/corrados/jamulus/issues/778#issuecomment-743738149 --- wiki/en/en-Software-Manual.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/wiki/en/en-Software-Manual.md b/wiki/en/en-Software-Manual.md index 3482dde23..27a2f74c6 100644 --- a/wiki/en/en-Software-Manual.md +++ b/wiki/en/en-Software-Manual.md @@ -106,8 +106,7 @@ to the right and move the fader upwards until the desired reverb level is reache Controls the relative levels of the left and right local audio channels. For a mono signal it acts as a pan between the two channels. For example, if a microphone is connected to the right input channel and -an instrument is connected to the left input channel which is much louder than the microphone, move the audio fader -in a direction where the label above the fader shows L -x, where x is the current attenuation indicator. +an instrument is connected to the left input channel which is much louder than the microphone, move the audio fader to increase the relative volume of the mic. ### Server audio mixer From c2bc3ba8f9d5b0e7bbff775f20e7ab7b261c545a Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Mon, 14 Dec 2020 07:10:22 +0100 Subject: [PATCH 076/280] Remove target blank --- _layouts/mainhomepage.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_layouts/mainhomepage.html b/_layouts/mainhomepage.html index db6b908e3..a2e09b776 100644 --- a/_layouts/mainhomepage.html +++ b/_layouts/mainhomepage.html @@ -43,7 +43,7 @@

Jamulus

- {{ page.mTGetStartedNow }} + {{ page.mTGetStartedNow }}
{{ page.mHTMLDownloadNow }} From 8797ac8a29db6310a6a0d461774e818a9b05aacf Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 14 Dec 2020 15:29:59 +0100 Subject: [PATCH 077/280] [fr] Create fr-Compiling.md (#109) (#180) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * W: [fr] fr-Compiling.md * Update fr-Compiling.md * [fr] update fr.-Compiling.md (review fixes) Co-authored-by: Olivier Humbert Co-authored-by: Gérald Niel Co-authored-by: Olivier Humbert --- wiki/fr/fr-Compiling.md | 83 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) create mode 100644 wiki/fr/fr-Compiling.md diff --git a/wiki/fr/fr-Compiling.md b/wiki/fr/fr-Compiling.md new file mode 100644 index 000000000..eba8d1e64 --- /dev/null +++ b/wiki/fr/fr-Compiling.md @@ -0,0 +1,83 @@ +--- +layout: wiki +title: "Compilation" +lang: "fr" +permalink: "/wiki/Compiling" +--- + +# Compiler Jamulus depuis le code source + +## Linux + +Veuillez vous référer à la [page d'installation du client](Installation-for-Linux) ou ces instructions si vous souhaitez [compiler un serveur sans IUG](Server-Linux#serveur-sans-iug). + +## macOS +Vous n'avez pas besoin de compiler Jamulus sous macOS puisque nous fournissons des binaires officiels, mais si vous souhaitez vraiment le faire, suivez les instructions ci-dessous. + +### Pré-requis + +1. Installez XCode +1. Installez QT comme suit + +```shell +brew install qt5 +brew link qt5 --force +``` + +### Construire le projet + +#### Générer le fichier de projet XCode +```shell +qmake -spec macx-xcode Jamulus.pro +``` + +#### Afficher les cibles de construction et la configuration dans la console +```shell +xcodebuild -list -project Jamulus.xcodeproj +``` +affichera +```shell +Targets: + Jamulus + Qt Preprocess + +Build Configurations: + Debug + Release + +If no build configuration is specified and -scheme is not passed then "Release" is used. + +Schemes: + Jamulus +``` + +#### Construire le projet + +```shell +xcodebuild build +``` + +Construira l'application et la rendra disponible dans `./Release/Jamulus.app`. + + +## Windows +Vous n'avez pas besoin de compiler Jamulus sous Windows puisque nous fournissons des binaires officiels, mais si vous souhaitez vraiment le faire, suivez les instructions ci-dessous. + +**Logiciels pré-requis**: [QT](https://www.qt.io/download), un compilateur comme Visual Studio, les fichiers de développement ASIO + +- Obtenez le code source de Jamulus, par ex. via git ou en téléchargeant l'archive zip depuis le dépôt de Jamulus. +- Obtenez et copiez les fichiers de développement [ASIOSDK](https://www.steinberg.net/de/company/developer.html) dans le répertoire `[\chemin\vers\les\sources\jamulus]\windows` afin que, par ex., le répertoire `[\chemin\vers\les\sources\jamulus]\ASIOSDK2\common` existe. +- ouvrez Jamulus.pro dans Qt Creator puis compilez et exécutez. + + +## Notes générales + +### Le fanion de compilation "headless" + +La compilation avec le fanion `headless` signifie que vous pouvez éviter d'installer certains des paquets dépendants, économiser de l'espace disque et/ou accélérer votre temps de construction dans les circonstances suivantes : + +1. Si vous prévoyez d'utiliser Jamulus sous Gentoo Linux, les seuls paquets dont vous devriez avoir besoin pour une compilation headless sont `qtcore`, `qtnetwork`, `qtconcurrent` et `qtxml` (à la fois pour compiler et exécuter le serveur). + +1. Si vous utilisez Jamulus sur Ubuntu/Debian, vous aurez besoin de tous les paquets dépendants pour **compiler** le binaire, mais pour **executer** le serveur Jamulus sans IUG résultant, vous ne devriez avoir besoin que de `libqt5core5a`, `libqt5network5`, `libqt5xml5` et probablement `libqt5concurrent5`. Ceci peut être utile pour compiler/mettre à jour sur une machine pour exécuter le binaire sur une autre (un Raspberry Pi, par exemple). + +1. Notez que si vous voulez compiler un client avec IUG sur une machine et l'exécuter sur une autre (par ex. un Raspberry Pi), vous n'avez besoin que des dépendances listées pour un [serveur sans IUG](Server-Linux#serveur-sans-iug) (voir le point ci-dessus), seulement _avec_ les bibliothèques JACK. From 1ea9ac75b800cf6255dc0b99ffca3ac35674c9f7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 14 Dec 2020 20:48:20 +0100 Subject: [PATCH 078/280] [es]Fixed links (#179) (#181) * Update es-Server-Linux.md * Update es-Running-a-Private-Server.md * Update es-Server-Troubleshooting.md * Update es-Hardware-Setup.md * Update es-Server-Linux.md Co-authored-by: ignotus --- wiki/es/es-Hardware-Setup.md | 2 +- wiki/es/es-Running-a-Private-Server.md | 2 +- wiki/es/es-Server-Linux.md | 4 ++-- wiki/es/es-Server-Troubleshooting.md | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/wiki/es/es-Hardware-Setup.md b/wiki/es/es-Hardware-Setup.md index 39c98d502..0a1bbeccb 100644 --- a/wiki/es/es-Hardware-Setup.md +++ b/wiki/es/es-Hardware-Setup.md @@ -55,7 +55,7 @@ Conecta tu instrumento a una entrada del Behringer U-CONTROL UCA202. Enchufa tus ## Linux: Conexión de interfaz de audio con QJackCtrl -Consulta la [guía de instalación del cliente](Installation-for-Linux#configure-jack-with-qjackctl) en Linux. +Consulta la [guía de instalación del cliente](Installation-for-Linux#configura-jack-con-qjackctl) en Linux. ## Linux: Kernels Low Latency para Jamulus Quizá quieras instalar [Ubuntu Studio](https://ubuntustudio.org/){: target="_blank" rel="noopener noreferrer"} añade otra opción en el menú de arranque para un kernel de baja latencia. La clave para una jam session online es la baja latencia entre los servidores y los clientes conectados. Si el sistema Linux arranca con un kernel de baja latencia esto tiene un impacto positivo en tus sesiones de Jamulus. diff --git a/wiki/es/es-Running-a-Private-Server.md b/wiki/es/es-Running-a-Private-Server.md index 389e7ce4f..fac56d7d1 100644 --- a/wiki/es/es-Running-a-Private-Server.md +++ b/wiki/es/es-Running-a-Private-Server.md @@ -1,7 +1,7 @@ --- layout: wiki title: "Running a Private Server" -lang: "en" +lang: "es" permalink: "/wiki/Running-a-Private-Server" --- diff --git a/wiki/es/es-Server-Linux.md b/wiki/es/es-Server-Linux.md index d6fba427f..f14d3532d 100644 --- a/wiki/es/es-Server-Linux.md +++ b/wiki/es/es-Server-Linux.md @@ -1,7 +1,7 @@ --- layout: wiki title: "Server Installation - Linux" -lang: "en" +lang: "es" permalink: "/wiki/Server-Linux" --- @@ -37,7 +37,7 @@ La siguiente guía es para ejecutar Jamulus como un servidor "puro" en **hardwar ### Compila las fuentes, crea un usuario -1. [Obtén las fuentes](Installation-for-Linux#get-jamulus-sources) e instala las [dependencias](Installation-for-Linux#install-dependencies) de acuerdo a la guía de instalación de Linux. Ten en cuenta que **no necesitas instalar los paquetes de JACK** para una instalación 'headless'. _Si tienes pensado ejecutar un servidor 'headless' en Gentoo, o estás compilando en Ubuntu para usarlo en otra máquina con Ubuntu, [ver la nota a pie de página](#what-does-the-headless-build-flag-do)._ +1. [Obtén las fuentes](Installation-for-Linux#obtén-las-fuentes-de-jamulus) e instala las [dependencias](Installation-for-Linux#instala-las-dependencias) de acuerdo a la guía de instalación de Linux. Ten en cuenta que **no necesitas instalar los paquetes de JACK** para una instalación 'headless'. _Si tienes pensado ejecutar un servidor 'headless' en Gentoo, o estás compilando en Ubuntu para usarlo en otra máquina con Ubuntu, [ver la nota a pie de página](#el-indicador-de-compilación-headless)._ 1. Compila las fuentes para ignorar la librería de audio de JACK: ~~~ diff --git a/wiki/es/es-Server-Troubleshooting.md b/wiki/es/es-Server-Troubleshooting.md index c08ed5976..612756e11 100644 --- a/wiki/es/es-Server-Troubleshooting.md +++ b/wiki/es/es-Server-Troubleshooting.md @@ -1,7 +1,7 @@ --- layout: wiki title: "Server Troubleshooting" -lang: "en" +lang: "es" permalink: "/wiki/Server-Troubleshooting" --- From 6d058b47cef11402cb94530e6eab2c7c58eec4d5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 14 Dec 2020 21:48:46 +0100 Subject: [PATCH 079/280] fixes a link (#182) (#183) Co-authored-by: Olivier Humbert --- wiki/fr/fr-Installation-for-Linux.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/fr/fr-Installation-for-Linux.md b/wiki/fr/fr-Installation-for-Linux.md index 5b996b305..1435669c3 100644 --- a/wiki/fr/fr-Installation-for-Linux.md +++ b/wiki/fr/fr-Installation-for-Linux.md @@ -104,7 +104,7 @@ Jamulus a été installé et peut désormais être utilisé. Vous pouvez mainten ## Pour mettre à jour votre installation vers une nouvelle version -Téléchargez les nouvelles sources conformément à la section [Obtenir les sources de Jamulus](#Installation-for-Linux#obtenir-les-sources-de-jamulus) puis répétez simplement les [instructions de compilation](#compilons-ce-vilain-garçon) comme pour une nouvelle installation ci-dessus. +Téléchargez les nouvelles sources conformément à la section [Obtenir les sources de Jamulus](Installation-for-Linux#obtenir-les-sources-de-jamulus) puis répétez simplement les [instructions de compilation](#compilons-ce-vilain-garçon) comme pour une nouvelle installation ci-dessus. ## Notes à l'attention des « geeks » From d1761a7e1079fb78f00d34ead93092aad2e2800b Mon Sep 17 00:00:00 2001 From: Jonathan <4561747+gilgongo@users.noreply.github.com> Date: Mon, 14 Dec 2020 21:54:49 +0000 Subject: [PATCH 080/280] Update 1-index.html Remove typo/redundant text. --- 1-index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/1-index.html b/1-index.html index 51adf0265..a327e7987 100644 --- a/1-index.html +++ b/1-index.html @@ -46,7 +46,7 @@

Help needed?

Contribute!

- Ideas? Found a bug? Want to contribute? Since Jamulus is free and open source software licensed under the GPL you can help us!
+ Ideas? Found a bug? Want to contribute? Since Jamulus is free and open source software licensed under the GPL.
Take a look at our contribution guidelines to find out how. You're welcome!

From a1a8dcf3a5ed31baf1ac6f526defeeb0bf83ccc3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 14 Dec 2020 23:06:56 +0100 Subject: [PATCH 081/280] [es] Some corrections. (#184) (#186) * Update es-Contribution.md * Update es-Hardware-Setup.md * Update es-Server-Linux.md * Update es-Installation-for-Windows.md Co-authored-by: ignotus --- wiki/es/es-Contribution.md | 2 +- wiki/es/es-Hardware-Setup.md | 2 +- wiki/es/es-Installation-for-Windows.md | 2 +- wiki/es/es-Server-Linux.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/wiki/es/es-Contribution.md b/wiki/es/es-Contribution.md index c6e5a2309..ab2df38d5 100644 --- a/wiki/es/es-Contribution.md +++ b/wiki/es/es-Contribution.md @@ -16,7 +16,7 @@ Ver el [repositorio de Jamulus en GitHub](https://github.com/corrados/jamulus) p * Si observas algún error de contenido o tipográfico, o algo que está desfasado (en cualquier idioma), puedes [comentarlo aquí](https://github.com/jamulussoftware/jamuluswebsite/issues). -* Si crees que falta o se puede mejorar alguna documentación o información, abre un post en [el foro de discución relevante](https://sourceforge.net/p/llcon/discussion/) para que se pueda discutir primero. +* Si crees que falta o se puede mejorar alguna documentación o información, abre un post en [el foro de discusión relevante](https://sourceforge.net/p/llcon/discussion/) para que se pueda discutir primero. Los "pull request" para la página web deben tener este aspecto: diff --git a/wiki/es/es-Hardware-Setup.md b/wiki/es/es-Hardware-Setup.md index 0a1bbeccb..f0bdf6508 100644 --- a/wiki/es/es-Hardware-Setup.md +++ b/wiki/es/es-Hardware-Setup.md @@ -35,7 +35,7 @@ _**El modo exacto de conectar tu instrumento variará dependiendo de tu hardware En el futuro, siempre utiliza el mismo puerto USB para el dispositivo de audio. -**Usuarios de Windows**: Si no lo has hecho ya: descarga e instala [el driver ASIO de audio gratuito (ASIO4All)](http://www.asio4all.org){: target="_blank" rel="noopener noreferrer"}. Algunas personas han tenido éxito utilizando [este driver ASIO nativo](http://www.behringerdownload.de/_software/BEHRINGER_2902_X64_2.8.40.zip){: target="_blank" rel="noopener noreferrer"} __actualmente no disponible__; no está listado en las páginas de producto de Behringer a fecha de abril del 2020. +**Usuarios de Windows**: Si no lo has hecho ya: descarga e instala [el driver ASIO de audio gratuito (ASIO4All)](http://www.asio4all.org){: target="_blank" rel="noopener noreferrer"}. Algunas personas han tenido éxito utilizando [este driver ASIO nativo](http://www.behringerdownload.de/_software/BEHRINGER_2902_X64_2.8.40.zip){: target="_blank" rel="noopener noreferrer"} __actualmente no disponible__; no está listado en las páginas de producto de Behringer a fecha de abril del 2020. #### 2. Arranca Jamulus diff --git a/wiki/es/es-Installation-for-Windows.md b/wiki/es/es-Installation-for-Windows.md index 2e9a520ce..e938ad4fb 100644 --- a/wiki/es/es-Installation-for-Windows.md +++ b/wiki/es/es-Installation-for-Windows.md @@ -6,7 +6,7 @@ permalink: "/wiki/Installation-for-Windows" --- # Instalación en Windows -Asegúrate de leer la página de [Cómo Empezar](Getting-Started) page. +Asegúrate de leer la página de [Cómo Empezar](Getting-Started). 1. **Descarga e instala un driver ASIO**. Se recomienda usar una tarjeta de audio con driver ASIO nativo. Si no tienes (sobre todo las tarjetas internas), instala [este driver ASIO gratuito (ASIO4All)](http://www.asio4all.org){: target="_blank" rel="noopener noreferrer"} antes de instalar Jamulus. 1. [Descarga e instala Jamulus](https://sourceforge.net/projects/llcon/files/latest/download){: target="_blank" rel="noopener noreferrer"}. Si te aparece una notificación de aviso de SmartScreen, haz clic en "Más info" y "Ejecutar de todas formas" para instalar Jamulus. Esto es necesario ya que aún no pagamos para la firma de código. 1. **Ejecuta Jamulus**. Ahora deberías de poder utilizar Jamulus igual que cualquier otra aplicación. diff --git a/wiki/es/es-Server-Linux.md b/wiki/es/es-Server-Linux.md index f14d3532d..6fcc231cb 100644 --- a/wiki/es/es-Server-Linux.md +++ b/wiki/es/es-Server-Linux.md @@ -37,7 +37,7 @@ La siguiente guía es para ejecutar Jamulus como un servidor "puro" en **hardwar ### Compila las fuentes, crea un usuario -1. [Obtén las fuentes](Installation-for-Linux#obtén-las-fuentes-de-jamulus) e instala las [dependencias](Installation-for-Linux#instala-las-dependencias) de acuerdo a la guía de instalación de Linux. Ten en cuenta que **no necesitas instalar los paquetes de JACK** para una instalación 'headless'. _Si tienes pensado ejecutar un servidor 'headless' en Gentoo, o estás compilando en Ubuntu para usarlo en otra máquina con Ubuntu, [ver la nota a pie de página](#el-indicador-de-compilación-headless)._ +1. [Obtén las fuentes](Installation-for-Linux#obtén-las-fuentes-de-jamulus) e instala las [dependencias](Installation-for-Linux#instala-las-dependencias) de acuerdo a la guía de instalación de Linux. Ten en cuenta que **no necesitas instalar los paquetes de JACK** para una instalación 'headless'. _Si tienes pensado ejecutar un servidor 'headless' en Gentoo, o estás compilando en Ubuntu para usarlo en otra máquina con Ubuntu, [ver la nota a pie de página](#qué-hace-el-indicador-de-compilación-headless)._ 1. Compila las fuentes para ignorar la librería de audio de JACK: ~~~ From 14e7a5344c71914a2a3437a29711a5c20c33fe6e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 14 Dec 2020 23:35:16 +0100 Subject: [PATCH 082/280] Update IT translation GettingStarted #185 (#187) Co-authored-by: ann0see <20726856+ann0see@users.noreply.github.com> --- wiki/it/it-Getting-Started.md | 60 +++++++++++++++++++---------------- 1 file changed, 32 insertions(+), 28 deletions(-) diff --git a/wiki/it/it-Getting-Started.md b/wiki/it/it-Getting-Started.md index cdc2e761d..19cbf048c 100644 --- a/wiki/it/it-Getting-Started.md +++ b/wiki/it/it-Getting-Started.md @@ -4,59 +4,63 @@ title: "Primi Passi" lang: "it" permalink: "/wiki/Getting-Started" --- -# Primi Passi + +# Primi Passi su Jamulus + ## Avrai bisogno di -1. Un PC con **Windows 10**, oppure con **MacOS X El Capitan (v10.11) o versione superiore**, o **Linux**. Requisiti mini sono una CPU da 1,5GHZ. -1. **Una connessione Ethernet via cavo e non WI-FI**(su connessione WI-FI si posso verificare difficolta di utilizzo e problemi di ascolto). Molte delle attuali linee sono sufficienti per garantire il buon funzionamento dell'applicazione([clicca qui per maggiori dettagli](Network-Requirements){: target="_blank" rel="noopener noreferrer"}). Si ricorda che una connessione con 10Mbits in down e 1Mbits in up non è sufficiente per garantire un buon funzionamento e non avere problemi di ascolto. -1. **E' consigliabile usare le cuffie e non le casse** per prevenire effetti di echo o larsen e (in particolare per cantanti o per chi suona strumenti acustici) per essere sicuri di andare a tempo con gli altri -_(aprire [questo link](Getting-Started#problemi-non-riesci-a-tenere-il-tempo) per comprendere le connessioni). +1. **Un computer** con installato **Windows 10**, **macOS** (**MacOS X** El Capitan v10.11 o versioni successive), oppure **Linux**. +1. **Una connessione cablata ad internet** (non usare il Wi-Fi, rende problematico l'uso del software creando problemi di ascolto). Una connessione in fibra offre le caratteristiche ideali per l'utilizzo[^1]. +1. **Usare le cuffie - non le casse** per prevenire effetti di echo o larsen e minimizzare il delay[^2]. ## Massimizza la qualità, minimizza i ritardi -### **Raccomandato**: usare un interfaccia audio USB o Firewire! -A meno che tu non sia un cantante con un microfono (USB), per ottimizzare la latenza ti consigliamo vivamente di utilizzare un'interfaccia audio, alla quale puoi collegare i tuoi strumenti piuttosto che utilizzare la scheda audio incorporata del tuo computer. L'interfaccia si collegherà al tuo PC solitamente tramite USB. Vedere [Hardware Setup](Hardware-Setup){: target="_blank" rel="noopener noreferrer"}. +### 1. Limitare il traffico internet e chiudere tutti i programmi + +Accertati che nessun programma possa andare in conflitto sulla rete con Jamulus (come programmi di video conferenza o streaming video) mentre partecipi ad una sessione. -### Riduci al minimo i disturbi! +### 2. Usa una scheda audio esterna e non quella integrata nel PC -Ridurre al minimo la "latenza" (ritardo del segnale) è fondamentale per suonare insieme. Durante l'utilizzo di Jamulus, cerca di assicurarti che nient'altro sulla tua macchina o sulla tua rete stia utilizzando banda. Consigliamo di non guardare YouTube / Netflix o non avere nient'altro in esecuzione sulla macchina su cui stai usando Jamulus. +Raccomandiamo - anche se per cominciare ne puoi fare a meno - di usare una scheda audio esterna (dove potrai collegare il tuo Microno e/o il tuo strumento e connetterli al PC via USB) per avere maggiore qualità audio e bassa latenza durante una sessione su Jamulus. E' possibile usare un microfono USB. Poi consultare la pagina sull'[hardware consigliato](#recommended-hardware). -#### Ping time! +### 3. Connettersi a server con latenza bassa -Connettiti sempre ai server con i **ping più bassi** come mostrato nell'elenco dei server. Connettersi ad un server con 15 ms o meno ti darà la possibilità di divertirti (sebbene ci siano anche altri fattori che incidono sulle prestazioni). Connettersi a server con latenze più alte implica maggiore difficoltà di riuscire a suonare e quindi divertirsi. +E' consigliabile scegliere server dalla lista che riportano ping inferiori o uguali a 15ms per un ottima esperienza di utilizzo (anche se ci sono altre cose che possono influenzare le prestazioni). Collegarsi a server con ping più alti potrebbe compromettere il corretto funzionamento del software. -## Pronti? Installiamo Jamulus! +Ora che hai acquisito le nozioni di base, possiamo cominciare:

- Per Utenti Windows - Per Utento MacOSX - Per Utenti Linux + Installazione su Windows + Installazione su macOS + Per utenti Linux
-[Jamulus OS!](https://sourceforge.net/projects/jamulus-os/files/JamulusOS/) -Puoi far girare Jamulus anche da chiavetta USB (solo per sistemi a 64bit). Configura l'Hardware e comincia a suonare! +Altrimenti - [Jamulus OS!](https://sourceforge.net/projects/jamulus-os/files/JamulusOS/) Puoi usare Jamulus su qualsiasi computer tramite una penna USB (solo per sistemi a 64-bit). Verifica il tuo hardware e comincia questa nuova esperienza! -## Tutto Installato? +## Configurazione Hardware -Se devi configurare Jamulus puoi leggere [Hardware Setup](Hardware-Setup) +Visita [la lista delle interfacce testate](Sound-Devices) e la pagina di [configurazione dell'Hardware](Hardware-Setup). -Per informazioni dettagliate su come usare Jamulus puoi vedere il [Manuale](https://github.com/corrados/jamulus/blob/master/src/res/homepage/manual.md). +## Altre guide +* [Eccellente Guida](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_) che vale la pena di leggere. -**Altrimenti [questa eccellente guida in inglese](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_) - -## Problemi? Non riesci a tenere il tempo? +## Problemi? Non riesci ad andare a tempo? **ASCOLTA SOLO IL SEGNALE CHE PROVIENE DAL SERVER!** -In altre parole evita di ascoltare il segnale diretto del tuo strumento. +In altre parole **evita** di ascoltare il segnale diretto del tuo strumento/microfono. -E' ovviamente difficile per cantanti e musicisti acustici ma, anche se la connessione è buona, quando i musicisti non stanno ascoltando il **segnale che proviene dal server**, la sincronizzazione con gli altri ne risentirà. _(A scanso di equivoci: questo non ha nulla a che fare con i controlli "mute" in Jamulus.)_ +Risulta sicuramente complicato per cantanti o musicisti di strumenti acustici ma, anche se la connessione è buona, quando non si ascolta il **segnale che proviene dal server**, la scincronizzazione con gli altri ne risentirà. _(A scanso di equivoci: questo non ha nulla a che fare con i controlli “mute” in Jamulus.)_ -Ulteriori informazioni su come evitare di ascoltare se stessi (ed essere aiutati in altri problemi) possono essere trovate nella [sezione "Domande Frequenti" della FAQ](Client-Troubleshooting) (_attualmente in costruzione_) +Further information about how to avoid listening to yourself (and help with other problems) can be found in the [Troubleshooting FAQ section](Client-Troubleshooting) (_currently under construction_) ## Come funziona Jamulus (in generale) **Ecco come milioni di persone utilizzano Jamulus per suonare, cantare e insegnare musica in tempo reale, in tutto il mondo:** -![Visita](https://user-images.githubusercontent.com/4561747/79309764-bd387280-7ef2-11ea-9d81-1e81302525e6.png) -_Jamulus funziona secondo il principio del client-server. L'audio di tutti viene inviato a un server, mixato ed elaborato. Successivamente l'audio viene inviato a ogni client. Se un server viene reso pubblico e registrato su un server centrale, le sue informazioni verranno trasmesse a tutti i client._ +![Overview](https://user-images.githubusercontent.com/4561747/79309764-bd387280-7ef2-11ea-9d81-1e81302525e6.png) +_Jamulus funziona secondo il principio del client-server. L’audio di tutti viene inviato a un server, mixato ed elaborato. Successivamente l’audio viene inviato a ogni client. Se un server viene reso pubblico e registrato su un server centrale, le sue informazioni verranno trasmesse a tutti i client._ + +## Note a pié di pagina +[^1]: [Dettagli di connessione](Network-Requirements){: target="_blank" rel="noopener noreferrer"}. Una connessione con 10Mbits in down e 1Mbps in up non è sufficiente, è probabile riscontrare problemi relativi alla connettività. +[^2]: Cuffie-Bluetooth di solito inseriscono latenza. Per questo è consigliabile usare cuffie con filo. In particolare per cantanti e musicisti di strumenti acustici (leggere [il paragrafo relativo](Getting-Started#having-trouble-cant-keep-in-time) per maggiori informazioni). From c2b85bd3e5b834c7159f8c1b16661010b81889fd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 15 Dec 2020 20:35:57 +0100 Subject: [PATCH 083/280] [es] Corrections (#188) (#190) * Update es-Server-Linux.md * Update es-Server-Linux.md * Update es-Getting-Started.md * Update es-Choosing-a-Server-Type.md * Update es-Client-Troubleshooting.md * Update es-Command-Line-Options.md * Update es-Hardware-Setup.md * Update es-Installation-for-Linux.md * Update es-Installation-for-Macintosh.md * Update es-Installation-for-Windows.md * Update es-Linux-Install-Script.md * Update es-Privacy-Statement.md * Update es-Running-a-Private-Server.md * Update es-Server-Linux.md * Update es-Server-Win-Mac.md * Update es-Sound-Devices.md * Update es-Tips-Tricks-More.md Co-authored-by: ignotus --- wiki/es/es-Choosing-a-Server-Type.md | 2 +- wiki/es/es-Client-Troubleshooting.md | 6 +++--- wiki/es/es-Command-Line-Options.md | 10 +++++----- wiki/es/es-Getting-Started.md | 6 +++--- wiki/es/es-Hardware-Setup.md | 4 ++-- wiki/es/es-Installation-for-Linux.md | 10 +++++----- wiki/es/es-Installation-for-Macintosh.md | 4 ++-- wiki/es/es-Installation-for-Windows.md | 4 ++-- wiki/es/es-Linux-Install-Script.md | 2 +- wiki/es/es-Privacy-Statement.md | 2 +- wiki/es/es-Running-a-Private-Server.md | 2 +- wiki/es/es-Server-Linux.md | 9 +++------ wiki/es/es-Server-Win-Mac.md | 6 +++--- wiki/es/es-Sound-Devices.md | 2 +- wiki/es/es-Tips-Tricks-More.md | 8 ++++---- 15 files changed, 37 insertions(+), 40 deletions(-) diff --git a/wiki/es/es-Choosing-a-Server-Type.md b/wiki/es/es-Choosing-a-Server-Type.md index 586f79e5c..3e02213f4 100644 --- a/wiki/es/es-Choosing-a-Server-Type.md +++ b/wiki/es/es-Choosing-a-Server-Type.md @@ -31,7 +31,7 @@ Ver también [Opciones de Línea de Comandos](Command-Line-Options) para ver otr ### 2. Privado -Este tipo de servidor no figurará en una lista de servidores central. Debes proporcionar a los músicos la dirección de tu servidor para que puedan conectar sus clientes. Ver también [Ejecutar un Servidor Privado](Running-a-Private-Server) para ver lo necesario para que otros se conecten a él.. +Este tipo de servidor no figurará en una lista de servidores central. Debes proporcionar a los músicos la dirección de tu servidor para que puedan conectar sus clientes. Ver también [Ejecutar un Servidor Privado](Running-a-Private-Server) para ver lo necesario para que otros se conecten a él. ![PrivateServer](https://user-images.githubusercontent.com/70917001/94502827-66420380-01db-11eb-94df-dbe3985d3665.png) diff --git a/wiki/es/es-Client-Troubleshooting.md b/wiki/es/es-Client-Troubleshooting.md index 4918f668b..5fba50d2c 100644 --- a/wiki/es/es-Client-Troubleshooting.md +++ b/wiki/es/es-Client-Troubleshooting.md @@ -8,7 +8,7 @@ permalink: "/wiki/Client-Troubleshooting" # Resolución de Problemas ### ¿No escuchas nada/Otros no pueden escucharte? -Empieza por lo sencillo: asegúrate de que tu instrumento/micrófono y auriculares están conectados al puerto correcto. Asegúrate de que ninguna otra aplicación como el navegador, herramienta de videoconferencia, etc. no está utilizando la tarjeta de sonido. Deberías cerrar estos programas al utilizar Jamulus. Si todo parece estar bien y el problema persiste, es probable que haya algún problema con la configuración del dispositivo de audio. Esto dependerá de tu configuración particular (plataforma, hardware, software y drivers), así que es mejor preguntar en [los foros](https://sourceforge.net/p/llcon/discussion/software/) para solicitar ayuda. +Empieza por lo sencillo: asegúrate de que tu instrumento/micrófono y auriculares están conectados al puerto correcto. Asegúrate de que ninguna otra aplicación como el navegador, herramienta de videoconferencia, etc. está utilizando la tarjeta de sonido. Deberías cerrar estos programas al utilizar Jamulus. Si todo parece estar bien y el problema persiste, es probable que haya algún problema con la configuración del dispositivo de audio. Esto dependerá de tu configuración particular (plataforma, hardware, software y drivers), así que es mejor preguntar en [los foros](https://sourceforge.net/p/llcon/discussion/software/) para solicitar ayuda. **Usuarios de Windows (ASIO4All)**: Si estás utilizando el driver ASIO4All, mira [la sección de configuración para ASIO4All](Installation-for-Windows#configurar-asio4all) @@ -34,7 +34,7 @@ Cuando utilizas un micrófono mientras tocas otro instrumento, puedes utilizar u ### ¿El LED del buffer se vuelve rojo, cortes, jitter, sonidos raros? -El procesador de tu ordenador podría estar sobrecargado. Intenta no dejar que otros programas compitan con Jamulus (como Zoom Meetings o streaming en directo de Facebook) en tu máquina. O al menos ciérralos mientras tocas. Evita cosas como escaneos del antivirus o actualizaciones de software, etc. Ten en cuenta que el efecto de reverb en Jamulus consume más CPU cuanto más erverb se aplique. +El procesador de tu ordenador podría estar sobrecargado. Intenta no dejar que otros programas compitan con Jamulus (como Zoom Meetings o streaming en directo de Facebook) en tu máquina. O al menos ciérralos mientras tocas. Evita cosas como escaneos del antivirus o actualizaciones de software, etc. Ten en cuenta que el efecto de reverb en Jamulus consume más CPU cuanto más reverb se aplique. ### Los tiempos del ping y la latencia empiezan bien pero luego empeoran, causando problemas @@ -66,7 +66,7 @@ Ver [este hilo del foro](https://sourceforge.net/p/llcon/discussion/533517/threa (Con agradecimientos a [Mark Anthony De Souza](https://www.facebook.com/groups/619274602254947/permalink/765122847670121/?comment_id=765525034296569)) -Quizá no respondiste "Sí" al reto de `"Jamulus quiere acceder a tu micrófono"`. Para arreglarlo: +Quizá no respondiste "Sí" al mensaje de `"Jamulus quiere acceder a tu micrófono"`. Para arreglarlo: * Ve a `Preferencias` > `Seguridad & Privacidad` > pestaña de `Privacidad` * Busca `Micrófono` a la izquierda y luego asegúrate de que `Jamulus` está activado en la lista de la derecha diff --git a/wiki/es/es-Command-Line-Options.md b/wiki/es/es-Command-Line-Options.md index a0da35cdf..81568ac7f 100644 --- a/wiki/es/es-Command-Line-Options.md +++ b/wiki/es/es-Command-Line-Options.md @@ -12,13 +12,13 @@ Mientras que las funciones más comunes de Jamulus pueden configurarse usando la Por ejemplo, en Windows, para activar la grabación con la opción `-R`: haz clic derecho en el acceso directo de Jamulus y elige "Propiedades" > Destino. Añade los argumentos necesarios a Jamulus.exe: ```shell -"C:\Program Files (x86)\Jamulus\Jamulus.exe" -s -R "C:\path\to\your\Jam Recordings" +"C:\Program Files (x86)\Jamulus\Jamulus.exe" -s -R "C:\ruta\a\tus\Grabaciones" ``` Para macOS, arranca una ventana de Terminal y ejecuta Jamulus con las opciones deseadas como sigue: ```shell -/Applications/Jamulus.app/Contents/MacOS/Jamulus -s -R "/path/to/your/jam recordings" +/Applications/Jamulus.app/Contents/MacOS/Jamulus -s -R "/ruta/a/tus/Grabaciones" ``` *** @@ -42,13 +42,13 @@ Puedes ver todas las opciones posibles soportadas por tu versión arrancando Jam | `-n` |`--nogui` | Deshabilitar interfaz gráfica | (cliente y servidor) | | `-o` |`--serverinfo` | Detalles de localización del servidor en el formato:
`[nombre];[ciudad];[[valor locale]]` (ver [valores](https://doc.qt.io/qt-5/qlocale.html#Country-enum)) | (Solo servidores públicos) | | `-p` |`--port` | Número del puerto UDP local. Por defecto es 22124 | (solo servidor) | -| `-R` |`--recording` | Incluye una ruta editable donde se deben guardar los archivos (entrecomillado si es apropiado). | (solo servidor) Ver descripción en [Configuración del Servidor](Server-Win-Mac#grabación). | +| `-R` |`--recording` | Incluye una ruta editable donde se deben guardar los archivos (entrecomillado si procede). | (solo servidor) Ver descripción en [Configuración del Servidor](Server-Win-Mac#grabación). | | |`--norecord` | Arranca la grabadora con la grabación desactivada| (solo servidor) | | `-s` |`--server` | Arrancar en modo servidor | (solo servidor) [Ver nota](Choosing-a-Server-Type) | | `-t` |`--notranslation` | Deshabilitar traducciones | (cliente y servidor) | | `-T` |`--multithreading` | Habilitar multithreading | (solo servidor) | | `-u` |`--numchannels` | Número máximo de usuarios. Por defecto son 10, el máximo son 50 | (solo servidor) | -| `-w` |`--welcomemessage` | Soporta el formateo HTML y CSS (entre comillas), o establece ruta a un archivo de texto | (solo servidor) | +| `-w` |`--welcomemessage` | Soporta el formateo HTML y CSS (entre comillas), o establece la ruta a un archivo de texto | (solo servidor) | | `-z` |`--startminimized` | Arranca minimizado | (solo servidor) | | |`--ctrlmidich` | Canal para recibir mensajes de controlador MIDI y compensación de número de control, formato: `canal[;compensación]` | (solo cliente), ver [Consejos y Trucos](Tips-Tricks-More#utilizar-ctrlmidich-para-controladores-midi) | -| |`--clientname` | Título de ventana y nombre de cliente en Jack | (solo cliente) | | +| |`--clientname` | Título de ventana y nombre de cliente en JACK | (solo cliente) | | diff --git a/wiki/es/es-Getting-Started.md b/wiki/es/es-Getting-Started.md index 137363037..bf7e31a69 100644 --- a/wiki/es/es-Getting-Started.md +++ b/wiki/es/es-Getting-Started.md @@ -21,7 +21,7 @@ Intenta asegurarte de que no haya nada en tu ordenador o en tu red (como vídeo ### 2. Utiliza un interfaz de audio/micrófono externo, no el dispositivo interno de sonido -Recomendamos encarecidamente ‒ aunque puedes empezar sin él ‒ que utilices un interfaz de audio (un dispositivo al que conectas tu micrófono/instrumento y que se conecta al tu PC mediante, por ejemplo, USB) para disfrutar una mejor calidad de sonido con menor latencia en Jamulus. También puedes utilizar un micrófono USB. Ver [hardware recomendado](#hardware-recomendado). +Recomendamos encarecidamente ‒ aunque puedes empezar sin él ‒ que utilices un interfaz de audio (un dispositivo al que conectas tu micrófono/instrumento y que se conecta a tu PC mediante, por ejemplo, USB) para disfrutar una mejor calidad de sonido con menor latencia en Jamulus. También puedes utilizar un micrófono USB. Ver [hardware recomendado](#hardware-recomendado). ### 3. Conéctate a los servidores con el ping más bajo @@ -50,7 +50,7 @@ Ver [la lista de hardware comprobado](Sound-Devices) y [Configuración de Hardwa O dicho de otra manera, **no** escuches tu señal directa. -Obviamente esto es difícil para cantantes y al tocar algunos instrumentos acústicos, pero aunque tu conexión sea buena, si no escuchas tu **propia señal que vuelve del servidor**, tu sincronización **sufrirá**. _(Para que quede claro: esto no tiene nada que ver con los controles de "mute" en Jamulus.)_ +Obviamente esto es difícil para cantantes y a la hora de tocar algunos instrumentos acústicos, pero aunque tu conexión sea buena, si no escuchas tu **propia señal que vuelve del servidor**, tu sincronización **sufrirá**. _(Para que quede claro: esto no tiene nada que ver con los controles de "mute" en Jamulus.)_ Se puede encontrar más información sobre cómo evitar escucharte a ti mismo (y ayuda con otros problemas) en la [sección de FAQ sobre la Resolución de Problemas](Client-Troubleshooting) (_aún en construcción_) @@ -59,7 +59,7 @@ Se puede encontrar más información sobre cómo evitar escucharte a ti mismo (y **Así es cómo millones de personas utilizan Jamulus para tocar, cantar y enseñar música con otras personas en tiempo real, por todo el mundo:** ![Overview](https://user-images.githubusercontent.com/4263412/97573060-78d17780-19e9-11eb-94dd-7fd991650e37.png) -_Jamulus funciona bajo el principio del cliente/servidor. El audio de todos se envía a un servidor, se mezcla y se procesa allí. Después, el audio es anviado a cada cliente. Si un servidor es público y está registrado en un servidor central, su información será emitida a todos los clientes._ +_Jamulus funciona bajo el principio del cliente/servidor. El audio de todos se envía a un servidor, se mezcla y se procesa allí. Después, el audio es enviado a cada cliente. Si un servidor es público y está registrado en un servidor central, su información será emitida a todos los clientes._ ## Notas [^1]: [Detalles al completo aquí](Network-Requirements){: target="_blank" rel="noopener noreferrer"}. Si tienes 10Mbits de bajada y 1Mbps de subida, es poco probable que tengas problemas de ancho de banda. diff --git a/wiki/es/es-Hardware-Setup.md b/wiki/es/es-Hardware-Setup.md index f0bdf6508..0bd7ebdcb 100644 --- a/wiki/es/es-Hardware-Setup.md +++ b/wiki/es/es-Hardware-Setup.md @@ -58,7 +58,7 @@ Conecta tu instrumento a una entrada del Behringer U-CONTROL UCA202. Enchufa tus Consulta la [guía de instalación del cliente](Installation-for-Linux#configura-jack-con-qjackctl) en Linux. ## Linux: Kernels Low Latency para Jamulus -Quizá quieras instalar [Ubuntu Studio](https://ubuntustudio.org/){: target="_blank" rel="noopener noreferrer"} añade otra opción en el menú de arranque para un kernel de baja latencia. La clave para una jam session online es la baja latencia entre los servidores y los clientes conectados. Si el sistema Linux arranca con un kernel de baja latencia esto tiene un impacto positivo en tus sesiones de Jamulus. +Quizá quieras instalar [Ubuntu Studio](https://ubuntustudio.org/){: target="_blank" rel="noopener noreferrer"}, que añade otra opción en el menú de arranque para un kernel de baja latencia. La clave para una jam session online es la baja latencia entre los servidores y los clientes conectados. Si el sistema Linux arranca con un kernel de baja latencia esto tiene un impacto positivo en tus sesiones de Jamulus. ## Apuntes sobre las entradas @@ -75,7 +75,7 @@ _(Gracias a [pcar75](https://github.com/pcar75) por esta información)_ **Este vídeo documenta una [sesión jam en directo](https://youtu.be/c8838jS2g3U).** Utilizo una tarjeta de audio USB Lexicon Omega en un Mac Mini del 2009. Mis compañeros de grupo utilizan todos Windows 10 y tienen tarjetas de audio Behringer, por ejemplo el Behringer Xenyx 1204USB. Mi conexión a internet tiene 10 Mbps de bajada / 1 Mbps de subida mediante conexión DSL. -**El usuario de Jamulus [Andrew Evans](https://sourceforge.net/u/belvario/profile/)**: Con todos los compañeros de grupo en la misma ciudad (pero con 2 ISPs diferentes) y un tiempo ping de 20ms estables, ejecutando el servidor en un ordenador Windows por separado y el cliente en un Macbook Pro. Los demás músicos con Macbook Air. Todos con conexión Ethernet por cable a sus routers/gateways. Utilizamos WhatsApp video para vernos (con el audio apagado - ¡pero es divertido ver lo atrás que queda el audio de Whatsapp con respecto a Jamulus!) +**El usuario de Jamulus [Andrew Evans](https://sourceforge.net/u/belvario/profile/)**: Con todos los compañeros de grupo en la misma ciudad (pero con 2 ISPs diferentes) y un tiempo ping de 20 ms estables, ejecutando el servidor en un ordenador Windows por separado y el cliente en un Macbook Pro. Los demás músicos con Macbook Air. Todos con conexión Ethernet por cable a sus routers/gateways. Utilizamos WhatsApp video para vernos (con el audio apagado - ¡pero es divertido ver lo atrás que queda el audio de Whatsapp con respecto a Jamulus!) ## ¿Tienes problemas? diff --git a/wiki/es/es-Installation-for-Linux.md b/wiki/es/es-Installation-for-Linux.md index 6ec1a5628..cdd48d403 100644 --- a/wiki/es/es-Installation-for-Linux.md +++ b/wiki/es/es-Installation-for-Linux.md @@ -14,7 +14,7 @@ Aunque no ofrecemos paquetes oficiales, puede que encuentres Jamulus en el gesto [![Packaging status](https://repology.org/badge/vertical-allrepos/jamulus.svg)](https://repology.org/project/jamulus/versions) -También hay una lista de paquetes no oficiales [paquetes para diferentes distribuciones aquí](https://github.com/corrados/jamulus/issues/223){: target="_blank" rel="noopener noreferrer"}. Si no lo encuentras en tu gestor de paquetes, tienes que compilar Jamulus de las fuentes. Es bastante fácil: +También hay una lista de paquetes no oficiales [para diferentes distribuciones aquí](https://github.com/corrados/jamulus/issues/223){: target="_blank" rel="noopener noreferrer"}. Si no lo encuentras en tu gestor de paquetes, tienes que compilar Jamulus de las fuentes. Es bastante fácil: ## Obtén las fuentes de Jamulus @@ -59,7 +59,7 @@ Ahora `cd` a la carpeta de las fuentes de Jamulus que has descargado: ```shell cd jamulus-latest ``` -Ahora compila las fuentes con los siguientes comandos (el último `make` puede tardar varios minutos): +A continuación compila las fuentes con los siguientes comandos (el último `make` puede tardar varios minutos): ```shell qmake Jamulus.pro @@ -72,7 +72,7 @@ sudo make install ## Configura tu tarjeta de sonido ### Configura JACK con QjackCtl -Los clientes de Jamulus necesitan [JACK](https://jackaudio.org/){: target="_blank" rel="noopener noreferrer"} para funcionar, pero hay que configurarlo primero. El método recomendado es utilizar `QjackCtl`.. +Los clientes de Jamulus necesitan [JACK](https://jackaudio.org/){: target="_blank" rel="noopener noreferrer"} para funcionar, pero hay que configurarlo primero. El método recomendado es utilizar `QjackCtl`. 1. Abre la terminal por ej. con Crtl-Alt-T y 1. Ejecuta el comando `qjackctl`. Verás la aplicación **Jack Audio Connection Kit** 2. Configura tu interfaz de audio como sigue (la configuración exacta de Jack dependerá de lo que es capaz tu interfaz/tarjeta de audio): @@ -84,11 +84,11 @@ Los clientes de Jamulus necesitan [JACK](https://jackaudio.org/){: target="_blan Reinicia Jack para que surta efecto la nueva configuración ### Arranca Jamulus -Abre Jamulus, por ej. con la terminal. Si utilizas la terminal, ejecuta el comando `Jamulus` (con 'J' mayúscula) y esto arranca el cliente de Jamulus +Abre Jamulus, por ej. con la terminal. Si utilizas la terminal, ejecuta el comando `Jamulus` (con 'J' mayúscula) y esto arranca el cliente de Jamulus. Jamulus se instala en `/usr/local/bin`. Ahora puedes eliminar la carpeta de las fuentes si quieres. -Si tienes problemas con cortes de sonido (en particular errores de XRUN mostrados por Jack/Qjackctl) prueba con valores más altos (por ej. 256 cuadros o 3 periodos) en el paso 3 anterior. Valores más bajos (por ej. 64 cuadros) pueden ofrecer un mejor rendimiento pero también quizá más problemas con el audio. Ver la [página de resolución de problemas](Client-Troubleshooting). +Si tienes problemas con cortes de sonido (en particular errores de XRUN mostrados por JACK/QjackCtl) prueba con valores más altos (por ej. 256 cuadros o 3 periodos) en el paso 3 anterior. Valores más bajos (por ej. 64 cuadros) pueden ofrecer un mejor rendimiento pero también quizá más problemas con el audio. Ver la [página de resolución de problemas](Client-Troubleshooting). ## ¿Todo instalado? Jamulus ha sido instalado y ahora puede utilizarse. Ahora puedes echar un vistazo a la diff --git a/wiki/es/es-Installation-for-Macintosh.md b/wiki/es/es-Installation-for-Macintosh.md index c2cd8d741..4f9dbec52 100644 --- a/wiki/es/es-Installation-for-Macintosh.md +++ b/wiki/es/es-Installation-for-Macintosh.md @@ -13,7 +13,7 @@ Asegúrate de haber leído la página de [Cómo Empezar](Getting-Started). 1. **Extrae el archivo .zip descargado.**Haz doble clic en el archivo .zip, que creará una nueva carpeta con el mismo nombre. La carpeta contiene el archivo de la licencia y un archivo `.dmg` que contiene la aplicación. 1. **Haz doble clic en el archivo `.dmg`** para abrirlo. Se descomprimirá y verás dos archivos (cliente y servidor Jamulus). Acepta la licencia. 1. **Arrastra ambos iconos a tu carpeta de Aplicaciones** para instalar Jamulus. -1. **Ejecuta Jamulus**.Ahora deberías de poder usar Jamulus como cualquier otra aplicación. Si ves un mensaje diciendo que Jamulus no puede abrirse porque el desarrollador no puede ser verificado, sigue leyendo y echa un vistazo a la siguiente sección. +1. **Ejecuta Jamulus**. Ahora deberías de poder usar Jamulus como cualquier otra aplicación. Si ves un mensaje diciendo que Jamulus no puede abrirse porque el desarrollador no puede ser verificado, sigue leyendo y echa un vistazo a la siguiente sección. _Puedes eliminar la carpeta en el directorio de Descargas que contiene el archivo `.dmg` y expulsar la unidad "Jamulus" del escritorio. Ya no son necesarios._ @@ -27,7 +27,7 @@ La primera vez que trates de hacer doble clic en Jamulus para ejecutarlo, probab Para abrir Jamulus, navega hasta la carpeta de Aplicaciones con el Buscador, haz clic en Jamulus, clic derecho (o control-clic) en Jamulus, y selecciona "Abrir" de la parte superior del menú. -Ahora verás una versión ligeramente diferente del mismo mensaje, que te permite hacer clic para Abrir y ejecutarlo. No se te mostrará esta advertencia más - simplement haz doble clic para ejecutarlo en adelante. +Ahora verás una versión ligeramente diferente del mismo mensaje, que te permite hacer clic para Abrir y ejecutarlo. No se te mostrará esta advertencia más - simplemente haz doble clic para ejecutarlo en adelante. Para más información consulta [esta página de Soporte para Apple](https://support.apple.com/en-gb/guide/mac-help/mh40616/mac){: target="_blank" rel="noopener noreferrer"}. ## ¿Todo instalado? diff --git a/wiki/es/es-Installation-for-Windows.md b/wiki/es/es-Installation-for-Windows.md index e938ad4fb..53b83ddd7 100644 --- a/wiki/es/es-Installation-for-Windows.md +++ b/wiki/es/es-Installation-for-Windows.md @@ -22,7 +22,7 @@ También puedes [compilar tu propio archivo binario](Compiling) si así lo desea Para ASIO4ALL, quizá necesites experimentar un poco para encontrar la configuración adecuada ya que cada ordenador es un poco diferente. Configura tu tarjeta mientras estés en conexión con un servidor para escuchar tu instrumento o tu voz y comprobar que todo está bien configurado. Antes de empezar con Jamulus: -1. **Cierra todas las aplicaciones** (sobre todo aquellos que podrían acceder a tu tarjeta de sonido como tu navegador/reproductor de audio) ya que Jamulus necesita acceso exclusivo a tu tarjeta de audio. +1. **Cierra todas las aplicaciones** (sobre todo aquellas que podrían acceder a tu tarjeta de sonido como tu navegador/reproductor de audio) ya que Jamulus necesita acceso exclusivo a tu tarjeta de audio. 1. Si el audio no funciona directamente, asegúrate de que solo **están activadas** las **entradas/salidas correctas** en ASIO4ALL. Todo lo demás debería estar apagado. Esto se puede hacer como sigue: ### Cómo configurar las entradas de ASIO4All (Guía) @@ -43,7 +43,7 @@ Después trata de **configurar de nuevo las entradas/salidas**. Las entradas/sal Mírate [este vídeo](https://youtu.be/_GzOsitVgLI){: target="_blank" rel="noopener noreferrer"} de @trombonepizza que ofrece más información detallada sobre la configuración de ASIO4All. -Información oficial y más detallada sobre cómo configurar ASIO4All se encuentra en la sección [ASIO4All FAQs en la página web de ASIO4All](http://www.asio4all.org/faq.html){: target="_blank" rel="noopener noreferrer"} y en el manual de ASIO4All. Normalmente se encuentra en tu escritorio o en la carpeta donde se instala el archivo binario de ASIO4All (normalmente `C:\Program Files (x86)\ASIO4ALL v2\`). +Información oficial y más detallada sobre cómo configurar ASIO4All se encuentra en la sección [ASIO4All FAQs en la página web de ASIO4All](http://www.asio4all.org/faq.html){: target="_blank" rel="noopener noreferrer"} y en el manual de ASIO4All. Normalmente se encuentra en tu escritorio o en la carpeta donde se instala el archivo binario de ASIO4All (normalmente `C:\Archivos de Programa (x86)\ASIO4ALL v2\`). ## ¿Todo instalado? diff --git a/wiki/es/es-Linux-Install-Script.md b/wiki/es/es-Linux-Install-Script.md index 0fd6f792a..c3ea8bdd7 100644 --- a/wiki/es/es-Linux-Install-Script.md +++ b/wiki/es/es-Linux-Install-Script.md @@ -10,7 +10,7 @@ permalink: "/wiki/Linux-Client-Install-Script" Si tienes intención de instalar Jamulus en muchas máquinas Linux, quizá te interese este script. -El siguiente ejemplo ha sido probado en Linux Mint y combina todos los comandos de arriba en un único script para Ubuntu/Linux Mint. Para incorporar los diferentes comandos para distribuciones distintas de Linux, hay variables que definen la distribución y la versión para la cual hay que ejecutar el script. El ejemplo se centra en Ubuntu con la versión 18.04 como ejemplo. Así que el nombre sugerido para el script sería `install4ubuntu18_4.sh`. Los comandos del script son genéricos para que la instalación pueda ser modificada para funcionar con otras distribuciones de Linux. +El siguiente ejemplo ha sido probado en Linux Mint y combina todos los comandos en un único script para Ubuntu/Linux Mint. Para incorporar los diferentes comandos para distribuciones distintas de Linux, hay variables que definen la distribución y la versión para la cual hay que ejecutar el script. El ejemplo se centra en Ubuntu con la versión 18.04 como ejemplo. Así que el nombre sugerido para el script sería `install4ubuntu18_4.sh`. Los comandos del script son genéricos para que la instalación pueda ser modificada para funcionar con otras distribuciones de Linux. ### Instalación dependiente de la Distribución de Linux El siguiente script puede ejecutar diferentes comandos de instalación dependiendo de la distribución de Linux. La variable `DISTRO` define qué comandos son ejecutados. Establece la variable dependiendo de la distribusión de Linux que estés utilizando. diff --git a/wiki/es/es-Privacy-Statement.md b/wiki/es/es-Privacy-Statement.md index 611af394e..b733e08d9 100644 --- a/wiki/es/es-Privacy-Statement.md +++ b/wiki/es/es-Privacy-Statement.md @@ -7,7 +7,7 @@ permalink: "/wiki/Privacy-Statement" # Declaración de Privacidad ## Página de Inicio -Esta página de inicio de jamulus.io trata de no recoger tus datos personales. Si te conectas a la página jamulus.io site, tu IP se envía a GitHub Pages. Además, puesto que enlazamos el logo de SourceForge en el pie de cada página, SourceForge podría obtener tu IP. +Esta página de inicio de jamulus.io trata de no recoger tus datos personales. Si te conectas a la página de jamulus.io, tu IP se envía a GitHub Pages. Además, puesto que enlazamos el logo de SourceForge en el pie de cada página, SourceForge podría obtener tu IP. No utilizamos cookies de rastreo, aunque SourceForge quizá lo haga. Si no deseas esto, por favor deshabilita los cookies en tu navegador. ## Software Jamulus diff --git a/wiki/es/es-Running-a-Private-Server.md b/wiki/es/es-Running-a-Private-Server.md index fac56d7d1..1f04e3322 100644 --- a/wiki/es/es-Running-a-Private-Server.md +++ b/wiki/es/es-Running-a-Private-Server.md @@ -11,7 +11,7 @@ permalink: "/wiki/Running-a-Private-Server" Esta guía presupone que vas a ejecutar un servidor privado en tu red doméstica, pero algunos de los problemas de aquí también podrían ser aplicables a aquellos ejecutándolo en hosts en la nube (por ej. Amazon EC2). -Se recomienda que pruebes a ejecutar tu servidor en **modo público primero** para así acotar cualquier problema posterior en modo provado. +Se recomienda que pruebes a ejecutar tu servidor en **modo público primero** para así acotar cualquier problema posterior en modo privado. ## Operar un servidor privado tras un router doméstico ### Validación de puertos diff --git a/wiki/es/es-Server-Linux.md b/wiki/es/es-Server-Linux.md index 6fcc231cb..06cd40624 100644 --- a/wiki/es/es-Server-Linux.md +++ b/wiki/es/es-Server-Linux.md @@ -30,14 +30,11 @@ La siguiente guía es para ejecutar Jamulus como un servidor "puro" en **hardwar * _El usuario de Jamulus [Grigory](https://sourceforge.net/u/cidnurg/profile/) mantiene una imagen de **[Docker para Jamulus](https://hub.docker.com/r/grundic/jamulus)** que puedes utilizar._ -* _El usuario de Jamulus [skrul](https://sourceforge.net/u/skrulx/profile/) también tiene disponibles algunas **AMI públicas de Amazon EC2** de Ubuntu 18.04 ejecutando Jamulus. [Ver esta página para más detalles](Jamulus-Cloud)._ - - ### Compila las fuentes, crea un usuario -1. [Obtén las fuentes](Installation-for-Linux#obtén-las-fuentes-de-jamulus) e instala las [dependencias](Installation-for-Linux#instala-las-dependencias) de acuerdo a la guía de instalación de Linux. Ten en cuenta que **no necesitas instalar los paquetes de JACK** para una instalación 'headless'. _Si tienes pensado ejecutar un servidor 'headless' en Gentoo, o estás compilando en Ubuntu para usarlo en otra máquina con Ubuntu, [ver la nota a pie de página](#qué-hace-el-indicador-de-compilación-headless)._ +1. [Obtén las fuentes](Installation-for-Linux#obtén-las-fuentes-de-jamulus) e instala las [dependencias](Installation-for-Linux#instala-las-dependencias) de acuerdo a la guía de instalación de Linux. Ten en cuenta que **no necesitas instalar los paquetes de JACK** para una instalación 'headless'. _Si tienes pensado ejecutar un servidor 'headless' en Gentoo, o estás compilando en Ubuntu para usarlo en otra máquina con Ubuntu, [ver la nota a pie de página](#qué-hace-el-indicador-de-compilacion-headless)._ 1. Compila las fuentes para ignorar la librería de audio de JACK: ~~~ @@ -146,7 +143,7 @@ Nota: Pulsa `q` para salir del estado del servicio. ### Para actualizar tu instalación a una nueva versión -Descarga las fuentes siguiendo las [instrucciones anteriores](Server-Linux#compíla-las-fuentes-crea-un-usuario) y repite el proceso de compilación del paso 2 como si fuera una nueva instalación. Cierra el servidor, copia el archivo binario de Jamulus encima del antiguo y reinicialo. +Descarga las fuentes siguiendo las [instrucciones anteriores](Server-Linux#compila-las-fuentes-crea-un-usuario) y repite el proceso de compilación del paso 2 como si fuera una nueva instalación. Cierra el servidor, copia el archivo binario de Jamulus encima del antiguo y reinícialo. *** @@ -160,7 +157,7 @@ Cuando se utiliza la [función de grabación](Server-Win-Mac#grabación) con la Para enviar estas señales utilizando systemd, crea los siguientes dos archivos `.service` en `/etc/systemd/system`, dándoles un nombre apropiado (por ej. `nuevaGrabación-Jamulus-server.service`). -Para encender o apagar la grabación (dependiendo del estado actual): +Para iniciar o detener la grabación (dependiendo del estado actual): ~~~ [Unit] diff --git a/wiki/es/es-Server-Win-Mac.md b/wiki/es/es-Server-Win-Mac.md index 91e61b15c..4684a53ff 100644 --- a/wiki/es/es-Server-Win-Mac.md +++ b/wiki/es/es-Server-Win-Mac.md @@ -16,7 +16,7 @@ permalink: "/wiki/Server-Win-Mac" * **Usuarios de Linux** - Consulta las [instrucciones para el servidor con interfaz gráfica](Server-Linux#ejecutar-el-servidor-con-interfaz-gráfica). -server-setup +server-setup ### Configuración de servidor público @@ -36,7 +36,7 @@ _Si quieres **ejecutar un cliente en la misma máquina** debes **conectar el cli ### Grabación -Primero activa la grabación por parte del servidor estableciendo el Directorio de Grabación en la pestaña de Opciones. La grabación comienza cuando la primera persona se conecta al servidor y se para cuando la última persona se marcha. Utiliza el botón de "Nueva Grabación" para crear un nuevo sub-directorio en el cual se guardarán las grabaciones. Nota: las grabaciones son por pistas en el formato `.lof` de [Audacity](https://www.audacityteam.org/) y `.rpp` de [REAPER](https://en.wikipedia.org/wiki/REAPER). Abre los archivos respectivos para escucharlos en estas aplicaciones. +Primero activa la grabación por parte del servidor estableciendo el Directorio de Grabación en la pestaña de Opciones. La grabación comienza cuando la primera persona se conecta al servidor y se detiene cuando la última persona se marcha. Utiliza el botón de "Nueva Grabación" para crear un nuevo sub-directorio en el cual se guardarán las grabaciones. Nota: las grabaciones son por pistas en el formato `.lof` de [Audacity](https://www.audacityteam.org/) y `.rpp` de [REAPER](https://en.wikipedia.org/wiki/REAPER). Abre los archivos respectivos para escucharlos en estas aplicaciones. _Nota: Cuando tu servidor está grabando, los clientes mostrarán un mensaje informando de que la grabación está activa._ @@ -45,7 +45,7 @@ Para servidores "headless": puedes controlar la función de grabación [siguiend ### Otras opciones -jamulus-server +jamulus-server **Usuarios de Windows** - Si quieres que el servidor arranque automáticamente al iniciar el sistema, activa la casilla correspondiente. diff --git a/wiki/es/es-Sound-Devices.md b/wiki/es/es-Sound-Devices.md index 8f159ee82..e70aae523 100644 --- a/wiki/es/es-Sound-Devices.md +++ b/wiki/es/es-Sound-Devices.md @@ -7,7 +7,7 @@ permalink: "/wiki/Sound-Devices" # Dispositivos Comprobados -Esta página contiene una lista de dispositivos de hardware que funciona o no funciona con Jamulus (aunque puede variar entre Windows, Mac y Linux). Por favor actualízala con cualquier información nueva que tengas (e indica la(s) platforma(s) que has utilizado). +Esta página contiene una lista de dispositivos de hardware que funcionan o no funcionan con Jamulus (aunque puede variar entre Windows, Mac y Linux). Por favor actualízala con cualquier información nueva que tengas (e indica la(s) platforma(s) que has utilizado). ### Se sabe que funcionan con Jamulus diff --git a/wiki/es/es-Tips-Tricks-More.md b/wiki/es/es-Tips-Tricks-More.md index 4e95fff70..e4a446ca0 100644 --- a/wiki/es/es-Tips-Tricks-More.md +++ b/wiki/es/es-Tips-Tricks-More.md @@ -33,7 +33,7 @@ El usuario de Jamulus [BTDT](https://sourceforge.net/u/btdt/profile/) ha escrito Con el argumento de la línea de comandos `-m`, se puede generar información estadística sobre el servidor para incluirla en una página web. -Este es un ejemplo de de un script php utilizando el archivo de estado del servidor para mostrar el estado actual del servidor en una página html (suponiendo que se utiliza el siguiente argumento de la línea de comandos: `-m /var/www/stat1.dat`): +Este es un ejemplo de un script php utilizando el archivo de estado del servidor para mostrar el estado actual del servidor en una página html (suponiendo que se utiliza el siguiente argumento de la línea de comandos: `-m /var/www/stat1.dat`): ~~~ Guardar Configuración Canales Mezclador" en tu cliente, y cárgalos con "Cargar Configuración Canales Mezclador" (o con arrastrar/dejar caer sobre la ventana del mezclador). +Puedes guardar y restaurar la mezcla que tienes para los ensayos de tu grupo (fader, mute, pan, solo, etc.) y cargarlo en cualquier momento (incluso mientras tocas). Hazlo con "Archivo > Guardar Configuración Canales Mezclador" en tu cliente, y cárgalo con "Cargar Configuración Canales Mezclador" (o con arrastrar/dejar caer sobre la ventana del mezclador). ## Convertir un servidor público en privado sobre la marcha -Puedes ejecutar un servidor público el tiempo suficiente para que tu grupo se conecte, y luego hacerlo privado simplemente desactivando 'Mi Servidor es Público' el la ventana del servidor. Seguiréis conectados al servidor hasta que os desconectéis. (¡Gracias a [David Savinkoff](https://github.com/DavidSavinkoff) por este truco!) +Puedes ejecutar un servidor público el tiempo suficiente para que tu grupo se conecte, y luego hacerlo privado simplemente desactivando 'Mi Servidor es Público' en la ventana del servidor. Seguiréis conectados al servidor hasta que os desconectéis. (¡Gracias a [David Savinkoff](https://github.com/DavidSavinkoff) por este truco!) ## Script de arranque para cliente en Linux Aquí va un script de arranque para Jamulus utilizando una vieja tarjeta de audio Audigy4. El gran número de faders de audio disponibles hace que sea difícil establecer la configuración correcta. -Por tanto, este script incluye la configuración más importante para los faders de audio. La segunda parte del script se ocupa de las conexiones en Jack, Utilizo Guitarix como procesador de efectos de guitarra y lo inserto en la ruta del audio. +Por tanto, este script incluye la configuración más importante para los faders de audio. La segunda parte del script se ocupa de las conexiones en JACK. Utilizo Guitarix como procesador de efectos de guitarra y lo inserto en la ruta del audio. Finalmente, arranco Jamulus automáticamente, conectándose al servidor central. From 85d695be2086cfa57090d6d97b0d4469286983cb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 15 Dec 2020 20:38:56 +0100 Subject: [PATCH 084/280] [fr] Create fr-Running-a-Server.md (#114) (#191) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * W: [fr] fr-Running-a-Server.md * Update fr-Running-a-Server.md * [fr] fr-Running-a-Server.md Co-authored-by: Olivier Humbert Co-authored-by: Gérald Niel Co-authored-by: Olivier Humbert --- wiki/fr/fr-Running-a-Server.md | 67 ++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 wiki/fr/fr-Running-a-Server.md diff --git a/wiki/fr/fr-Running-a-Server.md b/wiki/fr/fr-Running-a-Server.md new file mode 100644 index 000000000..140e625c7 --- /dev/null +++ b/wiki/fr/fr-Running-a-Server.md @@ -0,0 +1,67 @@ +--- +layout: wiki +title: "Administration d'un serveur" +lang: "fr" +permalink: "/wiki/Running-a-Server" +--- + +# Administration d'un serveur + +## Ai-je besoin de mon propre serveur pour utiliser Jamulus ? + +NON. +{: .doubletextsize .red } + + +Il suffit juste de choisir le serveur de quelqu'un d'autre dans votre liste et d'y aller. + +**Vous ne voulez pas être dérangé par des inconnus ?** Une fois que vous et vos amis êtes connectés à un serveur public, appuyez sur les boutons « solo » des musiciens avec lesquels chacun de vous veut jouer. Chacun de ceux que vous ne mettez pas en solo, verra une icône « muet » sur votre canal. Et vous ne les entendrez pas. + +## Ça semble trop facile. + +Si vous voulez vraiment administrer votre propre serveur, il est **très important** que vous lisiez et compreniez quel type de serveur vous voulez faire fonctionner : + +
+ En savoir plus sur les types de serveurs +
+ +… puis, revenez ici. + +### Vitesse et latence + +**_La capacité du serveur lui-même (et du réseau sur lequel il se trouve) n'est PAS le principal facteur déterminant de la qualité d'une session Jamulus !_** + +Beaucoup de gens attribuent au serveur des problèmes qui sont en fait des problèmes avec le _client_. Cela dépend beaucoup du [matériel](Hardware-Setup) des clients, des réseaux sur lesquels _ils_ se trouvent, et de leur respect de la [règle numéro un](Getting-Started#vous-avez-des-problèmes--vous-narrivez-pas-à-être-en-rythme-). Il n'y a donc aucune garantie que vous obtiendrez une latence plus faible ou de meilleures performances globales en ayant votre propre serveur. + +Si vous prévoyez de jouer régulièrement avec les mêmes personnes, **il vous est fortement conseillé** de vous assurer d'abord que chaque membre du groupe est configuré pour utiliser Jamulus correctement. Pour ce faire, trouvez un serveur public avec un temps de ping raisonnable pour chacun d'entre vous (20ms ou moins peut-être), connectez-vous tous à ce serveur et essayez de résoudre les problèmes individuels (en vérifiant qu'ils peuvent [suivre la règle numéro un](etting-Started#vous-avez-des-problèmes--vous-narrivez-pas-à-être-en-rythme-) en particulier). Utilisez la technique solo ci-dessus pour éviter d'être interrompu si nécessaire. + +Une fois les problèmes avec les musiciens résolus de cette manière, vous pouvez alors envisager d'héberger votre propre serveur soit chez vous, soit sur un hôte dans le « Cloud » comme Amazon, ce qui pourrait entraîner une meilleure latence qu'un serveur fonctionnant à domicile. Par exemple, [voir ce guide](https://www.facebook.com/notes/jamulus-online-musicianssingers-jamming/howto-idiots-guide-to-installing-jamulus-server-on-amazon-aws-lightsail-ubuntu-i/507719749802976/) (en anglais) d'utilisation de AWS Lightsail par l'utilisateur de Jamulus [Simon Tomlinson](https://www.facebook.com/simon.james.tomlinson?eid=ARBQoY3KcZAtS3pGdLJuqvQTeRSOo4gHdQZT7nNzOt1oPMGgZ4_3GERe-rOyH5PxsSHVYYXjWwcqd71a) (_Facebook_). + +### Bande passante - en avez-vous suffisamment ? + +Un bœuf typique peut compter 4 personnes, pour lesquelles il faut 200Kbps x 4 = 800Kbs (0,8Mbps) en débit montant et descendant. Donc, si vous avez une connexion haut débit de 10Mbits descendant et de 1Mbits montant, **vous risquez de commencer à manquer de bande passante si un cinquième joueur vous rejoint**, surtout si d'autres musiciens choisissent des paramètres qui augmentent leur utilisation. Vous devriez peut-être [vérifier que vous avez un débit suffisant](https://fast.com) pour cela. [En savoir plus sur l'utilisation de la bande passante](Network-Requirements) selon différents paramètres de qualité. + +### En général + +- Envisagez d'utiliser un hébergeur dans le nuage pour obtenir de meilleurs temps de réponse si vous avez des problèmes + +- Tout serveur devrait avoir au minimum une fréquence de processeur d'1,6 GHz et 1 Go de RAM + +- Administrer un serveur pourrait nécessiter que vous ajustiez tout pare-feu fonctionnant sur ou en dehors de votre machine ou de l'hôte dans le nuage. + +- Administrer un **serveur privé à domicile** (mais pas un serveur public) nécessitera que vous [redirigiez un port](Running-a-Private-Server) sur votre routeur. + +- Jamulus ne prend pas actuellement en charge IPv6 + +## Tout va bien ? Alors, c'est parti ! +
+ Pour les utilisateurs Windows ou macOS + Pour les utilisateurs Linux + Raspberry Pi +
+ +Les administrateurs de serveur pourraient également être intéressés par le téléchargement de [cet ensemble d'outils utiles](https://github.com/corrados/jamulus/tree/master/tools) depuis le dépôt Jamulus (cloner le dépôt Git avec la commande `git submodule update --init`). + +## Vous avez des problèmes ? Des difficultés ? + +Voir la [FAQ sur le dépannage des serveurs](Server-Troubleshooting). From 96a06a636404486eba267435a3945820ef766097 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Wed, 16 Dec 2020 11:19:25 +0100 Subject: [PATCH 085/280] [gen] Add community section (#101) * First blog beta * non working blog pagination * small fix * Revert "small fix" This reverts commit d527efcb680becf7ddae19fccfda0e9937669e29. * Add example blog * clarify github * Fix heading * Add structured data * add structured data * First try GH comment api * Revert "First try GH comment api" This reverts commit 0ad04d8f38db4980534706ae0e811bba60285295. * Remove blog posts * Add dates * add authors * Add more pages * add pagination to bottom of posts * Fix issues and add example draft * Rename blog to knowledge base * Remove german translation since it's not wanted * Add discussion url * move some files * Update 2020-03-28-Example-Setup-Hardware.md * Remove SW Synth to re-add it * Add Software Synth by @niebert * Update 2020-12-10-Software-Synth.md * First review * Second review * Remove install script to re add it via pr * Minor improvements * Use @trebmuh changes * Beautify * Added pictures * Update 2020-10-19-Software-Synth.md * Update 2020-10-19-Software-Synth.md * Fixed screenshot * rename blog folder to kb * Update 2020-09-20-Linux-Install-Script.md * smaller bugfixes * Dirty fix for nav kb * small changes * Add review changes Co-authored-by: Olivier Humbert Co-authored-by: ignotus --- Gemfile | 1 + Gemfile.lock | 3 + _config.yml | 29 ++++ _data/en/authors.yml | 10 ++ _data/en/general.yml | 15 +- _data/en/navigation.yml | 3 + _drafts/Jamulus-With-Zoom.md | 14 ++ _includes/general/nav.html | 6 +- _includes/headtags.html | 1 + _layouts/kblist.html | 76 +++++++++ _layouts/mainhomepage.html | 1 - _layouts/post.html | 104 +++++++++++++ _layouts/wiki.html | 1 - _posts/2020-03-28-Example-Setup-Hardware.md | 36 +++++ _posts/2020-03-28-Server-Rpi.md | 56 +++++++ _posts/2020-09-20-Linux-Install-Script.md | 144 ++++++++++++++++++ _posts/2020-10-19-Software-Synth.md | 77 ++++++++++ .../2020-11-24-Multiple-Audio-Interfaces.md | 55 +++++++ assets/css/fw.css | 29 +++- assets/css/kb.css | 27 ++++ assets/css/wiki.css | 4 - kb/index.md | 8 + 22 files changed, 683 insertions(+), 17 deletions(-) create mode 100644 _data/en/authors.yml create mode 100644 _drafts/Jamulus-With-Zoom.md create mode 100644 _layouts/kblist.html create mode 100644 _layouts/post.html create mode 100644 _posts/2020-03-28-Example-Setup-Hardware.md create mode 100644 _posts/2020-03-28-Server-Rpi.md create mode 100644 _posts/2020-09-20-Linux-Install-Script.md create mode 100644 _posts/2020-10-19-Software-Synth.md create mode 100644 _posts/2020-11-24-Multiple-Audio-Interfaces.md create mode 100644 assets/css/kb.css create mode 100644 kb/index.md diff --git a/Gemfile b/Gemfile index e8207c05e..5e3848c73 100644 --- a/Gemfile +++ b/Gemfile @@ -9,4 +9,5 @@ group :jekyll_plugins do gem "jekyll-polyglot" end gem "jekyll-minifier" +gem "jekyll-paginate-v2" # gem "rails" diff --git a/Gemfile.lock b/Gemfile.lock index 7e39ae7e4..93caa7852 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -38,6 +38,8 @@ GEM jekyll (>= 3.5) json-minify (~> 0.0.3) uglifier (~> 4.1) + jekyll-paginate-v2 (3.0.0) + jekyll (>= 3.0, < 5.0) jekyll-polyglot (1.3.3) jekyll (>= 3.0) jekyll-sass-converter (2.1.0) @@ -79,6 +81,7 @@ PLATFORMS DEPENDENCIES jekyll jekyll-minifier + jekyll-paginate-v2 jekyll-polyglot BUNDLED WITH diff --git a/_config.yml b/_config.yml index 9eed52d94..95662eba3 100644 --- a/_config.yml +++ b/_config.yml @@ -1,4 +1,5 @@ plugins: + - jekyll-paginate-v2 - jekyll-polyglot - jekyll-minifier languages: ["en", "es", "de", "it", "fr"] @@ -7,6 +8,7 @@ exclude_from_localization: ["assets", "images", "css", "README.md", "manifest. parallel_localization: true a_rootpage: "https://jamulus.io" githubrepoeditbase: "https://github.com/jamulussoftware/jamulussoftware.github.io/edit/changes" +kbnewpage: 'https://github.com/jamulussoftware/jamuluswebsite/new/changes/_posts/?value=---%0Alayout%3A%20post%0Atitle%3A%20%22Your%20Title%22%0Alang%3A%20%22en%22%0Aauthor%3A%20%22YourName%22%0Aheading%3A%20%22Heading%22%0A---%0AName%20This%20File%20and%20edit%20the%20parameters%20above%21&message=New%20post' exclude: ["README.md", "Gemfile.lock", "Gemfile", "CONTRIBUTING.md"] jekyll-minifier: remove_intertag_spaces: true @@ -14,3 +16,30 @@ jekyll-minifier: remove_multi_spaces: true compress_json: true exclude: "sitemap.xml" +excerpt_separator: +permalink: /kb/:categories/:year/:month/:day/:title:output_ext +pagination: + enabled: true + # Set to 'true' to enable pagination debugging. This can be enabled in the site config or only for individual pagination pages + debug: false + # The default document collection to paginate if nothing is specified ('posts' is default) + collection: 'posts' + # How many objects per paginated page, used to be `paginate` (default: 0, means all) + per_page: 4 + # The permalink structure for the paginated pages (this can be any level deep) + permalink: '/:num/index.html' + + title: ':title / :num' + # Limit how many pagenated pages to create (default: 0, means all) + limit: 0 + + # Optional, defines the field that the posts should be sorted on (omit to default to 'date') + sort_field: 'date' + + # Optional, sorts the posts in reverse order (omit to default decending or sort_reverse: true) + sort_reverse: true + # Optional,omit or set both before and after to zero to disable. + # Controls how the pagination trail for the paginated pages look like. + trail: + before: 2 + after: 3 diff --git a/_data/en/authors.yml b/_data/en/authors.yml new file mode 100644 index 000000000..19da538f0 --- /dev/null +++ b/_data/en/authors.yml @@ -0,0 +1,10 @@ +corrados: + name: Volker Fischer + url: https://github.com/corrados +niebert: + name: Engelbert Niehaus + url: https://github.com/niebert +ann0see: + url: https://github.com/ann0see +gilgongo: + url: https://github.com/gilgongo diff --git a/_data/en/general.yml b/_data/en/general.yml index 2f96a3de5..c53fba624 100644 --- a/_data/en/general.yml +++ b/_data/en/general.yml @@ -1,5 +1,5 @@ footer: - copyright: Software by Volker Fischer and contributors + copyright: Software by Volker Fischer and contributors alt: github: "Jamulus GitHub Repo" facebook: "Jamulus Facebook Group" @@ -10,4 +10,15 @@ nav: btnOpenNavigation: "Open navigation" altJamulusIcon: "Jamulus Icon. Links to Wiki homepage" wiki: - titleAdd: "– Jamulus Wiki" + titleAdd: "– Jamulus Wiki" +kb: + titleAdd: "– Jamulus Knowledge Base" + by: "by" + kbintro: "Community knowledge base
Feel free to add your own article!" + mainpage: "KB overview" + newpage: "Add a new page via GitHub" + readmore: "Read more..." + navpages: "More pages" + discuss: + title: "Comments" + linktitle: "Discuss this content" diff --git a/_data/en/navigation.yml b/_data/en/navigation.yml index d3d25885c..8c875d423 100644 --- a/_data/en/navigation.yml +++ b/_data/en/navigation.yml @@ -24,6 +24,9 @@ nav: url: /wiki/Command-Line-Options - page: Tips & Tricks url: /wiki/Tips-Tricks-More + - page: Community Knowledge Base + url: /kb/index.html + selectOnLayout: "post" - page: Demos url: /wiki/Demos - page: Privacy Statement diff --git a/_drafts/Jamulus-With-Zoom.md b/_drafts/Jamulus-With-Zoom.md new file mode 100644 index 000000000..6da840cb6 --- /dev/null +++ b/_drafts/Jamulus-With-Zoom.md @@ -0,0 +1,14 @@ +--- +layout: post +title: "Jamulus with Zoom" +heading: "Using Jamulus with Zoom" +lang: "en" +--- + +Jamulus doesn't support video streaming yet. This guide will show you how to get video using a video conferencing tool like Zoom. + +Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. + +Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. + +Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. diff --git a/_includes/general/nav.html b/_includes/general/nav.html index 199d87524..34119f252 100644 --- a/_includes/general/nav.html +++ b/_includes/general/nav.html @@ -6,7 +6,7 @@ {% for item in site.data.navigation.nav %} {% if item.url %}
  • -

    {{ item.title }}

    +

    {{ item.title }}

    {% else %}

  • {{ item.title }}

    @@ -14,11 +14,11 @@

    {{ item.title }}

    {% if item.subfolderitems[0] %}
      {% for entry in item.subfolderitems %} -
    • {{ entry.page }} +
    • {{ entry.page }} {% if entry.subsubfolderitems[0] %} {% endif %} diff --git a/_includes/headtags.html b/_includes/headtags.html index b346045eb..f5ec205ba 100644 --- a/_includes/headtags.html +++ b/_includes/headtags.html @@ -13,6 +13,7 @@ + diff --git a/_layouts/kblist.html b/_layouts/kblist.html new file mode 100644 index 000000000..fda2b4a5e --- /dev/null +++ b/_layouts/kblist.html @@ -0,0 +1,76 @@ +--- +pagination: + enabled: true +--- + + + + + + {{ page.title }} {{ site.data.general.kb.titleAdd }} + {% include headtags.html %} + + + + +
      +
      + {{ site.data.general.nav.altJamulusIcon }} +
      +
      + {% include general/navbtn.html %} +
      +
      +

      {{ page.title }}

      +
      +
      +
      + {% include general/nav.html %} +
      + +
      + {{ content }} + {% for post in paginator.posts %} + +
      + {% endfor %} + {% if paginator.page_trail %} +
        + {% for trail in paginator.page_trail %} +
      • + {{ trail.num }} +
        • + {% endfor %} +
      + {% endif %} +
      +
      + +
      + {% include footer.html %} + + + diff --git a/_layouts/mainhomepage.html b/_layouts/mainhomepage.html index a2e09b776..6ff053dc0 100644 --- a/_layouts/mainhomepage.html +++ b/_layouts/mainhomepage.html @@ -30,7 +30,6 @@ } } - diff --git a/_layouts/post.html b/_layouts/post.html new file mode 100644 index 000000000..316b75fa3 --- /dev/null +++ b/_layouts/post.html @@ -0,0 +1,104 @@ +--- +pagination: + enabled: true +--- + + + + + + {{ page.title }} {{ site.data.general.kb.titleAdd }} + {% include headtags.html %} + + + + + +
      +
      + {{ site.data.general.nav.altJamulusIcon }} +
      +
      + {% include general/navbtn.html %} +
      +
      +

      {{ page.heading }}

      + {% if page.author %} + {{ site.data.general.kb.by }} + {% if site.data.authors[page.author].url %}{% endif %} + {% if site.data.authors[page.author].name %} + {{ site.data.authors[page.author].name }} + {% else %} + {{ page.author }} + {% endif %} + {% if site.data.authors[page.author].url %}{% endif %} + {% endif %} + {% if page.date %} + () + {% endif %} +
      +
      +
      + {% include general/nav.html %} +
      + +
      + {{ content }} +
      +
      + {% if page.discussionurl %} +

      {{ site.data.general.kb.discuss.title }}

      + {{ site.data.general.kb.discuss.linktitle }} + {% endif %} +

      {{ site.data.general.kb.navpages }}

      +
      +
      +
      + {% if page.previous.url %} + « {{ page.previous.title }} + {% endif %} +
      +
      + {% if page.next.url %} + {{ page.next.title }} » + {% endif %} +
      +
      +
      + +
      + {% include footer.html %} + + + diff --git a/_layouts/wiki.html b/_layouts/wiki.html index 942d5575d..58f06187c 100644 --- a/_layouts/wiki.html +++ b/_layouts/wiki.html @@ -6,7 +6,6 @@ {{ page.title }} {{ site.data.general.wiki.titleAdd }} {% include headtags.html %} - diff --git a/_posts/2020-03-28-Example-Setup-Hardware.md b/_posts/2020-03-28-Example-Setup-Hardware.md new file mode 100644 index 000000000..0b9a7f493 --- /dev/null +++ b/_posts/2020-03-28-Example-Setup-Hardware.md @@ -0,0 +1,36 @@ +--- +layout: post +title: "Example setup audio hardware" +heading: "Example setup UCA202 Windows" +author: "corrados" +lang: "en" +--- + +This is an example Windows client installation with a [Behringer U-CONTROL UCA202](https://www.amazon.com/Behringer-U-Phono-UFO202-Audiophile-Interface/dp/B002GHBYZ0){: target="_blank" rel="noopener noreferrer"} 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.**_ + +## Windows: Audio interface connection - ASIO4All + +### 1. Plug the interface into a USB port on your computer + +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)](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. + + +### 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). + +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 + +Connect your instrument to the input plugs of the Behringer U-CONTROL UCA202. Plug in your headphones into the Behringer U-CONTROL UCA202. + +### 4. Connect to a Jamulus server. + +You're done! Have fun! diff --git a/_posts/2020-03-28-Server-Rpi.md b/_posts/2020-03-28-Server-Rpi.md new file mode 100644 index 000000000..9d7523d4a --- /dev/null +++ b/_posts/2020-03-28-Server-Rpi.md @@ -0,0 +1,56 @@ +--- +layout: post +title: "Server Installation – Raspberry Pi" +heading: "Install Jamulus Server on a Raspberry Pi" +author: "fredsiva" +lang: "en" +--- + +This guide shows you how to install Jamulus on a Raspberry Pi. + + +## Server Installation - Raspberry Pi + +**_Please ensure you have read the [server overview](/wiki/Running-a-Server)_** + +_Jamulus has been tested on a Raspberry Pi 4 2Gb by Jamulus user [SIVA Frédéric](https://sourceforge.net/u/fredsiva/profile/)_ + +1. Install Raspbian Buster (allow [VNC](https://www.raspberrypi.org/documentation/remote-access/vnc/) and [SSH](https://www.raspberrypi.org/documentation/remote-access/ssh/README.md) for comfort, but will ultimately run without VNC for higher speed) + +1. Edit [config.txt](https://www.raspberrypi.org/documentation/configuration/config-txt/) to enable boot without HDMI by adding `hdmi_force_hotplug=0` + +1. [Get the sources](/wiki/Installation-for-Linux#get-jamulus-sources), install the [dependent packages](/wiki/Installation-for-Linux#install-dependencies) according to the Linux client install guide **but do NOT install JACK package(s)** - you don't need them on a [headless server](/wiki/Server-Linux#running-a-headless-server). To run a client, install all listed dependencies. + +1. Compile the source code for a server as per [these instructions](/wiki/Server-Linux#compile-sources-create-a-user). Compile a client using the [default instructions](/wiki/Installation-for-Linux#compile-this-bad-boy). + +This will build Jamulus and put it in `/usr/local/bin/Jamulus` + +Connect Raspberry Pi with Ethernet cable to your router. + +If you are running a server, test by starting with the `--server` option, and watch GUI on VNC (or HDMI). When running as a client, you should see the GUI start. + +`Jamulus -s` + +If all is well, run in your chosen [server mode](Choosing-a-Server-Type) as follows (or use systemd unit script provided in the [Linux guide](Server-Linux#create-a-start-script)), for example a public server: + +`sudo chrt 99 ionice -c1 nice -n -20 Jamulus -s -n -e [yourCentralServer] -o "yourServerName;yourCity;[country ID]"&` + +**Please also see this [important note on Central Servers](/wiki/Central-Servers).** + +See also [Command Line Options](/wiki/Command-Line-Options) for other parameters you can set. +*** + +### To upgrade Jamulus + +Stop the server and simply repeat step 3 for obtaining the sources and installing above. + +If you want to install a specific release, you can do the following using git (where `[RELEASE]` is a release ID such as r3_5_8). See the [official tagged releases](https://github.com/corrados/jamulus/releases). + +First, `cd` inside the directory in which the Jamulus sources were unpacked/downloaded, then use the following commands: + +~~~ +git pull +git checkout [RELEASE] +~~~ + +Then compile the sources as per a new install. Start Jamulus back up. diff --git a/_posts/2020-09-20-Linux-Install-Script.md b/_posts/2020-09-20-Linux-Install-Script.md new file mode 100644 index 000000000..b50278962 --- /dev/null +++ b/_posts/2020-09-20-Linux-Install-Script.md @@ -0,0 +1,144 @@ +--- +layout: post +title: "Linux Bash Installation Script" +heading: "Bash Installation Script" +author: "niebert" +lang: "en" +--- + +Thanks to [niebert](https://github.com/niebert), if you plan to install Jamulus on many Linux machines, you can try this script. + + +The following example was tested on Linux Mint and combines all the commands to install Jamulus on Linux into one script (currently for Ubuntu/Linux Mint). + +## How it works + +To incorporate the different commands for different Linux distributions, variables define the distribution and the release for which the installation script should be performed. The following focuses on Ubuntu with release 18.04 as example. So the suggested script name for the release is e.g. `install4ubuntu18_4.sh`. The script commands are generic so that the installation could also be modified so that they work on other Linux distributions. + +### Installation dependent on Linux Distribution +The following script calls different installation commands depending on the Linux distribution. +The variable `DISTRO` defines which commands are executed. Set the variable depending on the Linux distribution you are using. +* `DISTRO="Ubuntu"` for a Ubuntu or Linux Mint +* `DISTRO="Debian"` for a Debian or Raspbian Linux +* `DISTRO="Fedora"` for a Fedora Linux +Furthermore if the installation is dependent of the release the variable `LINVERSION` is introduced but is currently not used. In the Ubuntu `if` statement there is an example how version depending installation calls can be performed. +```bash +if [ "$LINVERSION" = "18.4" ] +then + echo "Perform Installation Specifics for $DISTRO Version $DISTRO" +fi +``` +The variable `LINVERSION` is currently not used in the following script but it is just a demo how to use the version specific installation commands. + +### Adaptation of the Installation Script +If you want to create an installation script for Debian just copy the script `install4ubuntu18_4.sh` to `install4debian10_6.sh` and modify the distro variables to +```bash +#!/bin/sh +# set DISTRO either to "Ubuntu", "Debian" or "Fedora" +DISTRO="Debian" +LINVERSION="10.6" +``` +After that, test the installation on Debian and modify the commands so that the installation script works on Debian. You can share working scripts, if you like. **Edit by Jamulus-Website maintainers:** You should contact [niebert](https://github.com/niebert) if you want to share scripts. + +### The Installation Script +Copy the following installation script into a file and save it to the filename `install4ubuntu18_4.sh`. After saving the file e.g. in your `Download` directory change to the directory and call the following script with `sh install4ubuntu18_4.sh`. +```bash +#!/bin/sh +# set DISTRO either to "Ubuntu", "Debian" or "Fedora" +DISTRO="Ubuntu" +LINVERSION="18.04" + +# Get Jamulus Release Name with "curl" and "grep" +R=`curl -s https://api.github.com/repos/corrados/jamulus/releases/latest | grep -oP '"tag_name": "\K(.*)(?=")'` +echo "Jamulus Installation Script for $DISTRO $LINVERSION" +echo "Release: $R" +INSTALLJAMULUS="no" +while true; do + read -p "Do you wish to install Jamulus on $DISTRO $LINVERSION? (y/n) " yn + case $yn in + [Yy]* ) + echo "Start Installation $DISTRO $LINVERSION" + echo "(1) Fetch Release $R from GitHub" + wget https://github.com/corrados/jamulus/archive/$R.tar.gz + echo "(2) Extract Source Code for Jamulus Release $R from GitHub" + tar -xvf $R.tar.gz + echo "(3) Delete ${R}.tar.gz from GitHub" + rm $R.tar.gz + echo "(4) Update Repository" + sudo apt-get update + INSTALLJAMULUS="yes" + break;; + [Nn]* ) + echo "Cancelled Jamulus Installation on $DISTRO $LINVERSION" + exit;; + * ) echo "Please answer yes or no.";; + esac +done + +# echo "Check Variable: $INSTALLJAMULUS" + +if [ "$INSTALLJAMULUS" = "yes" ]; then + echo "(5) Install Build Essentials for $DISTRO" + + if [ "$DISTRO" = "Ubuntu" ] + then + echo "Installation for $DISTRO" + sudo apt-get install cmake qmake gcc g++ + sudo apt-get install build-essential qt5-qmake qtdeclarative5-dev qt5-default qttools5-dev-tools libjack-jackd2-dev + sudo apt-get install qjackctl + if [ "$LINVERSION" = "18.4" ] + then + echo "Perform Installation Specifics for $DISTRO Version $DISTRO" + fi + + elif [ "$DISTRO" = "Debian" ] + then + sudo apt-get install build-essential qtdeclarative5-dev qt5-default qttools5-dev-tools libjack-jackd2-dev + sudo apt-get install qjackctl + elif [ "$DISTRO" = "Fedora" ] + then + sudo dnf install qt5-qtdeclarative-devel jack-audio-connection-kit-dbus jack-audio-connection-kit-devel + sudo dnf install qjackctl + fi + + echo "(6) Compile Jamulus $R" + echo "Change to Directory jamulus-$R" + cd "jamulus-$R" + # ls + qmake Jamulus.pro + make clean + make + sudo make install + echo "Compilation DONE" + cd .. + echo "(6) Delete the Source Files after Installation" + rm -R "jamulus-$R" + +else + + echo "Installation cancelled" + +fi + +``` + + +## Possible Improvements of the Installation Script for Jamulus +The script can ask in the very beginning for which Linux distribution the installation script should be called. +This can be tested with the command `lsb_release` + +The `lsb_release` command returns the distribution specific information about a Linux distro. +With a `grep` command with regular expression the variable `DISTRO` and `LINVERSION`. +E.g. the Ubuntu based systems return with the command the following information. +```bash +$ lsb_release -a +No LSB modules are available. +Distributor ID: Ubuntu +Description: Ubuntu 11.04 +Release: 11.04 +Codename: natty +``` + +The challenge is, that `lsb_release` command must be available on Linux system. On CentOS/Fedora based systems `lsb_release` command is only available, if the `lsb` core packages are installed. So the automated Linux version detected might no work. + +So reading the `DISTRO` and `LINVERION` with the `read` command might be the better distribution dependent improvement than an automated setting with `lsb_release`. diff --git a/_posts/2020-10-19-Software-Synth.md b/_posts/2020-10-19-Software-Synth.md new file mode 100644 index 000000000..21dab87fb --- /dev/null +++ b/_posts/2020-10-19-Software-Synth.md @@ -0,0 +1,77 @@ +--- +layout: post +title: "Software Synth in Jamulus" +lang: "en" +author: "niebert" +heading: "Software Synth in Jamulus" +--- + +This article will show you how to use a software synth with Jamulus. + + + +## Linux + +We will look at the concept of playing a software synth on Linux but other operating systems should work similarly. +Let's have a look at what we need: +1. A software synth like [setBfree](https://github.com/pantherb/setBfree) **(Hammond Organ Synth)** which we'll use in this example. It emulates an organ and outputs its audio to JACK on Linux. +2. A **MIDI Keyboard**. The MIDI keyboard is used to generate the key pressed events, which are transmitted through a USB-MIDI interface to your operating system. After that the synthesizer [setBfree](https://github.com/pantherb/setBfree) generates the corresponding sound for the pressed key. The MIDI keyboard could also be replaced by a digital wind midi controller, which does the same (although the tone is dependent on how the musician blows air into the digital wind controller). +3. A **connector to Jamulus**. You may hear the audio output of the synth on your speakers but the audio output may not be used as input for Jamulus. That's why we need to connect the audio output of the synth to Jamulus (this can be done with QjackCtl on Linux). + +### General Information about ALSA, JACK and MIDI + +This part is specific to Linux. Let's have a look at a few concepts how Linux handles Audio and MIDI before actually looking at how to connect the synth. + +- **ALSA** This is the basic layer which connects to the hardware, i.e. the sound card and the midi controller for the keyboard. +- **JACK** is built on top of ALSA and uses ALSA for the audio output. It provides an easy-to-use environment for music production on Linux. +- The **synthesizer** like the [Hammond Organ emulator setBfree](https://github.com/pantherb/setBfree) connects to JACK and sends its audio there. +- **Jamulus** connects to JACK too and can therefore receive and send audio to every application connected to JACK (including our synthesizer). + +### Requirements for using Software Synths in Jamulus on Linux + +If you use your MIDI keyboard, you might need ALSA2JACK MIDI (`a2jmidid`) from the `a2j` package to be able to connect it to JACK. We use the synth `setBfree` in this example, so I also need this software synth (of course, you can replace this by your favourite Linux synthesizer). Both packages `a2jmidid` and `setbfree` can be installed with your package manager e.g. on Debian/Ubuntu by using the `apt-get` commands: + +```shell +sudo apt-get install a2jmidid +sudo apt-get install setbfree +``` + +### Connecting ALSA, JACK and MIDI for a Synth for Jamulus + +Let's have a look at the workflow. + +1. Install Jamulus (you've probably already done that. If not, please have a look at the [installation page in the documentation](/wiki/Getting-Started)). If you followed those instructions, JACK and QjackCtl were already installed. +2. **ALSA to JACK - MIDI** Next, we must create a connection from ALSA to JACK to route the MIDI input from the keyboard to setBfree. Let's have a look at how to do that: + - Open QjackCtl e.g. from the command line by typing `qjackctl` and start JACK by clicking on the play button + - Launch the ALSA2JACK MIDI connector with `a2jmidid -e`. While this connector runs, the `a2j` connection interface should be visible in `QjackCtl` in the JACK-MIDI tab. + + ![QJackctl JACK-MIDI a2j](https://user-images.githubusercontent.com/20726856/101836060-ff2abe80-3b3c-11eb-8109-347fab4f03a6.png) + + - Now connect your USB MIDI device as an input to `MIDI through` in the ALSA-MIDI tab of QjackCtl. MIDI events from your keyboard will now reach JACK. + + ![QJackctl ALSA-MIDI MIDI through](https://user-images.githubusercontent.com/20726856/101836057-fe922800-3b3c-11eb-8ee2-60cc591cf908.png) + + - Start your synth e.g. from the command line with (in my case) `setBfree`. You will now see the `setBfree` graphical user interface. It should look like this: + + ![setBfree synth](https://user-images.githubusercontent.com/20726856/101836062-ffc35500-3b3c-11eb-80d3-ebcfadac4942.png) + + You can now check if the synth generates sound by clicking on the displayed organ keyboard and listening for sound through your speakers. + - In QjackCtl we can now connect `a2j` in JACK-MIDI as an input to the synth, which generates sound for each key pressed on the keyboard. Keep in mind that you can connect synths if they are started and visible to QjackCtl. So you can connect after starting the [Hammond Emulator setBfree](https://github.com/pantherb/setBfree), i.e. connect `a2j` to `setbfree` if you also see the Hammond Synth setBFree in QjackCtl. + + ![JACK-MIDI connect synth MIDI](https://user-images.githubusercontent.com/20726856/101932865-b4ac4f00-3bdb-11eb-8834-6f392402a8b6.png) + + - Let's test the software synth with our MIDI Keyboard! If you have speakers attached to your device you should hear the emulated Hammond sound for all the keys you press on your MIDI keyboard. If you just want to play the software synth with your keyboard, you're finished here. But if you want to connect the sound of the synth to Jamulus, the only remaining step is to connect the synths' audio to Jamulus. + +**Synth to Jamulus - Audio**: In the previous step we ensured that the MIDI signals from your keyboard got sent to to the MIDI input of JACK. Now we need to create an audio connection from JACK (i.e. the generated Hammond sound of the synth) to Jamulus. To do so, we connect the [Hammond Emulator setBfree](https://github.com/pantherb/setBfree) output to Jamulus. Therefore, start Jamulus so that you can see Jamulus in QjackCtl. Now connect the audio output of the [Hammond Emulator setBfree](https://github.com/pantherb/setBfree) to the audio input of Jamulus in JACK. + +![QJackctl connect synth to Jamulus](https://user-images.githubusercontent.com/20726856/101958961-ad4d6b80-3c04-11eb-86cd-24e7efa6fe00.png)) + +There is one last step. In your local connection setup, you might see that the setBfree synth output (left) is not only connected to the Jamulus input (right), but also to `system`. `System` would be your speakers or headphones, but what you want to listen to is just the output from Jamulus, not the direct sound from setBfree also at the same time (not exactly - they'd be separated by a small time lag). So now you must disconnect setBfree from "system". That way you will hear the audio coming from the Jamulus server (yours and that of whoever you are playing with) and will avoid an echo or flanger effect. + +Now you're done. + +`QjackCtl` can also be used for operations like plugging in instruments in mixer and the mixer into an amplifier and the amplifier again to the speakers. + +There are also other Open Source synths like QSynth or [ZynAddSubFX](https://sourceforge.net/projects/zynaddsubfx/) which can be installed on your Linux system. + +Have fun playing your synth within Jamulus! diff --git a/_posts/2020-11-24-Multiple-Audio-Interfaces.md b/_posts/2020-11-24-Multiple-Audio-Interfaces.md new file mode 100644 index 000000000..c5a972909 --- /dev/null +++ b/_posts/2020-11-24-Multiple-Audio-Interfaces.md @@ -0,0 +1,55 @@ +--- +layout: post +title: "Using Multiple Audio Interfaces" +heading: "Using multiple Audio interfaces" +lang: "en" +--- + +It is possible to run Jamulus with multiple Audio Interfaces on all three operating systems. Useful when we need to output an instrument through external audio card for minimal latency and computer microphone for communication. Other use cases may apply. + + +### Windows + +Under Windows, the best option to run multiple interfaces through Jamulus at the same time is by using a combination of JACK Audio Connection Kit with VoiceMeeter. It can be accomplished with just VoiceMeeter, but I've found that it introduces some undesirable latency and it wasn't supporting 64 frame buffer size correctly as it was producing some noises through my headphones. + +**Requirements:** +* [JACK for Windows](https://jackaudio.org/downloads/); +* [Voicemeeter](https://www.vb-audio.com/Voicemeeter/banana.htm) (any version will do). + +**Steps:** +1. [Install and configure JACK on Windows](https://jackaudio.org/faq/jack_on_windows.html) - Make sure you select your best audio interface in the configuration steps, also add `-r 48000 -p ` to ensure JACK is outputting audio in the required sample rate for Jamulus (48.000Hz). If your frame buffer size is too low for your hardware, you'll need to change it to a higher value; +2. Install and open Voicemeeter; +3. Open configured Jack PortAudio shortcut, Jack Control and Jamulus software; +4. On Voicemeeter, go to HARDWARE OUT and on A1 dropdown list, select JackRouter. On Hardware Input 1 select your computer microphone. You can make your computer microphone have the lowest latency possible by going into _Menu > System Settings/Options..._ and enabling _WDM Input Exclusive Mode_ (if you experience crackling noises while speaking, disable this) and changing the _Engine Mode_ to _Swift_; +5. Make sure the Hardware Input where you selected your microphone is sending sound through A1 by enabling the corresponding button next to the fader; +6. On Jamulus, under Settings, select JackRouter as your Soundcard Device; +7. On Jack Control, if you click the _Connect_ button, you should now see three devices: portaudio (your external audio interface), voicemeeter and jamulus. If Jamulus doesn't appear, try connecting and disconnecting from any server to enable it; +8. To test things out, on Jack Control, connect portaudio and voicemeeter output ports to jamulus input ports, then connect jamulus output ports to portaudio input ports (assuming you'll be using your external audio interface to listen, otherwise you can use voicemeeter to redirect the sound to another device, which I will not cover on this guide). Connect to a server on Jamulus and test it out by speaking into the microphone and playing your instrument. If everything went well you should hear yourself; +9. To make JACK connections permanent, on Jack Control, open the _Patchbay_, add all inputs and outputs available (Add... > Select each Client > Click Add Plug until there's none left) and make the connections you wish to make permanent. This usually goes like connecting both _system_ and _voicemeeter_ outputs into _jamulus_ input, and _jamulus_ output into _system_ input. Once done, save the Patchbay definition and _Activate_ it. Now every time you start jamulus and connect to a server, the connections on JACK should automatically be done. + +**Bonus:** + +* The Microphone can be muted and it's volume adjusted on VoiceMeeter. Be sure to play with the _VOICE_ graph too (equalization), I find that my voice sounds better if I move it halfway into _Lo_; +* If you're using VoiceMeeter Banana or Potato, you can apply Gate to your microphone (useful to cut undesirable noises when you're not speaking); +* If you set your default playback device under Windows to one of VoiceMeeter's virtual inputs, you can route audio from your computer into JackRouter (and consequently, into Jamulus) by enabling the _A1_ button on the relevant input under _Virtual Inputs_. This is useful if you wish to play some audio through Jamulus (backing tracks, youtube, recordings, etc...) + + +### MacOS X + +[Aggregate devices](https://support.apple.com/en-us/HT202000) lets you do this. Just make sure your Jamulus version is 3.5.3 or higher. + + +### Linux + +On Linux, it is possible to route additional devices to Jack by using alsa_in. + +**Requirements:** + +* QJackCtl +* alsa + +**Steps:** +1. Follow [this tutorial](https://www.penguinproducer.com/Blog/2011/11/using-multiple-devices-with-jack/) to route the desired interface into Jack by using alsa_in. +2. Jamulus should automatically route the JACK configured interface, adjustments can be made through the _Connect_ button. +3. Connect the device configured on step 1 into jamulus input. +4. Use Patchbay as described on Windows section to make connections permanent. diff --git a/assets/css/fw.css b/assets/css/fw.css index f0b4b7962..522641187 100644 --- a/assets/css/fw.css +++ b/assets/css/fw.css @@ -11,7 +11,9 @@ h1, h2, h3, h4, h5, h6 { } hr { - border-color: #1181a4; + border: none; + height: 1px; + background-color: #1181a4; } a { @@ -105,7 +107,7 @@ main li { padding: 0; } -#langselect .selected, #gnav .selected { +#langselect .selected, #gnav .selected, #paginator .selected { font-weight: bold; text-decoration: underline; color: #2b7288; @@ -136,6 +138,7 @@ header #navbtn { #gnav nav ul li>a { margin-left: 0.5em; + display: inline-block; } #gnav nav>ul>li>ul>li>ul>li>a { @@ -148,7 +151,7 @@ nav { padding: 10px 10px 10px 10px; } -#navaround, nav { +#navaround, nav, .kblist article { background-color: #eaf8fd; } @@ -177,6 +180,10 @@ nav { list-style-type: none; } +#editsitecontent svg { + color: #1181a4; +} + :target { background-color: #ffceaf; border-top: solid 2px #1181a4; @@ -279,6 +286,16 @@ main>div { margin: auto; } +#paginator { + padding: 0; + margin: 0; +} + +#paginator li { + list-style-type: none; + display: inline-block; +} + @media (min-width:940px) { #langselect ul li { margin: 0 0.3em 0 0; @@ -319,7 +336,7 @@ main>div { color: #3daed2; } - #langselect .selected { + #langselect .selected, #paginator .selected { color: #1da3cc; } @@ -336,7 +353,7 @@ main>div { color: #dbdbdb; } - #mnv, #navaround { + #mnv, #navaround, .kblist article { background-color: #262a2b; } @@ -371,7 +388,7 @@ main>div { } hr { - border-color: #dbdbdb; + background-color: #dbdbdb; } code { diff --git a/assets/css/kb.css b/assets/css/kb.css new file mode 100644 index 000000000..13302a048 --- /dev/null +++ b/assets/css/kb.css @@ -0,0 +1,27 @@ +.kb header h1 { + width: 100%; + color: #fff; + line-height: normal; +} + +.kb header { + margin-bottom: auto; +} + +.kb header a { + color: #fff; +} + +#kbside { + margin: 0; + padding: 0; + list-style-type: none; +} + +.kblist article { + padding: 2em; +} + +.kblist main { + margin-top: 16px; +} diff --git a/assets/css/wiki.css b/assets/css/wiki.css index 871d9dc23..625f5b76b 100644 --- a/assets/css/wiki.css +++ b/assets/css/wiki.css @@ -6,10 +6,6 @@ font-size: 2em; } -.wikisite #editsitecontent svg { - color: #1181a4; -} - .wikisite main h1 { margin-top: 0; line-height: 1.5em; diff --git a/kb/index.md b/kb/index.md new file mode 100644 index 000000000..e81a3aa77 --- /dev/null +++ b/kb/index.md @@ -0,0 +1,8 @@ +--- +layout: kblist +lang: "en" +title: "Overview" +permalink: /kb/ +pagination: + enabled: true +--- From 87c30060ff0d0c59de42f126c2e48aed2319af58 Mon Sep 17 00:00:00 2001 From: Olivier Humbert Date: Wed, 16 Dec 2020 18:09:24 +0100 Subject: [PATCH 086/280] Update en-Compiling.md --- wiki/en/en-Compiling.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/en/en-Compiling.md b/wiki/en/en-Compiling.md index 3073cfc17..bfc989e8f 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 follow ```shell brew install qt5 From 1c48ee19c88ad8eb785e29c912502a848b89c871 Mon Sep 17 00:00:00 2001 From: Olivier Humbert Date: Wed, 16 Dec 2020 18:09:42 +0100 Subject: [PATCH 087/280] Update fr-Compiling.md --- wiki/fr/fr-Compiling.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/fr/fr-Compiling.md b/wiki/fr/fr-Compiling.md index eba8d1e64..0b6b4a058 100644 --- a/wiki/fr/fr-Compiling.md +++ b/wiki/fr/fr-Compiling.md @@ -17,7 +17,7 @@ Vous n'avez pas besoin de compiler Jamulus sous macOS puisque nous fournissons d ### Pré-requis 1. Installez XCode -1. Installez QT comme suit +1. Installez Qt comme suit ```shell brew install qt5 From 0fd72df9f7938499ff4a38bd69d1b7b73b9228d0 Mon Sep 17 00:00:00 2001 From: Olivier Humbert Date: Wed, 16 Dec 2020 18:09:58 +0100 Subject: [PATCH 088/280] Update de-Compiling.md --- wiki/de/de-Compiling.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/de/de-Compiling.md b/wiki/de/de-Compiling.md index 31700b0f2..f9dec2b43 100644 --- a/wiki/de/de-Compiling.md +++ b/wiki/de/de-Compiling.md @@ -17,7 +17,7 @@ Du musst Jamulus nicht für MacOS kompilieren, da wir offizielle Binärdateien z ### Anforderungen 1. Installiere XCode -1. Installiere QT wie folgt +1. Installiere Qt wie folgt ```shell brew install qt5 From 20d6269d82aaf37db7334f33aefc5cd62bf1a3a5 Mon Sep 17 00:00:00 2001 From: Olivier Humbert Date: Wed, 16 Dec 2020 18:10:19 +0100 Subject: [PATCH 089/280] Update es-Compiling.md --- wiki/es/es-Compiling.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/es/es-Compiling.md b/wiki/es/es-Compiling.md index 5fb3383ff..f9921ae6c 100644 --- a/wiki/es/es-Compiling.md +++ b/wiki/es/es-Compiling.md @@ -16,7 +16,7 @@ No necesitas compilar Jamulus para macOS ya que proporcionamos binarios oficiale ### Requisitos 1. Instala XCode -1. Instala QT como sigue +1. Instala Qt como sigue ```shell brew install qt5 From 3c213403dffb086955747a6ff9cc431f709ba2c9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 16 Dec 2020 19:14:24 +0100 Subject: [PATCH 090/280] W: [fr] fr-Tips-Tricks-More.md (#122) (#193) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Link to the CC french version * GNU/Linux -> Linux (keep close to EN!) * W: [fr] fr-Tips-Tricks-More.mdd * [fr] fr-Tips-Tricks-More update Co-authored-by: Olivier Humbert Co-authored-by: Gérald Niel Co-authored-by: Olivier Humbert --- wiki/fr/fr-Tips-Tricks-More.md | 101 +++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) create mode 100644 wiki/fr/fr-Tips-Tricks-More.md diff --git a/wiki/fr/fr-Tips-Tricks-More.md b/wiki/fr/fr-Tips-Tricks-More.md new file mode 100644 index 000000000..713a7550d --- /dev/null +++ b/wiki/fr/fr-Tips-Tricks-More.md @@ -0,0 +1,101 @@ +--- +layout: wiki +title: "Trucs, astuces et autres" +lang: "fr" +permalink: "/wiki/Tips-Tricks-More" +--- + +# Trucs et astuces + +## S'informer sur les répétitions de groupe à distance + +L'utilisateur de Jamulus [Chris Rimple](https://sourceforge.net/u/chrisrimple/profile/), a compilé un grand nombre d'informations relatives [aux répétitions de groupe à distance](https://docs.google.com/document/d/1smcvsxdaaViPQvGMQHmah_6BQeqowhmGSFMHfnlY2FI/) (Google doc, en anglais) qui couvre des sujets comme la configuration matérielle et logicielle incluant des exemples et conseils pour les nouveaux arrivants sur ce terrain. Il inclut aussi une section comparant de Jamulus à d'autres solutions. + +## Utilisation de l'audio de Jamulus dans des applications de visio-conférences Zoom (ou autres) + +Plusieurs utilisateurs ont rapporté avoir permis à un « public virtuel » de suivre une session Jamulus en utilisant [JACK audio](https://jackaudio.org) pour router le signal de Jamulus à travers de JackRouter vers l'application cible (dans ce cas, Zoom meetings). + +Vous pouvez également utiliser [VoiceMeeter](https://www.vb-audio.com/Voicemeeter/banana.htm) (Banana) pour Windows ou [BlackHole](https://github.com/ExistentialAudio/BlackHole) pour macOS afin de router la sortie de Jamulus vers de multiples destinations, par exemple vers votre casque et l'application de visio-conférence en même temps. + +## Enregistrer Jamulus sous Windows avec Reaper + +L'utilisateur de Jamulus [Rob Durkin](https://sourceforge.net/u/bentwrench/profile/), a écrit un [guide pour enregistrer la sortie de Jamulus](https://docs.google.com/document/d/1tENfNKTWHasuTg33OdLLEo4-OOhWJolOo42ffSARxhY/edit) (Google Doc, en anglais) en utilisant composant additionnel ReaRoute pour [Reaper](https://www.reaper.fm/). + +## Partager les partitions de voix et d'accords + +L'utilisateur de Jamulus [BTDT](https://sourceforge.net/u/btdt/profile/), a écrit un système appelé [305keepers](https://github.com/keepers305/Song-Sheet-Sharing-Web-Pages), une application web qui permet à un « chef de bœuf » d'envoyer des partitions (au format PDF) aux « bœuffeurs » en temps réel en utilisant des navigateurs web standard. + +## Faire une page de statut du serveur + +Avec l'argument en ligne de commande `-m`, une information statistique à propos du serveur peut être générée pour être incluse dans une page web. + +Voici un exemple de script php utilisant le fichier de statut du serveur pour afficher le statut actuel du serveur dans une page html (en supposant que l'argument de ligne de commande suivant soit utilisé : `-m /var/www/stat1.dat`) + +~~~ + + +~~~ + +## Sauvegarde et chargement des états du mix client + +Vous pouvez sauvegarder et restaurer le mix que vous utilisez pour les répétitions avec votre groupe (chariots, muet, panoramique, solo, etc.) et les recharger à tout moment (même si vous êtes en train de jouer). Faites ça en utilisant « Fichier > Sauvegarder la configuration des canaux du mixeur… » dans votre client et rechargez-les en utilisant « Charger la configuration des canaux du mixeur… » (ou en les glissant/déposant dans la fenêtre de la console de mixage). + +## Convertir un serveur public en un serveur privé à la volée + +Vous pouver faire fonctionner un serveur public le temps nécessaire pour que votre groupe s'y connecte,puis devenir privé en décochant simplement la case « Rendre mon serveur public » dans l'IUG du serveur. Les membres de votre groupe resteront connectés au serveur jusqu'à ce qu'ils se déconnectent. (Merci à [David Savinkoff](https://github.com/DavidSavinkoff) pour le tuyau !) + +## Script de démarrage du client pour Linux + +Voici un script de démarrage Linux pour Jamulus utilisant une vieille carte son Audigy4, dont le grand nombre de chariots audio disponibles rend compliqué l'obtention de réglages corrects. + +Ce script inclut donc les principaux réglages des chariots audio. La deuxième partie du script traite des connexions JACK. J'utilise Guitarix comme processeur d'effets pour ma guitare que je branche dans le cheminement audio jack. + +Finalement, je lance Jamulus en le connectant automatiquement au serveur central. + +Voici le script : + +~~~ +amixer sset 'Mic' capture 30% cap +amixer sset 'Mic' playback 0% +amixer sset 'Line' playback 60% unmute +amixer sset 'Audigy Analog/Digital Output Jack' unmute +amixer sset 'Analog Mix' capture 100% +amixer sset 'Analog Mix' playback 0% +amixer sset 'Wave' 100% +amixer sset 'Master' capture 100% cap +amixer sset 'Master' playback 100% +amixer sset 'Master' playback 100% +amixer sset 'PCM' playback 100% +amixer sset 'PCM' capture 0% +guitarix & +/home/corrados/llcon/Jamulus -c myJamulusServer.domain.com & +sleep 3 +jack_disconnect system:capture_1 Jamulus:'input left' +jack_disconnect system:capture_2 Jamulus:'input right' +jack_connect system:capture_1 gx_head_amp:in_0 +jack_connect gx_head_amp:out_0 gx_head_fx:in_0 +jack_connect gx_head_fx:out_0 Jamulus:'input left' +jack_connect gx_head_fx:out_1 Jamulus:'input right' +jack_connect Jamulus:'output left' system:playback_1 +jack_connect Jamulus:'output right' system:playback_2 +~~~ + + +## Utilisation de ctrlmidich pour les contrôleurs MIDI + +Les chariots de volume dans la fenêtre de mixage du client peuvent être contrôlés par un contrôleur MIDI en utilisant le paramètre `--ctrlmidich` (note : uniquement disponible pour une utilisation avec macOS et Linux). Pour activer cette fonctionnalité, Jamulus doit être lancé avec `--ctrlmidich`. Il y a deux paramètres que vous pouvez définir : `Canal` et `Décalage`. Réglez le premier paramètre sur le canal que vous voulez que Jamulus écoute (0 pour tous les canaux) et le second paramètre sur le numéro de contrôle auquel vous voulez que le premier chariot réagisse. Par défaut, le décalage est de 70 (pour le Behringer X-Touch), ce qui signifie que le premier chariot réagit au numéro de contrôle 70, le second au 71, et ainsi de suite. + +Ainsi, par exemple, si vous utilisez un Behringer X-Touch, que vous envoyez du MIDI sur le canal 1 et que vous laissez le décalage par défaut, la commande ressemblera à ceci : `--ctrlmidich 1`. Si vous avez un contrôleur différent, par exemple envoyant du MIDI sur le canal 2 et commençant par le numéro de contrôle 30, la commande sera la suivante `--ctrlmidich "2;30"` + +Assurez-vous de connecter le port de sortie de votre périphérique MIDI au port d'entrée MIDI de Jamulus (Qjackctl (Linux), MIDI Studio (macOS) ou tout autre port que vous utilisez pour gérer les connexions). Sous Linux, vous devrez installer et lancer a2jmidid pour que votre péripérique apparaisse dans l'onglet MIDI de Qjackctl. From ef8923d56a0785cb2fdd7db0c0ecdf719e0a1832 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Wed, 16 Dec 2020 19:57:01 +0100 Subject: [PATCH 091/280] Fix a link --- _posts/2020-03-28-Server-Rpi.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/_posts/2020-03-28-Server-Rpi.md b/_posts/2020-03-28-Server-Rpi.md index 9d7523d4a..9cbed644b 100644 --- a/_posts/2020-03-28-Server-Rpi.md +++ b/_posts/2020-03-28-Server-Rpi.md @@ -31,14 +31,13 @@ If you are running a server, test by starting with the `--server` option, and wa `Jamulus -s` -If all is well, run in your chosen [server mode](Choosing-a-Server-Type) as follows (or use systemd unit script provided in the [Linux guide](Server-Linux#create-a-start-script)), for example a public server: +If all is well, run in your chosen [server mode](/wiki/Choosing-a-Server-Type) as follows (or use systemd unit script provided in the [Linux guide](/wiki/Server-Linux#create-a-start-script)), for example a public server: `sudo chrt 99 ionice -c1 nice -n -20 Jamulus -s -n -e [yourCentralServer] -o "yourServerName;yourCity;[country ID]"&` **Please also see this [important note on Central Servers](/wiki/Central-Servers).** See also [Command Line Options](/wiki/Command-Line-Options) for other parameters you can set. -*** ### To upgrade Jamulus From 3e5aa522718a2c8dd995fd22d5683da585c36a33 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Wed, 16 Dec 2020 20:02:45 +0100 Subject: [PATCH 092/280] Move Raspi page --- _posts/2020-03-28-Example-Setup-Hardware.md | 36 --------------------- wiki/en/en-Running-a-Server.md | 2 +- 2 files changed, 1 insertion(+), 37 deletions(-) delete mode 100644 _posts/2020-03-28-Example-Setup-Hardware.md diff --git a/_posts/2020-03-28-Example-Setup-Hardware.md b/_posts/2020-03-28-Example-Setup-Hardware.md deleted file mode 100644 index 0b9a7f493..000000000 --- a/_posts/2020-03-28-Example-Setup-Hardware.md +++ /dev/null @@ -1,36 +0,0 @@ ---- -layout: post -title: "Example setup audio hardware" -heading: "Example setup UCA202 Windows" -author: "corrados" -lang: "en" ---- - -This is an example Windows client installation with a [Behringer U-CONTROL UCA202](https://www.amazon.com/Behringer-U-Phono-UFO202-Audiophile-Interface/dp/B002GHBYZ0){: target="_blank" rel="noopener noreferrer"} 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.**_ - -## Windows: Audio interface connection - ASIO4All - -### 1. Plug the interface into a USB port on your computer - -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)](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. - - -### 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). - -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 - -Connect your instrument to the input plugs of the Behringer U-CONTROL UCA202. Plug in your headphones into the Behringer U-CONTROL UCA202. - -### 4. Connect to a Jamulus server. - -You're done! Have fun! diff --git a/wiki/en/en-Running-a-Server.md b/wiki/en/en-Running-a-Server.md index 1bff40cdf..ba1fe3220 100644 --- a/wiki/en/en-Running-a-Server.md +++ b/wiki/en/en-Running-a-Server.md @@ -58,9 +58,9 @@ A typical jam might have 4 people, for which you would need 200Kbps * 4 = 800Kbs
      For Windows or macOS users For Linux users - Raspberry Pi
      +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. 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`). ## Having problems? Got issues? From 005be2e995628113e79d2d9768ab3a7108a1286f Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Wed, 16 Dec 2020 20:03:38 +0100 Subject: [PATCH 093/280] add new line --- wiki/en/en-Running-a-Server.md | 1 + 1 file changed, 1 insertion(+) diff --git a/wiki/en/en-Running-a-Server.md b/wiki/en/en-Running-a-Server.md index ba1fe3220..9bb4996b4 100644 --- a/wiki/en/en-Running-a-Server.md +++ b/wiki/en/en-Running-a-Server.md @@ -61,6 +61,7 @@ A typical jam might have 4 people, for which you would need 200Kbps * 4 = 800Kbs
    • 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. + 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`). ## Having problems? Got issues? From 16082c1a91e212f5564e781a22d277bb414a3909 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Wed, 16 Dec 2020 20:25:40 +0100 Subject: [PATCH 094/280] redirect pages --- _layouts/redirect.html | 19 ++++ _layouts/wikioverview.html | 2 +- kb/index.md | 2 +- wiki/en/en-Linux-Install-Script.md | 142 +----------------------- wiki/en/en-Multiple-Audio-Interfaces.md | 57 +--------- wiki/en/en-Server-Rpi.md | 51 +-------- wiki/en/en-Software-Synth.md | 43 +------ 7 files changed, 34 insertions(+), 282 deletions(-) create mode 100644 _layouts/redirect.html diff --git a/_layouts/redirect.html b/_layouts/redirect.html new file mode 100644 index 000000000..880dfc8d3 --- /dev/null +++ b/_layouts/redirect.html @@ -0,0 +1,19 @@ + + + + + + + + + + Page Redirect + + + + If you are not redirected automatically, follow this link. + + + diff --git a/_layouts/wikioverview.html b/_layouts/wikioverview.html index b7e2e262c..9e1eff624 100644 --- a/_layouts/wikioverview.html +++ b/_layouts/wikioverview.html @@ -4,7 +4,7 @@ {{ content }}
      {% for page in site.pages %} - {% if page.category != "hidden" %} + {% if page.category != "hidden" and page.layout != "kblist" %}
    • {{ page.title }}
      • {% endif %} {% endfor %} diff --git a/kb/index.md b/kb/index.md index e81a3aa77..111e6f159 100644 --- a/kb/index.md +++ b/kb/index.md @@ -1,7 +1,7 @@ --- layout: kblist lang: "en" -title: "Overview" +title: "KB Overview" permalink: /kb/ pagination: enabled: true diff --git a/wiki/en/en-Linux-Install-Script.md b/wiki/en/en-Linux-Install-Script.md index 2bae49110..23c37954b 100644 --- a/wiki/en/en-Linux-Install-Script.md +++ b/wiki/en/en-Linux-Install-Script.md @@ -1,142 +1,8 @@ --- -layout: wiki -title: "Jamulus Tips & Tricks - Linux Bash Installation Script" +layout: redirect +redirect: "/kb/2020/09/20/Linux-Install-Script.html" lang: "en" permalink: "/wiki/Linux-Client-Install-Script" ---- - - -# Linux Bash Script for Download and Compile - -If you plan to be installing Jamulus on many Linux machines, you may want to try this script. - -The following example was tested on Linux Mint and combins all the commands above into one script for Ubuntu/Linux Mint. To incorporate the different command for different Linux distributions variables define the distribution and the release for which the installation script should be performed. Example focuses on Ubuntu with release 18.04 as example. So the suggested script name for the release is e.g. `install4ubuntu18_4.sh`. The script commands are generic so that the installation could also be modified so that they work on other linux distributions. - -### Installation dependent on Linux Distribution -The following script call different installation commands dependent on the Linux distribution. -The variable `DISTRO` defines which commands are executed. Set the variable dependent on your Linux distribution you are using. -* `DISTRO="Ubuntu` for a Ubuntu or Linux Mint -* `DISTRO="Debian` for a Debian or Raspian Linux -* `DISTRO="Fedora` for a Fedora Linux -Furthermore if the installation is dependent of the release the variable `LINVERSION` is introduced but is currently not used. In the Ubuntu if statement there is an example how version dependent installation calls can be performed. -```bash -if [ "$LINVERSION" = "18.4" ] -then - echo "Perform Installation Specifics for $DISTRO Version $DISTRO" -fi -``` -The variable `LINVERSION` is currently not used in the following script but it is just a demo how to use the version specific installation commands. - -### Adaptation of the Installation Script -If you want to create an installation script for Debian just copy the script `install4ubuntu18_4.sh` to `install4debian10_6.sh` and modify the distro variables to -```bash -#!/bin/sh -# set DISTRO either to "Ubuntu", "Debian" or "Fedora" -DISTRO="Debian" -LINVERSION="10.6" -``` -After that test the installation on Debian and modify the commands so that the installation script works on Debian. Please share working installation scripts in this Wiki. The maintainer of this repository might add a folder in this repository `/install_scripts` for working installation scripts. Create a pull request for new installation scripts or create an issue with a request to add a documented and tested installation script to this repository. - -### The Installation Script -Copy the following installation script into a file and save it to the filename `install4ubuntu18_4.sh`. After saving the file e.g. in your `Download` directory change to the directory and call the following script with `sh install4ubuntu18_4.sh`. -```bash -#!/bin/sh -# set DISTRO either to "Ubuntu", "Debian" or "Fedora" -DISTRO="Ubuntu" -LINVERSION="18.04" - -# Get Jamulus Release Name with "curl" and "grep" -R=`curl -s https://api.github.com/repos/corrados/jamulus/releases/latest | grep -oP '"tag_name": "\K(.*)(?=")'` -echo "Jamulus Installation Script for $DISTRO $LINVERSION" -echo "Release: $R" -INSTALLJAMULUS="no" -while true; do - read -p "Do you wish to install Jamulus on $DISTRO $LINVERSION? (y/n) " yn - case $yn in - [Yy]* ) - echo "Start Installation $DISTRO $LINVERSION" - echo "(1) Fetch Release $R from GitHub" - wget https://github.com/corrados/jamulus/archive/$R.tar.gz - echo "(2) Extract Source Code for Jamulus Release $R from GitHub" - tar -xvf $R.tar.gz - echo "(3) Delete ${R}.tar.gz from GitHub" - rm $R.tar.gz - echo "(4) Update Repository" - sudo apt-get update - INSTALLJAMULUS="yes" - break;; - [Nn]* ) - echo "Cancelled Jamulus Installation on $DISTRO $LINVERSION" - exit;; - * ) echo "Please answer yes or no.";; - esac -done - -# echo "Check Variable: $INSTALLJAMULUS" - -if [ "$INSTALLJAMULUS" = "yes" ]; then - echo "(5) Install Build Essentials for $DISTRO" - - if [ "$DISTRO" = "Ubuntu" ] - then - echo "Installation for $DISTRO" - sudo apt-get install cmake qmake gcc g++ - sudo apt-get install build-essential qt5-qmake qtdeclarative5-dev qt5-default qttools5-dev-tools libjack-jackd2-dev - sudo apt-get install qjackctl - if [ "$LINVERSION" = "18.4" ] - then - echo "Perform Installation Specifics for $DISTRO Version $DISTRO" - fi - - elif [ "$DISTRO" = "Debian" ] - then - sudo apt-get install build-essential qtdeclarative5-dev qt5-default qttools5-dev-tools libjack-jackd2-dev - sudo apt-get install qjackctl - elif [ "$DISTRO" = "Fedora" ] - then - sudo dnf install qt5-qtdeclarative-devel jack-audio-connection-kit-dbus jack-audio-connection-kit-devel - sudo dnf install qjackctl - fi - - echo "(6) Compile Jamulus $R" - echo "Change to Directory jamulus-$R" - cd "jamulus-$R" - # ls - qmake Jamulus.pro - make clean - make - sudo make install - echo "Compilation DONE" - cd .. - echo "(6) Delete the Source Files after Installation" - rm -R "jamulus-$R" - -else - - echo "Installation cancelled" - -fi - -``` - - -## Possible Improvements of the Installation Script for Jamulus -The script can ask in the very beginning for which linux distribution the installation script should be called. -This can be tested with the command `lsb_release` - -With the `lsb_release` command the command returns the distribution specific information about a Linux distro. -With a `grep` command with regular expression the variable `DISTRO` and `LINVERSION`. -E.g. the Ubuntu based systems return with the command the following information. -```bash -$ lsb_release -a -No LSB modules are available. -Distributor ID: Ubuntu -Description: Ubuntu 11.04 -Release: 11.04 -Codename: natty -``` - -The challenge is, that `lsb_release` command must be available on Linux system. On CentOS/Fedora based systems `lsb_release` command is only available, if the `lsb` core packages are installed. So the automated Linux version detected might no work. - -So reading the `DISTRO` and `LINVERION` with the `read` command might be the better distribution dependent improvement than an automated setting with `lsb_release`. +category: "hidden" +--- diff --git a/wiki/en/en-Multiple-Audio-Interfaces.md b/wiki/en/en-Multiple-Audio-Interfaces.md index 3e25bf45f..725dd5038 100644 --- a/wiki/en/en-Multiple-Audio-Interfaces.md +++ b/wiki/en/en-Multiple-Audio-Interfaces.md @@ -1,58 +1,7 @@ --- -layout: wiki -title: "Using Multiple Audio Interfaces" +layout: redirect +redirect: "/kb/2020/11/24/Multiple-Audio-Interfaces.html" lang: "en" permalink: "/wiki/Running-Jamulus-with-Multiple-Audio-Interfaces" +category: "hidden" --- - - -# Using Multiple Audio Interfaces - -It is possible to run Jamulus with multiple Audio Interfaces on all three operating systems. Useful when we need to output an instrument through external audio card for minimal latency and computer microphone for communication. Other use cases may apply. - - -### Windows - -Under Windows, the best option to run multiple interfaces through Jamulus at the same time is by using a combination of JACK Audio Connection Kit with VoiceMeeter. It can be accomplished with just VoiceMeeter, but I've found that it introduces some undesirable latency and it wasn't supporting 64 frame buffer size correctly as it was producing some noises through my headphones. - -**Requirements:** -* [JACK for Windows](https://jackaudio.org/downloads/); -* [Voicemeeter](https://www.vb-audio.com/Voicemeeter/banana.htm) (any version will do). - -**Steps:** -1. [Install and configure JACK on Windows](https://jackaudio.org/faq/jack_on_windows.html) - Make sure you select your best audio interface in the configuration steps, also add `-r 48000 -p ` to ensure JACK is outputting audio in the required sample rate for Jamulus (48.000Hz). If your frame buffer size is too low for your hardware, you'll need to change it to a higher value; -2. Install and open Voicemeeter; -3. Open configured Jack PortAudio shortcut, Jack Control and Jamulus software; -4. On Voicemeeter, go to HARDWARE OUT and on A1 dropdown list, select JackRouter. On Hardware Input 1 select your computer microphone. You can make your computer microphone have the lowest latency possible by going into _Menu > System Settings/Options..._ and enabling _WDM Input Exclusive Mode_ (if you experience crackling noises while speaking, disable this) and changing the _Engine Mode_ to _Swift_; -5. Make sure the Hardware Input where you selected your microphone is sending sound through A1 by enabling the corresponding button next to the fader; -6. On Jamulus, under Settings, select JackRouter as your Soundcard Device; -7. On Jack Control, if you click the _Connect_ button, you should now see three devices: portaudio (your external audio interface), voicemeeter and jamulus. If Jamulus doesn't appear, try connecting and disconnecting from any server to enable it; -8. To test things out, on Jack Control, connect portaudio and voicemeeter output ports to jamulus input ports, then connect jamulus output ports to portaudio input ports (assuming you'll be using your external audio interface to listen, otherwise you can use voicemeeter to redirect the sound to another device, which I will not cover on this guide). Connect to a server on Jamulus and test it out by speaking into the microphone and playing your instrument. If everything went well you should hear yourself; -9. To make JACK connections permanent, on Jack Control, open the _Patchbay_, add all inputs and outputs available (Add... > Select each Client > Click Add Plug until there's none left) and make the connections you wish to make permanent. This usually goes like connecting both _system_ and _voicemeeter_ outputs into _jamulus_ input, and _jamulus_ output into _system_ input. Once done, save the Patchbay definition and _Activate_ it. Now every time you start jamulus and connect to a server, the connections on JACK should automatically be done. - -**Bonus:** - -* The Microphone can be muted and it's volume adjusted on VoiceMeeter. Be sure to play with the _VOICE_ graph too (equalization), I find that my voice sounds better if I move it halfway into _Lo_; -* If you're using VoiceMeeter Banana or Potato, you can apply Gate to your microphone (useful to cut undesirable noises when you're not speaking); -* If you set your default playback device under Windows to one of VoiceMeeter's virtual inputs, you can route audio from your computer into JackRouter (and consequently, into Jamulus) by enabling the _A1_ button on the relevant input under _Virtual Inputs_. This is useful if you wish to play some audio through Jamulus (backing tracks, youtube, recordings, etc...) - - -### macOS - -[Aggregate devices](https://support.apple.com/en-us/HT202000) lets you do this. Just make sure your Jamulus version is 3.5.3 or higher. - - -### Linux - -On Linux, it is possible to route additional devices to Jack by using alsa_in. - -**Requirements:** - -* QJackCtl -* alsa - -**Steps:** -1. Follow [this tutorial](https://www.penguinproducer.com/Blog/2011/11/using-multiple-devices-with-jack/) to route the desired interface into Jack by using alsa_in. -2. Jamulus should automatically route the JACK configured interface, adjustments can be made through the _Connect_ button. -3. Connect the device configured on step 1 into jamulus input. -4. Use Patchbay as described on Windows section to make connections permanent. diff --git a/wiki/en/en-Server-Rpi.md b/wiki/en/en-Server-Rpi.md index 4d069dd98..452faa121 100644 --- a/wiki/en/en-Server-Rpi.md +++ b/wiki/en/en-Server-Rpi.md @@ -1,52 +1,7 @@ --- -layout: wiki -title: "Server Installation – Raspberry Pi" +layout: redirect +redirect: "/kb/2020/03/28/Server-Rpi.html" lang: "en" permalink: "/wiki/Server-Rpi" +category: "hidden" --- - -# Server Installation - Raspberry Pi - -**_Please ensure you have read the [server overview](Running-a-Server)_** - -_Jamulus has been tested on a Raspberry Pi 4 2Gb by Jamulus user [SIVA Frédéric](https://sourceforge.net/u/fredsiva/profile/)_ - -1. Install Raspbian Buster (allow [VNC](https://www.raspberrypi.org/documentation/remote-access/vnc/) and [SSH](https://www.raspberrypi.org/documentation/remote-access/ssh/README.md) for comfort, but will ultimately run without VNC for higher speed) - -1. Edit [config.txt](https://www.raspberrypi.org/documentation/configuration/config-txt/) to enable boot without HDMI by adding `hdmi_force_hotplug=0` - -1. [Get the sources](Installation-for-Linux#get-jamulus-sources), install the [dependent packages](Installation-for-Linux#install-dependencies) according to the Linux client install guide **but do NOT install JACK package(s)** - you don't need them on a [headless server](Server-Linux#running-a-headless-server). To run a client, install all listed dependencies. - -1. Compile the source code for a server as per [these instructions](Server-Linux#compile-sources-create-a-user). Compile a client using the [default instructions](Installation-for-Linux#compile-this-bad-boy). - -This will build Jamulus and put it in `/usr/local/bin/Jamulus` - -Connect Raspberry Pi with Ethernet cable to your router. - -If you are running a server, test by starting with the `--server` option, and watch GUI on VNC (or HDMI). When running as a client, you should see the GUI start. - -`Jamulus -s` - -If all is well, run in your chosen [server mode](Choosing-a-Server-Type) as follows (or use systemd unit script provided in the [Linux guide](Server-Linux#create-a-start-script)), for example a public server: - -`sudo chrt 99 ionice -c1 nice -n -20 Jamulus -s -n -e [yourCentralServer] -o "yourServerName;yourCity;[country ID]"&` - -**Please also see this [important note on Central Servers](Central-Servers).** - -See also [Command Line Options](Command-Line-Options) for other parameters you can set. -*** - -### To upgrade Jamulus - -Stop the server and simply repeat step 3 for obtaining the sources and installing above. - -If you want to install a specific release, you can do the following using git (where `[RELEASE]` is a release ID such as r3_5_8). See the [official tagged releases](https://github.com/corrados/jamulus/releases). - -First, `cd` inside the directory in which the Jamulus sources were unpacked/downloaded, then use the following commands: - -~~~ -git pull -git checkout [RELEASE] -~~~ - -Then compile the sources as per a new install. Start Jamulus back up. diff --git a/wiki/en/en-Software-Synth.md b/wiki/en/en-Software-Synth.md index 5352d2845..063dcf83b 100644 --- a/wiki/en/en-Software-Synth.md +++ b/wiki/en/en-Software-Synth.md @@ -1,44 +1,7 @@ --- -layout: wiki -title: "Software Synth in Jamulus" +layout: redirect +redirect: "/kb/2020/10/19/Software-Synth.html" lang: "en" permalink: "/wiki/Software-Synth" +category: "hidden" --- - -# Software Synth in Jamulus - -## Linux -We will elaborate the concept of playing a software synth on Linux as example and transfer that to other operating systems (e.g. Windows, macOS). -* **(Hammond Organ Synth)** As an example we talk open source software synth [setBfree](https://github.com/pantherb/setBfree), which is a hammond organ emulator that outputs through JACK on Linux. -* **(MIDI Keyboard)** The MIDI keyboard is used to generate the key pressed events, that are transmitted through a USB-MIDI interface to Linux system and the Synthesizer [setBfree](https://github.com/pantherb/setBfree) generates the corresponding tone for the pressed key. In general the MIDI keyboard can also be replaced by a digital wind midi controller, that does the same but the tone is dependent on how the musician blows air into the digital wind controller. -* **(Connector to Jamulus)** You may hear the audio output of your Linux system on your speakers but the audio output may not be use as input for your Jamulus session. So another step is to connect the audio out to Jamulus client (with QJackCtl). - -### General Information about ALSA, JACK and MIDI -First of all we explain a few basic concepts on Linux to use MIDI and Audio together. -* ALSA is the basic to connection to the hardware, i.e. the soundcard and the midi controller for the keyboard. -* JACK is build on top of ALSA and uses ALSA for the audio output. It provides a adequat environment for music production on Linux. -* Synthesizer like the [Hammond Organ emulator setBfree](https://github.com/pantherb/setBfree) connect to JACK for audio output. -* Jamulus connects to JACK. - -### Requirements for Using Software Synths in Jamulus on Linux -For ALSA2JACK MIDI (`a2jmidid`) connection it is necessary to install the a2j package. Furthermore we use in this example a simple Hammond organ emulator `setBfree` in this example. Replace `setBfree` by your favorite Linux synthesizer. Both packages `a2jmidid` and `setbfree` can be installed via your package manager or e.g. on Ubuntu/Mint with `apt-get` commands: -```shell - sudo apt-get install a2jmidid - sudo apt-get install setbfree -``` - -### Connecting ALSA, JACK and MIDI for a Synth for Jamulus -Now we look an the workflow to use the whole infrastructure in Jamulus. -* **(Jamulus Installation and JACK)** Use the [install script](https://github.com/corrados/jamulus/wiki/Linux-Client-Install-Script) for Jamulus on Linux or [install Jamulus with the manual in the wiki](https://github.com/corrados/jamulus/wiki/Installation-for-Linux). With this installation we have JACK and QJackCtl installed for Jamulus. -* **(ALSA to JACK - MIDI)** Next we must create a connection from ALSA to JACK to route the MIDI input from the keyboard to the [Hammond Emulator setBfree](https://github.com/pantherb/setBfree). - * ***(Command Line: `qjackctl`)*** For this step you can start JACK-Control (QJackCtl) from the command line by `qjackctl`, - * ***(Command Line: `a2jmidid -e`)*** Then you launch the ALSA2JACK MIDI connector with command: `a2jmidid -e`. As long as this connector runs in the shell the `a2j` connection interface is visible in `QJackCtl`. - * ***(QJackCtl: `ALSA-MIDI`)*** Connect your USB MIDI as input to `MIDI through` in the ALSA-MIDI tab of QJackCtl. Now the midi events from your keyboard reach JACK and are ready to connect. - * ***(Start Synth)*** Start the Hammond Synthesizer too e.g. from the command line with `setBfree`. You will see the `setBfree` graphical user interface GUI (see http://setbfree.org/gui_3d). Press with your mouse on the visualised organ keyboard to test if the synth generates an organ sound on your speakers. - * ***(QJackCtl: `JACK-MIDI`)*** Now we can connect `a2j` in JACK-MIDI as input to the synth `setBfree`, that generates the sound as output for each key pressed on the keyboard. Keep in mind that you can connect synths if they are started and visible for QJackCtl. So you can connect after starting the [Hammond Emulator setBfree](https://github.com/pantherb/setBfree), i.e. connect `a2j` to the `setbfree` if you also see the Hammond Synth SetBFree in QJackCtl. - * ***(Test Software Synth with MIDI Keyboard)*** If you have speakers attached to your Linux Computer you would hear the emulated Hammond sound on your Linux PC for all the keys your press on your MIDI keyboard. If you just want to play the software synth with your keyboard you are ready to play from here. The only remaining step is to connect the audio to Jamulus. -* **(Synth to Jamulus - Audio)** In the previous step we connected the MIDI signals from your keyboard to the MIDI input of JACK via a2j - MIDI through connection. Now JACK the MIDI which tell JACK which keys are pressed on the keyboard. Now create an audio connection in JACK (i.e. the generated Hammond sound of the synth). We connect the [Hammond Emulator setBfree](https://github.com/pantherb/setBfree) output to Jamulus. Therefore Jamulus must be started so that you see also Jamulus in the audio connection of QJackCtl. Now you can the audio output of the [Hammond Emulator setBfree](https://github.com/pantherb/setBfree) to the audio input of Jamulus in JACK. - -In general `QJackCtrl` is used similar operations like for plugging in instruments in mixer and the mixer into an amplifier and the amplifier again to the speakers. Have fun with your other OpenSource synths like QSynth, [ZynAddSubFX](https://sourceforge.net/projects/zynaddsubfx/) than can be installed on your Linux system and/or used within LMMS. - -Have fun playing your synth within Jamulus. From f2f7142c325b226bc646838d0a5f40c650c0e4ad Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 16 Dec 2020 20:33:47 +0100 Subject: [PATCH 095/280] Fix a typo (#195) Co-authored-by: ann0see <20726856+ann0see@users.noreply.github.com> --- wiki/fr/fr-Running-a-Server.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/fr/fr-Running-a-Server.md b/wiki/fr/fr-Running-a-Server.md index 140e625c7..506007f5f 100644 --- a/wiki/fr/fr-Running-a-Server.md +++ b/wiki/fr/fr-Running-a-Server.md @@ -33,7 +33,7 @@ Si vous voulez vraiment administrer votre propre serveur, il est **très importa Beaucoup de gens attribuent au serveur des problèmes qui sont en fait des problèmes avec le _client_. Cela dépend beaucoup du [matériel](Hardware-Setup) des clients, des réseaux sur lesquels _ils_ se trouvent, et de leur respect de la [règle numéro un](Getting-Started#vous-avez-des-problèmes--vous-narrivez-pas-à-être-en-rythme-). Il n'y a donc aucune garantie que vous obtiendrez une latence plus faible ou de meilleures performances globales en ayant votre propre serveur. -Si vous prévoyez de jouer régulièrement avec les mêmes personnes, **il vous est fortement conseillé** de vous assurer d'abord que chaque membre du groupe est configuré pour utiliser Jamulus correctement. Pour ce faire, trouvez un serveur public avec un temps de ping raisonnable pour chacun d'entre vous (20ms ou moins peut-être), connectez-vous tous à ce serveur et essayez de résoudre les problèmes individuels (en vérifiant qu'ils peuvent [suivre la règle numéro un](etting-Started#vous-avez-des-problèmes--vous-narrivez-pas-à-être-en-rythme-) en particulier). Utilisez la technique solo ci-dessus pour éviter d'être interrompu si nécessaire. +Si vous prévoyez de jouer régulièrement avec les mêmes personnes, **il vous est fortement conseillé** de vous assurer d'abord que chaque membre du groupe est configuré pour utiliser Jamulus correctement. Pour ce faire, trouvez un serveur public avec un temps de ping raisonnable pour chacun d'entre vous (20ms ou moins peut-être), connectez-vous tous à ce serveur et essayez de résoudre les problèmes individuels (en vérifiant qu'ils peuvent [suivre la règle numéro un](Getting-Started#vous-avez-des-problèmes--vous-narrivez-pas-à-être-en-rythme-) en particulier). Utilisez la technique solo ci-dessus pour éviter d'être interrompu si nécessaire. Une fois les problèmes avec les musiciens résolus de cette manière, vous pouvez alors envisager d'héberger votre propre serveur soit chez vous, soit sur un hôte dans le « Cloud » comme Amazon, ce qui pourrait entraîner une meilleure latence qu'un serveur fonctionnant à domicile. Par exemple, [voir ce guide](https://www.facebook.com/notes/jamulus-online-musicianssingers-jamming/howto-idiots-guide-to-installing-jamulus-server-on-amazon-aws-lightsail-ubuntu-i/507719749802976/) (en anglais) d'utilisation de AWS Lightsail par l'utilisateur de Jamulus [Simon Tomlinson](https://www.facebook.com/simon.james.tomlinson?eid=ARBQoY3KcZAtS3pGdLJuqvQTeRSOo4gHdQZT7nNzOt1oPMGgZ4_3GERe-rOyH5PxsSHVYYXjWwcqd71a) (_Facebook_). From 8f513a8d025232f61d729081d50b10abd1fe0fb4 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Wed, 16 Dec 2020 20:38:29 +0100 Subject: [PATCH 096/280] remove draft --- _drafts/Jamulus-With-Zoom.md | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 _drafts/Jamulus-With-Zoom.md diff --git a/_drafts/Jamulus-With-Zoom.md b/_drafts/Jamulus-With-Zoom.md deleted file mode 100644 index 6da840cb6..000000000 --- a/_drafts/Jamulus-With-Zoom.md +++ /dev/null @@ -1,14 +0,0 @@ ---- -layout: post -title: "Jamulus with Zoom" -heading: "Using Jamulus with Zoom" -lang: "en" ---- - -Jamulus doesn't support video streaming yet. This guide will show you how to get video using a video conferencing tool like Zoom. - -Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. - -Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. - -Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. From 9c80f43a97de45e81a81c9e68496b6818384dc41 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Wed, 16 Dec 2020 20:53:20 +0100 Subject: [PATCH 097/280] Add gen reccom --- wiki/en/en-Getting-Started.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/wiki/en/en-Getting-Started.md b/wiki/en/en-Getting-Started.md index c3eb77b3b..2efe0f67f 100644 --- a/wiki/en/en-Getting-Started.md +++ b/wiki/en/en-Getting-Started.md @@ -39,7 +39,9 @@ Also - [Jamulus OS!](https://sourceforge.net/projects/jamulus-os/files/JamulusOS ## Recommended hardware -See [the list of known good hardware](Sound-Devices) and [Hardware Setup](Hardware-Setup). +In general, your device must support a sample rate of **48kHz** (DVD-Quality). On Windows it's recommended to choose a device with a native [ASIO](https://en.wikipedia.org/wiki/Audio_Stream_Input/Output)-driver. + +See [the list of known good hardware](Sound-Devices). ## 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. From bce2a11c7ba10747faa51e8c454c4c6ac36df4bf Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Wed, 16 Dec 2020 20:55:03 +0100 Subject: [PATCH 098/280] Update en-Getting-Started.md --- 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 2efe0f67f..7560c2cb6 100644 --- a/wiki/en/en-Getting-Started.md +++ b/wiki/en/en-Getting-Started.md @@ -39,7 +39,7 @@ Also - [Jamulus OS!](https://sourceforge.net/projects/jamulus-os/files/JamulusOS ## Recommended hardware -In general, your device must support a sample rate of **48kHz** (DVD-Quality). On Windows it's recommended to choose a device with a native [ASIO](https://en.wikipedia.org/wiki/Audio_Stream_Input/Output)-driver. +In general, your device must support a sample rate of **48kHz** (DVD-quality). On Windows it's recommended to choose a device with a native [ASIO](https://en.wikipedia.org/wiki/Audio_Stream_Input/Output)-driver. See [the list of known good hardware](Sound-Devices). From 1583c766b0d2ccf2d1df11ae71f9f8e9ab179763 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Wed, 16 Dec 2020 21:47:30 +0100 Subject: [PATCH 099/280] Fix a few qjackctl --- wiki/en/en-Installation-for-Linux.md | 8 ++++---- wiki/en/en-Tips-Tricks-More.md | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/wiki/en/en-Installation-for-Linux.md b/wiki/en/en-Installation-for-Linux.md index f9c6dde6f..0b0627001 100644 --- a/wiki/en/en-Installation-for-Linux.md +++ b/wiki/en/en-Installation-for-Linux.md @@ -42,7 +42,7 @@ On **Fedora**: sudo dnf install qt5-qtdeclarative-devel jack-audio-connection-kit-dbus libQt5Concurrent5 jack-audio-connection-kit-devel ``` -### Qjackctl: Optional, but recommended +### QjackCtl: Optional, but recommended [QjackCtl](https://qjackctl.sourceforge.io) is a utility to help you set up the Jack audio server (installed as part of the dependencies above). Install it via e.g. @@ -71,8 +71,8 @@ sudo make install ## Set up your sound card -### Configure Jack with QJackCtl -Jamulus clients need [Jack](https://jackaudio.org/){: target="_blank" rel="noopener noreferrer"} to run, but you need to configure that first. The recommended method is to use `QjackCtl`. +### Configure JACK with QjackCtl +Jamulus clients need [JACK](https://jackaudio.org/){: target="_blank" rel="noopener noreferrer"} 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** 2. Configure your audio interface as follows (the exact settings for Jack will depend on what your audio interface/sound card is capable of): @@ -89,7 +89,7 @@ Open Jamulus e.g. via your command shell. If you use the shell, execute the comm Jamulus puts itself into `/usr/local/bin`. You can now delete the sources directory you compiled from. -If you get problems with sound breaking up (in particular XRUN errors reported by Jack/QJackCtl) try setting bigger values (e.g. 256 frames or 3 periods) in step 3 above. Lower ones (e.g. 64 frames) could bring better performance but maybe more sound problems. See the [troubleshooting page](Client-Troubleshooting) otherwise. +If you get problems with sound breaking up (in particular XRUN errors reported by Jack/QjackCtl) try setting bigger values (e.g. 256 frames or 3 periods) in step 3 above. Lower ones (e.g. 64 frames) could bring better performance but maybe more sound problems. See the [troubleshooting page](Client-Troubleshooting) otherwise. ## All installed? diff --git a/wiki/en/en-Tips-Tricks-More.md b/wiki/en/en-Tips-Tricks-More.md index 0eab82acc..5cee79a95 100644 --- a/wiki/en/en-Tips-Tricks-More.md +++ b/wiki/en/en-Tips-Tricks-More.md @@ -104,4 +104,4 @@ The volume faders in the client's mixer window can be controlled using a MIDI co 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"` -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. +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 f570c31b4622d658d6ccb59687043248b4d2aaaa Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Wed, 16 Dec 2020 21:50:03 +0100 Subject: [PATCH 100/280] fix a few jack --> JACK --- wiki/en/en-Command-Line-Options.md | 2 +- wiki/en/en-Installation-for-Linux.md | 8 ++++---- wiki/en/en-Tips-Tricks-More.md | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/wiki/en/en-Command-Line-Options.md b/wiki/en/en-Command-Line-Options.md index 0feeaef27..22e638bac 100644 --- a/wiki/en/en-Command-Line-Options.md +++ b/wiki/en/en-Command-Line-Options.md @@ -51,4 +51,4 @@ You can see all possible options your version supports by starting Jamulus with | `-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) | -| |`--clientname` | Window title and jack client name | (client only) | +| |`--clientname` | Window title and JACK client name | (client only) | diff --git a/wiki/en/en-Installation-for-Linux.md b/wiki/en/en-Installation-for-Linux.md index 0b0627001..0e005be43 100644 --- a/wiki/en/en-Installation-for-Linux.md +++ b/wiki/en/en-Installation-for-Linux.md @@ -75,13 +75,13 @@ sudo make install Jamulus clients need [JACK](https://jackaudio.org/){: target="_blank" rel="noopener noreferrer"} 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** -2. Configure your audio interface as follows (the exact settings for Jack will depend on what your audio interface/sound card is capable of): +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 to take any new settings ### Start Jamulus @@ -89,7 +89,7 @@ Open Jamulus e.g. via your command shell. If you use the shell, execute the comm Jamulus puts itself into `/usr/local/bin`. You can now delete the sources directory you compiled from. -If you get problems with sound breaking up (in particular XRUN errors reported by Jack/QjackCtl) try setting bigger values (e.g. 256 frames or 3 periods) in step 3 above. Lower ones (e.g. 64 frames) could bring better performance but maybe more sound problems. See the [troubleshooting page](Client-Troubleshooting) otherwise. +If you get problems with sound breaking up (in particular XRUN errors reported by JACK/QjackCtl) try setting bigger values (e.g. 256 frames or 3 periods) in step 3 above. Lower ones (e.g. 64 frames) could bring better performance but maybe more sound problems. See the [troubleshooting page](Client-Troubleshooting) otherwise. ## All installed? @@ -109,6 +109,6 @@ Download the new sources as per [Get Jamulus](Installation-for-Linux#get-jamulus * 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. Especially have a look at the footnote for the headless build. * As of version 3.5.3, Jamulus is no longer compatible with Qt4. diff --git a/wiki/en/en-Tips-Tricks-More.md b/wiki/en/en-Tips-Tricks-More.md index 5cee79a95..c499e64bb 100644 --- a/wiki/en/en-Tips-Tricks-More.md +++ b/wiki/en/en-Tips-Tricks-More.md @@ -64,7 +64,7 @@ You can run a public server long enough for your band to connect, then go privat Here's a Linux start script for Jamulus using an old Audigy4 sound card, the large number of available audio faders for which makes it hard to get the correct settings. -This script therefore includes the most important audio fader settings. The second part of the script deals with the jack connections. I use Guitarix as my guitar effect processor which I plug in in the jack audio path. +This script therefore includes the most important audio fader settings. The second part of the script deals with the JACK connections. I use Guitarix as my guitar effect processor which I plug in in the JACK audio path. Finally I start Jamulus automatically connecting to the central server. From 64e1c123d523d84fdb754fd9e3b0f5a5e59754c7 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Wed, 16 Dec 2020 21:53:13 +0100 Subject: [PATCH 101/280] fix macbook --> MacBook and firewire --> FireWire --- wiki/en/en-Hardware-Setup.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wiki/en/en-Hardware-Setup.md b/wiki/en/en-Hardware-Setup.md index 155449aad..5e6ebb1a5 100644 --- a/wiki/en/en-Hardware-Setup.md +++ b/wiki/en/en-Hardware-Setup.md @@ -64,10 +64,10 @@ You might want to install [Ubuntu Studio](https://ubuntustudio.org/){: target="_ ## 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. -- Audio interfaces generally output a mixed signal on their analog output, but separate signals (1 per source) on their digital output (USB/Firewire/Thunderbolt). +- Audio interfaces generally output a mixed signal on their analog output, but separate signals (1 per source) on their digital output (USB/FireWire/Thunderbolt). - Mixers generally only output mixed-down signals on their analog output. -- Mixers with USB/Firewire/Thunderbolt generally output mixed-down signal on their **analog** 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 mixed-down signal on their **analog** 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. _(Thanks to [pcar75](https://github.com/pcar75) for this information)_ @@ -75,7 +75,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 Mbps down / 1 Mbps 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 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!) ## Having problems? From 86531c4715dbafb68f373b2cdafa907757050fb9 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Wed, 16 Dec 2020 21:57:45 +0100 Subject: [PATCH 102/280] consistent ASIO4ALL --- wiki/en/en-Client-Troubleshooting.md | 2 +- wiki/en/en-Hardware-Setup.md | 4 ++-- wiki/en/en-Installation-for-Windows.md | 22 +++++++++++----------- wiki/en/en-Onboarding.md | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/wiki/en/en-Client-Troubleshooting.md b/wiki/en/en-Client-Troubleshooting.md index 52fec2b0e..e22b1525f 100644 --- a/wiki/en/en-Client-Troubleshooting.md +++ b/wiki/en/en-Client-Troubleshooting.md @@ -10,7 +10,7 @@ permalink: "/wiki/Client-Troubleshooting" ### Don’t hear any sound/Others don’t hear you? Start with the simple stuff: make sure your instrument/microphone and headphones are connected to the correct sockets. Make sure no other applications like your browser, video conferencing tool etc. is also using your soundcard. You should shut those down when using Jamulus. If that all looks OK and the problem persists, it's likely there's an issue with your sound device settings. This will depend on your particular setup (platform, hardware, software and drivers), so it's best to ask on [the forums](https://sourceforge.net/p/llcon/discussion/software/) for guidance. -**Windows users (ASIO4All)**: If you’re using the ASIO4All driver have a look at the [ASIO4All setup section](Installation-for-Windows#setting-up-asio4all) +**Windows users (ASIO4ALL)**: If you’re using the ASIO4ALL driver have a look at the [ASIO4LL setup section](Installation-for-Windows#setting-up-asio4all) ### You all sound OK, but it's difficult to keep together diff --git a/wiki/en/en-Hardware-Setup.md b/wiki/en/en-Hardware-Setup.md index 5e6ebb1a5..332ed3173 100644 --- a/wiki/en/en-Hardware-Setup.md +++ b/wiki/en/en-Hardware-Setup.md @@ -24,7 +24,7 @@ Setting up hardware usually burns down to 4 points, although each setup is diffe 4. Connect to a Jamulus server and have fun! -## Windows: Audio interface connection - ASIO4All +## 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. @@ -35,7 +35,7 @@ _**The exact method of connecting your instrument will of course vary depending 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)](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. +**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. #### 2. Start Jamulus diff --git a/wiki/en/en-Installation-for-Windows.md b/wiki/en/en-Installation-for-Windows.md index 34d451ac4..a4b9d4db5 100644 --- a/wiki/en/en-Installation-for-Windows.md +++ b/wiki/en/en-Installation-for-Windows.md @@ -7,29 +7,29 @@ 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 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 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). +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. *** -## 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.* +## 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.* -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 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: +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) +### How to setup ASIO4ALL inputs (Guide) 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 _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. Now enable the correct inputs/outputs in the list under your soundcard and disable everything else @@ -38,14 +38,14 @@ Before you start with Jamulus: 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? +### Having trouble with ASIO4ALL 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. +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 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\`). +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? diff --git a/wiki/en/en-Onboarding.md b/wiki/en/en-Onboarding.md index d20f3c197..ea7585c18 100644 --- a/wiki/en/en-Onboarding.md +++ b/wiki/en/en-Onboarding.md @@ -13,7 +13,7 @@ Before you start Jamulus: ... 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). +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). ### Jamulus main window When you open Jamulus, you will see a window which looks like this: From f7ce5dddf4c6117d60df3335c3c5c4a5f8eb9926 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Wed, 16 Dec 2020 21:59:25 +0100 Subject: [PATCH 103/280] Add trombonepizza link to user profile --- 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 a4b9d4db5..553427b93 100644 --- a/wiki/en/en-Installation-for-Windows.md +++ b/wiki/en/en-Installation-for-Windows.md @@ -43,7 +43,7 @@ Concerning the inputs/outputs: Headphones and speakers are often labeled as outp 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. +Have a look at [this video](https://youtu.be/_GzOsitVgLI){: target="_blank" rel="noopener noreferrer"} from [trombonepizza](https://github.com/trombonepizza){: target="_blank" rel="noopener noreferrer"} which gives more detailed setup information on ASIO4ALL. 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\`). From 11067acdc14eb7ac5d1f294dd7869fc754e3bb3e Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Wed, 16 Dec 2020 22:00:20 +0100 Subject: [PATCH 104/280] Update en-Getting-Started.md --- 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 7560c2cb6..7e503c586 100644 --- a/wiki/en/en-Getting-Started.md +++ b/wiki/en/en-Getting-Started.md @@ -39,7 +39,7 @@ Also - [Jamulus OS!](https://sourceforge.net/projects/jamulus-os/files/JamulusOS ## Recommended hardware -In general, your device must support a sample rate of **48kHz** (DVD-quality). On Windows it's recommended to choose a device with a native [ASIO](https://en.wikipedia.org/wiki/Audio_Stream_Input/Output)-driver. +In general, your device must support a sample rate of **48kHz** (DVD quality). On Windows it's recommended to choose a device with a native [ASIO](https://en.wikipedia.org/wiki/Audio_Stream_Input/Output) driver. See [the list of known good hardware](Sound-Devices). From 40ad173148530d8a0b4de66a891ff4f6320f3447 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 17 Dec 2020 20:35:20 +0100 Subject: [PATCH 105/280] [fr] Create fr-Network-Requirements.md (#112) (#197) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * W: [fr] fr-Network-Requirements.md * Update fr-Network-Requirement.md * [fr] update fr-Network-Requirements.md Co-authored-by: Olivier Humbert Co-authored-by: Gérald Niel Co-authored-by: Olivier Humbert --- wiki/fr/fr-Network-Requirements.md | 35 ++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 wiki/fr/fr-Network-Requirements.md diff --git a/wiki/fr/fr-Network-Requirements.md b/wiki/fr/fr-Network-Requirements.md new file mode 100644 index 000000000..074274161 --- /dev/null +++ b/wiki/fr/fr-Network-Requirements.md @@ -0,0 +1,35 @@ +--- +layout: wiki +title: "Qualité, délais et bande passante réseau" +lang: "fr" +permalink: "/wiki/Network-Requirements" +--- + +# Pré-requis réseau + +## Bande passante audio + +Les paramètres audio ont un impact sur la bande passante requise du réseau. Le tableau ci-dessous résume les pré-requis réseau en ce qui concerne la configuration de : +* canaux : stéréo/mono +* qualité : haute/moyenne/basse +* durée du tampon audio : 2,67ms, 5,33ms, 10,67ms, 21,33ms + +Avec les unités suivantes +* ms : millisecondes +* Kbps : Kilo-bits par seconde (rappel : 1Mbps = 1024Kbps, 1KByte = 8Kbits) +* Mbps : Méga-bits par seconde + +| Canaux | Qualité | Bande passante (pour un tampon : 2,67ms) | Bande passante (pour un tampon : 5,33ms) | Bande passante (pour un tampon : 10,67ms) | Bande passante (pour un tampon : 21,33ms) | +| --------- | ------- | -------- | -------- | -------- | -------- | +| Stéréo | Haute | 894 Kbps | 657 Kbps | 541 Kbps | 483 Kbps | +| Stéréo | Moyenne | 672 Kbps | 444 Kbps | 328 Kbps | 270 Kbps | +| Stéréo | Basse | 606 Kbps | 372 Kbps | 256 Kbps | 198 Kbps | +| Mono | Haute | 672 Kbps | 444 Kbps | 328 Kbps | 270 Kbps | +| Mono | Moyenne | 594 Kbps | 366 Kbps | 250 Kbps | 192 Kbps | +| Mono | Basse | 534 Kbps | 306 Kbps | 190 Kbps | 132 Kbps | + +## Bande passante réseau + +Il y a un débit montant (le musicien envoie au serveur) et un débit descendant (le serveur renvoie le mixage au musicien) ![image](https://user-images.githubusercontent.com/9976944/79274940-999b0b00-7ea5-11ea-85be-3ded5ee198d5.png) + +Notez également que le taux de transfert ADSL2 moyen est de 10 Mbits/seconde pour le débit descendant et de 1 Mbit/seconde pour le débit montant. Les performances réelles dépendent de la distance par rapport au fournisseur, qui peut [théoriquement varier de 24 Mb/s à 0,3 km à 1,5 Mb/s à 5,2 km] (https://fr.wikipedia.org/wiki/ADSL#Estimation_du_d%C3%A9bit_maximal_r%C3%A9el_en_fonction_de_la_longueur_de_la_ligne) pour le taux de téléchargement. From 744b87199a7b6597e7cd4163cd1d4669ef845fab Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 17 Dec 2020 20:55:01 +0100 Subject: [PATCH 106/280] [fr] Network-Requirements: fixes a broken link (#198) (#199) Co-authored-by: Olivier Humbert --- wiki/fr/fr-Network-Requirements.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/fr/fr-Network-Requirements.md b/wiki/fr/fr-Network-Requirements.md index 074274161..1238c9f92 100644 --- a/wiki/fr/fr-Network-Requirements.md +++ b/wiki/fr/fr-Network-Requirements.md @@ -32,4 +32,4 @@ Avec les unités suivantes Il y a un débit montant (le musicien envoie au serveur) et un débit descendant (le serveur renvoie le mixage au musicien) ![image](https://user-images.githubusercontent.com/9976944/79274940-999b0b00-7ea5-11ea-85be-3ded5ee198d5.png) -Notez également que le taux de transfert ADSL2 moyen est de 10 Mbits/seconde pour le débit descendant et de 1 Mbit/seconde pour le débit montant. Les performances réelles dépendent de la distance par rapport au fournisseur, qui peut [théoriquement varier de 24 Mb/s à 0,3 km à 1,5 Mb/s à 5,2 km] (https://fr.wikipedia.org/wiki/ADSL#Estimation_du_d%C3%A9bit_maximal_r%C3%A9el_en_fonction_de_la_longueur_de_la_ligne) pour le taux de téléchargement. +Notez également que le taux de transfert ADSL2 moyen est de 10 Mbits/seconde pour le débit descendant et de 1 Mbit/seconde pour le débit montant. Les performances réelles dépendent de la distance par rapport au fournisseur, qui peut [théoriquement varier de 24 Mb/s à 0,3 km à 1,5 Mb/s à 5,2 km](https://fr.wikipedia.org/wiki/ADSL#Estimation_du_d%C3%A9bit_maximal_r%C3%A9el_en_fonction_de_la_longueur_de_la_ligne) pour le taux de téléchargement. From f0c01d0f5d335d7f65620a18865a17ac2e73cbbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9rald=20Niel?= Date: Fri, 18 Dec 2020 07:47:04 +0100 Subject: [PATCH 107/280] Avoid repetition: fix redundant link. --- wiki/en/en-Choosing-a-Server-Type.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/wiki/en/en-Choosing-a-Server-Type.md b/wiki/en/en-Choosing-a-Server-Type.md index eb883e812..5887094da 100644 --- a/wiki/en/en-Choosing-a-Server-Type.md +++ b/wiki/en/en-Choosing-a-Server-Type.md @@ -53,6 +53,4 @@ Normal server operators can also register with your custom central server so the To run a server as a central server, it should be configured with `--centralserver localhost` (that is, specify itself as the central server to query). -If you want to control which servers can register with your central server, you can enable a whitelist with the `--listfilter` command line option. See the [command line options page](Command-Line-Options) for further information about this feature. - -See also [Command Line Options](Command-Line-Options) for other parameters you can set. +If you want to control which servers can register with your central server, you can enable a whitelist with the `--listfilter` command line option. See the [command line options page](Command-Line-Options) for further information about this feature and other parameters you can set. From cc4b4db3dc04a291861f8510a7ca9175837b17c2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 18 Dec 2020 14:20:37 +0100 Subject: [PATCH 108/280] Let's match the title of the linked page. (#200) (#202) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Gérald Niel --- 1-fr-index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/1-fr-index.html b/1-fr-index.html index 88358ed94..7defc61b3 100644 --- a/1-fr-index.html +++ b/1-fr-index.html @@ -34,7 +34,7 @@

      Jamulus dans le monde

      Partout dans le monde, Jamulus permet à d'immenses chorales de chanter, à de bruyants groupes de rock de jouer, et réunit des musiciens folkloriques et classiques. Il est utilisé pour les cours de musique à distance, dans des écoles et des universités, en privé et en public. Même pour une simple discussion, tout cela en temps réel sur Internet, comme si vous y étiez en personne.

      Besoin d'aide ?

      - Lisez la documentation. Regardez bien la section « Problèmes potentiels » ! + Lisez la documentation. Regardez bien la section dépannage ! Vous pouvez aussi demander de l'aide dans le forum.

    From f76542e6db1831f7e90b9ba3e09c5f47ce2df916 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Fri, 18 Dec 2020 15:27:20 +0100 Subject: [PATCH 109/280] Add @gegeweb rec --- 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 7e503c586..cce472b8e 100644 --- a/wiki/en/en-Getting-Started.md +++ b/wiki/en/en-Getting-Started.md @@ -39,7 +39,7 @@ Also - [Jamulus OS!](https://sourceforge.net/projects/jamulus-os/files/JamulusOS ## Recommended hardware -In general, your device must support a sample rate of **48kHz** (DVD quality). On Windows it's recommended to choose a device with a native [ASIO](https://en.wikipedia.org/wiki/Audio_Stream_Input/Output) driver. +In general, your device must support a sample rate of **48kHz** (DVD quality) and should allow you to listen to the computer's audio signal. On Windows it's recommended to choose a device with a native [ASIO](https://en.wikipedia.org/wiki/Audio_Stream_Input/Output) driver. See [the list of known good hardware](Sound-Devices). From 1e47c102257cb94909cf139b08c7d3fb49d98dff Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 18 Dec 2020 17:57:17 +0100 Subject: [PATCH 110/280] [fr] fr-Server-Troubleshooting.md (#145) (#203) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * W: [fr] fr-Server-Troubleshooting.md * [fr] update fr-Server-Troubleshooting.md Co-authored-by: Olivier Humbert Co-authored-by: Gérald Niel Co-authored-by: Olivier Humbert --- wiki/fr/fr-Server-Troubleshooting.md | 52 ++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 wiki/fr/fr-Server-Troubleshooting.md diff --git a/wiki/fr/fr-Server-Troubleshooting.md b/wiki/fr/fr-Server-Troubleshooting.md new file mode 100644 index 000000000..b25a1b6ee --- /dev/null +++ b/wiki/fr/fr-Server-Troubleshooting.md @@ -0,0 +1,52 @@ +--- +layout: wiki +title: "Dépannage serveur" +lang: "fr" +permalink: "/wiki/Server-Troubleshooting" +--- + +# Troubleshooting + +## Serveurs - public + +### Pourquoi mon serveur n'apparaît pas dans la liste ? Pourquoi n'y est-il pas inscrit ? + +Si votre serveur est bien inscrit (vous pouvez [vérifier ici](http://jamulus.softins.co.uk/) - en anglais) et que vous ou vos amis ne pouvez pas voir votre serveur, vous pourriez avoir besoin d'attendre, ou démarrer votre client avec l'option `--showallservers` et essayer de vous connecter à partir de là ([voir cette page](Command-Line-Options) à propos de la façon de démarrer votre client avec une option de configuration). + +Si vous voyez un message indiquant que le serveur est complet, veuillez [voir cette note](Central-Servers) à propos des serveurs centraux. + +Vous pouvez vous assurez que votre serveur est listé dans le genre pertinent en [le vérifiant ici](http://jamulus.softins.co.uk/) (en anglais). + +## Serveurs - privés + +### J'exécute mon client sur la même machine/réseau que mon serveur, mais je ne peux pas m'y connecter + +Connectez votre client à l'adresse `127.0.0.1` (ou `localhost` si cela fonctionne pour vous). Si vous utilisez le client sur une machine différente du serveur mais sur le même réseau, alors connectez-vous à l'adresse du serveur sur le _réseau local_. Ne vous connectez pas via l'adresse publique (WAN) du serveur. + +### Quelle adresse dois-je communiquer aux personnes pour qu'elles puissent se connecter à mon serveur ? + +Il doit s'agir de votre adresse IP **publique** (à trouver auprès de [Google](https://www.google.com/search?q=whatsmyip)). Connectez votre **propre** client Jamulus à l'adresse IP **locale** de votre serveur (127.0.0.1 s'il est sur la même machine que votre client). Notez que votre adresse IP publique peut changer : voir la note sur le « DNS dynamique » dans [ce guide](Running-a-Private-Server). + +### Quels sont les numéros de port que je peux utiliser ? + +Conservez les ports UDP par défaut. Le port par défaut réel est documenté dans les [options en ligne de commande](Command-Line-Options). Au moment de la rédaction de cette documentation, le numéro de port est **22124**. + +### Un serveur privé est-il un serveur direct sans contact avec le serveur central Jamulus ? + +Oui. Veuillez consulter [types de serveur](Choosing-a-Server-Type). + +### Puis-je convertir mon serveur privé en serveur public ? + +Oui, il suffit de cocher la case « Rendre mon serveur public » dans la fenêtre du serveur et de remplir les détails. Souvenez-vous que vous n'avez pas non plus besoin de faire une redirection de port si vous avez un serveur public. + +### **_Serveur sans IUG sou Linux_** : j'ai créé un serveur mais il est en train de rejoindre le serveur central et je ne veux pas qu'il le fasse. + +Pour activer un serveur privé, n'utilisez pas l'option `--centralserver` (`-e`) lorsque vous lancez la ligne de commande de votre serveur. + +### Personne ne peut se connecter à mon serveur, mais je peux m'y connecter localement + +Certains FAI utilisent des techniques telles que « [Address plus Port (A+P)](https://en.wikipedia.org/wiki/Address_plus_Port) » (en anglais) ou [NAT de classe transporteur (CGN)](https://fr.wikipedia.org/wiki/Carrier-grade_NAT) pour conserver l'espace d'adressage. Cela rend impossible l'hébergement de services comme Jamulus à domicile (et peut provoquer le fait que vous ne puissiez pas non plus voir les listes de serveurs sur votre client, ou qu'il vous manque [certains serveurs spécifiques](https://sourceforge.net/p/llcon/discussion/server/thread/f72b293af0/) (en anglais)). + +Pour détecter si le CGN est en cause, aller à l'écran de configuration de votre routeur (typiquement, 192.168.X.X) et regardez la page d'état du WAN. Si l'adresse IPv4 listée ne correspond pas à l'adresse que vous voyez [ici](https://ifconfig.me), alors cela signifie que le CGN pourrait être activé. Ou si vous rencontrez des problèmes tels que l'impossibilité de [se connecter à des serveurs ou une liste de serveurs vide](https://sourceforge.net/p/llcon/discussion/533517/thread/b3eea395c4/) (en anglais), cela pourrait également être un indicateur que votre FAI est également à l'origine du problème. + +Pour résoudre le problème : si vous utilisez un serveur public, essayez [la redirection de port](Running-a-Private-Server#redirection-de-port). Si vous utilisez un serveur privé et que vous faites déjà de la redirection de port, contactez le support de votre FAI et demandez leur de vous retirer du CGN et de vous attribuer une véritable adresse IP WAN en expliquant que vous voulez héberger un serveur. Si le CGN n'est pas la cause du problème, vous devrez peut-être demander à votre FAI de vous donner une adresse IP WAN (ou une fixe pour éviter d'utiliser DDNS, si possible). Si tout le reste échoue, envisager l'hébergement sur une plate-forme dans le nuage (certains fournisseurs proposent des périodes d'essai gratuites). From 7200770cf61f45f722144b549c8d3f728d6b99eb Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Fri, 18 Dec 2020 19:52:55 +0100 Subject: [PATCH 111/280] a few small typos fixed --- wiki/en/en-Demos.md | 1 - wiki/en/en-Hardware-Setup.md | 4 +--- wiki/en/en-Installation-for-Linux.md | 3 +-- wiki/en/en-Network-Requirements.md | 1 - wiki/en/en-Running-a-Private-Server.md | 4 ++-- wiki/en/en-Server-Linux.md | 2 +- wiki/en/en-Server-Win-Mac.md | 4 ---- wiki/en/en-Tips-Tricks-More.md | 4 ---- 8 files changed, 5 insertions(+), 18 deletions(-) diff --git a/wiki/en/en-Demos.md b/wiki/en/en-Demos.md index 93decd18f..b45b28cf4 100644 --- a/wiki/en/en-Demos.md +++ b/wiki/en/en-Demos.md @@ -5,7 +5,6 @@ lang: "en" permalink: "/wiki/Demos" --- - # Examples of Jamulus in Use **Feel free to add your own!** diff --git a/wiki/en/en-Hardware-Setup.md b/wiki/en/en-Hardware-Setup.md index 332ed3173..9fc7b1298 100644 --- a/wiki/en/en-Hardware-Setup.md +++ b/wiki/en/en-Hardware-Setup.md @@ -5,7 +5,6 @@ lang: "en" permalink: "/wiki/Hardware-Setup" --- - # Hardware Setup ## General info @@ -52,7 +51,6 @@ Connect your instrument to the input plugs of the Behringer U-CONTROL UCA202. Pl You're done! Have fun! - ## Linux: Audio interface connection with QJackCtrl Refer to the Linux [client install guide](Installation-for-Linux#configure-jack-with-qjackctl). @@ -75,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 Mbps down / 1 Mbps 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 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!) ## Having problems? diff --git a/wiki/en/en-Installation-for-Linux.md b/wiki/en/en-Installation-for-Linux.md index 0e005be43..e62d22075 100644 --- a/wiki/en/en-Installation-for-Linux.md +++ b/wiki/en/en-Installation-for-Linux.md @@ -18,7 +18,7 @@ There is also list of unofficial [packages for different distributions here](htt ## Get Jamulus sources -1. Open up a terminal window (command line - `CTRL+ALT+t` on Ubuntu and related distros) +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 @@ -68,7 +68,6 @@ make sudo make install ``` - ## Set up your sound card ### Configure JACK with QjackCtl diff --git a/wiki/en/en-Network-Requirements.md b/wiki/en/en-Network-Requirements.md index f5fc506dc..e0be92b84 100644 --- a/wiki/en/en-Network-Requirements.md +++ b/wiki/en/en-Network-Requirements.md @@ -34,4 +34,3 @@ There is one upstream (musician sending to the server) and one downstream (serve ![image](https://user-images.githubusercontent.com/9976944/79274940-999b0b00-7ea5-11ea-85be-3ded5ee198d5.png) Note also that mean ADSL2 transfer rate is 10 Mbits/second for downstream and 1 Mbit/second for upstream. The actual performance depends on distance to the provider, which may [theoretically range from 24Mb/s at 0.3km to 1.5Mb/s at 5.2km](https://en.wikipedia.org/wiki/Asymmetric_digital_subscriber_line) for download rate. - diff --git a/wiki/en/en-Running-a-Private-Server.md b/wiki/en/en-Running-a-Private-Server.md index 8f898ffa0..f189ad78e 100644 --- a/wiki/en/en-Running-a-Private-Server.md +++ b/wiki/en/en-Running-a-Private-Server.md @@ -9,7 +9,7 @@ permalink: "/wiki/Running-a-Private-Server" **_Please ensure you have read the [server overview](Running-a-Server)_** -This guide assumes you will be running a private server on your home network, but some of the issues here may also apply to those running on cloud hosts (e.g. Amazon EC2). +This guide assumes you will be running a private server on your home network, but some of the issues here may also apply to those running on cloud hosts (e.g. Amazon EC2). It is highly recommended to test your server in **public mode first** so as to narrow down any subsequent problems in private mode. @@ -33,7 +33,7 @@ Once you have your router set up, you can get your external (WAN) IP address e.g * You do not need to open a port range as shown in the example above as long as you want to start only one instance of the Jamulus server on the same machine. -* If using a different port than the default port (22124) you have to enter the port number after the server name or IP address separated by a colon in the Jamulus client (e. g. jamulus.dyndns.org:22120). +* If using a different port than the default port (22124) you have to enter the port number after the server name or IP address separated by a colon in the Jamulus client (e.g. jamulus.example.org:22120). * See also this excellent [guide to running a private server](https://www.facebook.com/notes/jamulus-online-musicianssingers-jamming/how-to-create-a-private-server-for-band-rehearsals/508642543044030/) by [Simon Tomlinson](https://www.facebook.com/simon.james.tomlinson?eid=ARBQoY3KcZAtS3pGdLJuqvQTeRSOo4gHdQZT7nNzOt1oPMGgZ4_3GERe-rOyH5PxsSHVYYXjWwcqd71a) on Facebook. diff --git a/wiki/en/en-Server-Linux.md b/wiki/en/en-Server-Linux.md index 172e0f3b6..9821fda52 100644 --- a/wiki/en/en-Server-Linux.md +++ b/wiki/en/en-Server-Linux.md @@ -155,7 +155,7 @@ See also [Command Line Options](Command-Line-Options) for other parameters you c When using the [recording function](Server-Win-Mac#recording) with the `-R` [command line option](Command-Line-Options), if the server receives a SIGUSR1 signal during a recording, it will start a new recording in a new directory. SIGUSR2 will toggle recording enabled on/off. -To send these signals using systemd, create the following two `.service` files in `/etc/systemd/system`, calling them something appropriate (eg `newRecording-Jamulus-server.service`). +To send these signals using systemd, create the following two `.service` files in `/etc/systemd/system`, calling them something appropriate (e.g. `newRecording-Jamulus-server.service`). For turning recording on or off (depending on the current state): diff --git a/wiki/en/en-Server-Win-Mac.md b/wiki/en/en-Server-Win-Mac.md index b8fb7b3c6..a90358afe 100644 --- a/wiki/en/en-Server-Win-Mac.md +++ b/wiki/en/en-Server-Win-Mac.md @@ -51,10 +51,6 @@ For headless servers: you can control the recording function [using these instru (Leave the "Custom Central Server Address" field empty unless you need to list your server on a [private central server](Choosing-a-Server-Type#3-central)) - - - - *** See also [Command Line Options](Command-Line-Options) for other parameters you can set. diff --git a/wiki/en/en-Tips-Tricks-More.md b/wiki/en/en-Tips-Tricks-More.md index c499e64bb..6adfd6bb0 100644 --- a/wiki/en/en-Tips-Tricks-More.md +++ b/wiki/en/en-Tips-Tricks-More.md @@ -11,8 +11,6 @@ permalink: "/wiki/Tips-Tricks-More" Jamulus user [Chris Rimple](https://sourceforge.net/u/chrisrimple/profile/) has compiled a massive amount of information relating to [Remote Band Rehearsals](https://docs.google.com/document/d/1smcvsxdaaViPQvGMQHmah_6BQeqowhmGSFMHfnlY2FI/) (Google doc), which covers topics such as hardware and software configuration including examples and advice for newcomers to the field. He also includes a section on Jamulus in comparison to other solutions. - - ## 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). @@ -96,8 +94,6 @@ jack_connect Jamulus:'output left' system:playback_1 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. From 737a84b1e68c17c58ccf1cf743dd567f8ba585da Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Fri, 18 Dec 2020 20:02:02 +0100 Subject: [PATCH 112/280] fix a few sounddevices --- wiki/en/en-Sound-Devices.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wiki/en/en-Sound-Devices.md b/wiki/en/en-Sound-Devices.md index 5e1d7a44f..63abbe7c0 100644 --- a/wiki/en/en-Sound-Devices.md +++ b/wiki/en/en-Sound-Devices.md @@ -13,7 +13,7 @@ This page lists hardware known to work or not work with Jamulus (although it may #### USB Microphones -* Blue Yeti microphone. Works well on Mac (there is a checkbox to turn off local monitoring). Works OK on Windows with ASIO4all but with a bit more latency than on Mac. You can turn off the local monitoring if you go deep into the settings. Latency on Linux is good but I did not find any way to turn off the local monitoring. +* Blue Yeti microphone. Works well on Mac (there is a checkbox to turn off local monitoring). Works OK on Windows with ASIO4ALL but with a bit more latency than on Mac. You can turn off the local monitoring if you go deep into the settings. Latency on Linux is good but I did not find any way to turn off the local monitoring. * [Shure X2u](https://www.shure.com/en-GB/products/accessories/x2u-xlr-usb-interface) XLR to USB audio interface with headphone jack, converting an XLR mic into a USB mic. Set PC/Mic mix dial to 100% PC and listen to the output on headphones. Tested using Raspberry Pi 4 running Raspberry Pi OS Buster, kernel version 4.19. @@ -39,11 +39,11 @@ This page lists hardware known to work or not work with Jamulus (although it may * Behringer XENYX Q502USB (USB audio) [Behringer ASIO Driver](http://www.behringerdownload.de/_software/BEHRINGER_2902_X64_2.8.40.zip) -* Behringer XENYX Q802USB (USB audio) [Behringer ASIO Driver](http://www.behringerdownload.de/_software/BEHRINGER_2902_X64_2.8.40.zip). This Behringer ASIO Driver does not appear to be very good. Audio latency with this 'unsupported' driver seems poor - not better than ASIO4all. It's good device for Mac and Linux, but perhaps not for Windows. More testing is required. +* Behringer XENYX Q802USB (USB audio) [Behringer ASIO Driver](http://www.behringerdownload.de/_software/BEHRINGER_2902_X64_2.8.40.zip). This Behringer ASIO Driver does not appear to be very good. Audio latency with this 'unsupported' driver seems poor - not better than ASIO4ALL. It's good device for Mac and Linux, but perhaps not for Windows. More testing is required. * Behringer XR18/XR16/XR12 digital mixers (USB Audio) -* Edirol FA-66 (Firewire) - good on Mac, Linux, and Windows [ASIO driver](https://www.roland.com/global/products/fa-66/downloads/) +* Edirol FA-66 (FireWire) - good on Mac, Linux, and Windows [ASIO driver](https://www.roland.com/global/products/fa-66/downloads/) * Focusrite Clarett 4Pre interface (Thunderbolt 2) @@ -57,7 +57,7 @@ This page lists hardware known to work or not work with Jamulus (although it may * Line 6 Helix Stomp, read [Remote Jamming with Helix and Jamulus](https://jimamsden.wordpress.com/2020/04/04/remote-jamming-with-helix-and-jamulus/) for setup on a Mac. (USB Audio) -* MOTU Ultralite (2010 firewire model mk1/mk2), 2015 MacBook Pro, OS X El Capitan 10.11.6, Apple Thunderbolt/Firewire adapter. +* MOTU Ultralite (2010 FireWire model mk1/mk2), 2015 MacBook Pro, OS X El Capitan 10.11.6, Apple Thunderbolt/FireWire adapter. * Native Instruments Komplete Audio 2, Tested on Win10 with 64 sample buffer and am getting great sound and total latency around 15ms over the ping time. (USB Audio) From d051d01db8b34b4d05e5b8a3df521f8a343280f3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 19 Dec 2020 19:11:22 +0100 Subject: [PATCH 113/280] W: [fr] fr-Server-Win-Mac.md (#119) (#205) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * W: [fr] fr-Server-Win-Mac.md * [fr] update fr-Server-Win-Mac.md Co-authored-by: Olivier Humbert Co-authored-by: Gérald Niel Co-authored-by: Olivier Humbert --- wiki/fr/fr-Server-Win-Mac.md | 55 ++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 wiki/fr/fr-Server-Win-Mac.md diff --git a/wiki/fr/fr-Server-Win-Mac.md b/wiki/fr/fr-Server-Win-Mac.md new file mode 100644 index 000000000..435e4888e --- /dev/null +++ b/wiki/fr/fr-Server-Win-Mac.md @@ -0,0 +1,55 @@ +--- +layout: wiki +title: "Installation du serveur – Windows et macOS" +lang: "fr" +permalink: "/wiki/Server-Win-Mac" +--- + +# Installation sous Windows et macOS +_(Note: les copies d'écran ont été faite avec l'interface en anglais, les termes utilisés par la suite dans ce document correspondent aux termes employés dans l'interface graphique du logiciel en français.)_ + +**_Assurez-vous d'avoir lu la page d'[aperçu d'un serveur](Running-a-Server)_** + +* **Utilisateurs de Windows** : démarrez le serveur en utilisant l'entrée « Jamulus Server » du menu démarrer de Windows. + +* **Utilisateurs de macOS** : double-cliquez sur l'icône « Jamulus server » dans Applications (en supposant que vous y avez placé les fichiers de l'installation conformément conformément à [ces instructions](Installation-for-macOS)). + +* **Utilisateurs de Linux** : veuillez vous référer aux [instructions serveur avec IUG](Server-Linux#running-a-server-with-the-gui). + +configuration du serveur + +### Configuration d'un serveur public + +1. En cochant l'option « Rendre mon serveur public », vous devriez voir un message de confirmation indiquant si votre serveur s'est inscrit avec succès. + +1. Renseignez le nom, la ville et le pays, pour que les autres utilisateurs puissent vous identifier facilement. + +1. Spécifiez un genre musical si vous le souhaitez. Votre serveur apparaitra alors dans la liste des serveurs pertinents pour les clients (voir davantage de [détails à propos des serveurs centraux](Central-Servers)) + +_Le message de bienvenue du tchate apparaît pour tous les utilisateurs lorsqu'ils rejoignent le serveur (la fenêtre de tchate s'ouvrira automatiquement pour eux)._ + +### Configuration d'un serveur privé + +Si vous ne cochez pas « Rendre mon serveur public », vous obtiendrez un serveur privé et vous devrez [lire ces instructions](Running-a-Private-Server). + +_Si vous souhaitez **exécuter un client sur la même machine**, vous devriez **connecter le client à l'adresse `127.0.0.1`** pour une meilleure performance. (De même, si vous souhaitez connecter un client sur une autre machine de votre réseau local, utilisez l'adresse IP du réseau local du serveur)._ + +### Enregistrement + +Activez l'enregistrement du serveur en paramétrant d'abord le répertoire d'enregistrement dans l'onglet Options. L'enregistrement commence dès que la première personne se connecte au serveur et s'arrête lorsque la dernière personne le quitte. Utilisez le bouton « Nouvel enregistrement » pour créer un nouveau sous-répertoire dans lequel les enregistrements seront stockés. Notez que les enregistrements sont sauvegardés par piste au format `.lof` d'[Audacity](https://www.audacityteam.org/) (en anglais) et `.rpp` de [REAPER](https://fr.wikipedia.org/wiki/Reaper_(logiciel)). Ouvrez les fichiers respectifs pour les écouter dans ces applications. + +_Note : lorsque votre serveur enregistre, les clients afficheront un message indiquant que l'enregistrement est en cours._ + +Pour les serveurs sans IUG : vous pouvez contrôler la fonction d'enregistrement en [suivant ces instructions](Server-Linux#gestion-des-enregistrements). + +### Autres options + +jamulus-server + +**Utilisateurs Windows** : si vous souhaitez que le serveur se lance automatiquement au démarrage du système, cochez l'option correspondante. + +(Laissez le champ « Adresse personnalisée du serveur central » vide, sauf si vous devez inscrire votre serveur sur un [serveur central privé](Choosing-a-Server-Type#3-serveur-central)) + +*** + +Consulter également les [options en ligne de commande](Command-Line-Options) pour d'autres paramètres que vous pouvez configurer. From 6122006115bdd053c48439f420f91fc9d04437dd Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Sat, 19 Dec 2020 21:33:12 +0100 Subject: [PATCH 114/280] Make the download more prominent --- wiki/en/en-Installation-for-Windows.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wiki/en/en-Installation-for-Windows.md b/wiki/en/en-Installation-for-Windows.md index 553427b93..4b6bb099b 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)](https://www.asio4all.org){: target="_blank" rel="noopener noreferrer"} before installing Jamulus. -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. [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. **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). From 9d951f14dc4c5950841c88d4e5ffd8771432364b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 19 Dec 2020 21:36:17 +0100 Subject: [PATCH 115/280] Get closer to english (#206) Co-authored-by: ann0see <20726856+ann0see@users.noreply.github.com> --- wiki/de/de-Installation-for-Windows.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/de/de-Installation-for-Windows.md b/wiki/de/de-Installation-for-Windows.md index 1f39be293..75528d78c 100644 --- a/wiki/de/de-Installation-for-Windows.md +++ b/wiki/de/de-Installation-for-Windows.md @@ -8,7 +8,7 @@ permalink: "/wiki/Installation-for-Windows" # Installation auf Windows Wenn du die [Erste Schritte](Getting-Started) Seite noch nicht gelesen hast, solltest du das nachholen. 1. **Downloade und installiere einen ASIO-Treiber**. Wir empfehlen, eine Soundkarte/Interface mit einem nativen, herstellereigenen ASIO-Treiber zu verwenden. Wenn kein nativer ASIO-Treiber vorhanden ist (v.A. bei integrierten Soundkarten), installiere [ASIO4ALL](http://www.asio4all.org){: target="_blank" rel="noopener noreferrer"} vor der Installation von Jamulus. -1. [Downloade und installiere Jamulus](https://sourceforge.net/projects/llcon/files/latest/download){: target="_blank" rel="noopener noreferrer"}. Wenn du eine Warnung bekommst, klicke auf „Mehr Infos“ und „Trotzdem ausführen“, um Jamulus zu installieren. Du siehst diese Meldung, da wir momentan Jamulus nicht signieren. +1. [Downloade und installiere Jamulus](https://sourceforge.net/projects/llcon/files/latest/download){: target="_blank" rel="noopener noreferrer"}. Wenn du eine Warnung bekommst, klicke auf „Mehr Infos“ und „Trotzdem ausführen“, um Jamulus zu installieren. Du siehst diese Meldung, da wir momentan nicht für ein Software Zertifikat für Jamulus zahlen. 1. Starte Jamulus. Jetzt kannst du Jamulus wie jedes andere Programm öffnen. 1. **Richte deine Soundkarte ein**. Wenn du Jamulus installiert hast, musst du deine Audio-Hardware einrichten. Wenn du ASIO4All nutzt, schau dir die [Einrichtung](#asio4all-einrichten) an (scrolle etwas nach unten) sonst kannst du gleich deine Audio-Hardware einrichten. Siehe [Hardware-Setup](Hardware-Setup). From 39bfc20351efd252b85447c845cafd1d1014acaf Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 20 Dec 2020 17:51:59 +0100 Subject: [PATCH 116/280] [fr] Create fr-Choosing-a-Server-Type.md (#115) (#207) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * W: [fr] fr-Choosing-a-Server-Type.md * Little rewording, ready for review. * [fr] update fr-Choosing-a-Server-Type.md Co-authored-by: Olivier Humbert Co-authored-by: Gérald Niel Co-authored-by: Olivier Humbert --- wiki/fr/fr-Choosing-a-Server-Type.md | 60 ++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 wiki/fr/fr-Choosing-a-Server-Type.md diff --git a/wiki/fr/fr-Choosing-a-Server-Type.md b/wiki/fr/fr-Choosing-a-Server-Type.md new file mode 100644 index 000000000..a8f8c5d16 --- /dev/null +++ b/wiki/fr/fr-Choosing-a-Server-Type.md @@ -0,0 +1,60 @@ +--- +layout: wiki +title: "Choisir un type de serveur" +lang: "fr" +permalink: "/wiki/Choosing-a-Server-Type" +--- + +# Types de serveur + +Vous pouvez administrer votre serveur dans un de ces trois « modes » (soit à domicile, soit chez un hôte tiers) : + +### 1. Public +Votre serveur sera listé dans la liste du [serveur central](Central-Servers) que les clients utilisent par défaut. Les musiciens pourront alors découvrir et se connecter à votre serveur. Il n'est pas forcément nécessaire de le faire fonctionner comme un serveur public puisque beaucoup d'autres personnes en administrent déjà. Il suffit de se connecter à un serveur à faible latence et de commencer à bœuffer. + +![Serveur public](https://user-images.githubusercontent.com/9108457/100002427-d37da980-2dc4-11eb-9a22-ac575cf0d6bf.png) + +Ce mode est activé en cochant l'option "Rendre mon serveur public" et (éventuellement) en saisissant les informations relatives à votre serveur + +Quand vous utilisez un serveur sans IUG, la suite devrait permettre de configurer un serveur public : + +~~~ +Jamulus --nogui --server \ + --centralserver genreServer:port \ + --serverinfo "yourServerName;yourCity;[country ID]" +~~~ + +**Note** : il n'est **pas** nécéssaire de faire de la redirection de port ou de configurer votre routeur pour administrer un serveur public. + +Voir aussi les [options en ligne de commande](Command-Line-Options) pour d'autres paramètres que vous pouvez configurer. + + +### 2. Privé + +Ce type de serveur ne sera pas listé sur un serveur central. Vous devez donner l'adresse de votre serveur aux musiciens pour qu'ils y connectent leurs clients. Voir [Administration d'un serveur privé](Running-a-Private-Server) pour savoir ce qu'il faut faire pour permettre à d'autres de s'y connecter. + +![Serveur privé](https://user-images.githubusercontent.com/9108457/100002706-3a02c780-2dc5-11eb-8c7c-816e0cc02ed6.png) + +Ce mode est activé en décochant l'option « Rendre mon serveur public ». + +Lors d'une utilisation sans IUG, la suite devrait permettre de configurer un serveur privé : + +```shell +Jamulus --nogui --server +``` + +Voir aussi les [options en ligne de commande](Command-Line-Options) pour d'autres paramètres que vous pouvez configurer. + +### 3. Central + +La configuration de votre serveur en tant que serveur central ne doit être effectuée que dans des circonstances particulières (par exemple, pour des événements en ligne ou des associations musicales). La plupart des gens peuvent ignorer ce type. + +Pour voir les serveurs listés sur un serveur central personnalisé, les musiciens doivent entrer l'adresse dans le champ « Serveur central personnalisé » des paramètres de leur client. Ils verront alors une liste générée par ce serveur central dans les paramètres de connexion. + +Les administrateurs de serveurs normaux peuvent également s'inscrire sur votre serveur central personnalisé afin que leurs serveurs apparaissent dans votre liste de serveurs en paramétrant le vôtre avec l'option `--centralserver`. + +Pour démarrer le serveur en tant que serveur central, il doit être configuré avec `--centralserver localhost` (c'est-à-dire, se spécifier comme le serveur central à interroger). + +Si vous voulez contrôler les serveurs qui peuvent s'inscrire sur votre serveur central, vous pouvez activer une liste blanche avec l'option en ligne de commande `--listfilter`. Voir les [options en ligne de commande](Command-Line-Options) pour davantage d'informations sur cette fonctionnalité. + +Voir aussi [les options en ligne de commande](Command-Line-Options) pour les autres paramètres que vous pouvez configurer. From 4f1a5699bae84012b766fd6d46ef41a3c6794e3c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 21 Dec 2020 15:25:14 +0100 Subject: [PATCH 117/280] W: [fr] fr-Running-a-Private-Server.md (#116) (#208) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * W: [fr] fr-Running-a-Private-Server.md * [fr] fr-Running-a-Private-Server.md update Co-authored-by: Olivier Humbert Co-authored-by: Gérald Niel Co-authored-by: Olivier Humbert --- wiki/fr/fr-Running-a-Private-Server.md | 55 ++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 wiki/fr/fr-Running-a-Private-Server.md diff --git a/wiki/fr/fr-Running-a-Private-Server.md b/wiki/fr/fr-Running-a-Private-Server.md new file mode 100644 index 000000000..8db48ba25 --- /dev/null +++ b/wiki/fr/fr-Running-a-Private-Server.md @@ -0,0 +1,55 @@ +--- +layout: wiki +title: "Administrer un serveur privé" +lang: "fr" +permalink: "/wiki/Running-a-Private-Server" +--- + +# Administrer un serveur privé + +**_Assurez-vous d'avoir lu [Administration d’un serveur](Running-a-Server)_** + +Ce guide suppose que vous utiliserez un serveur privé sur votre réseau domestique, mais certains des points évoqués ici pourraient également s'appliquer à ceux qui fonctionnent sur des hôtes dans le nuage (par exemple Amazon EC2). + +Il est fortement recommandé de tester votre serveur en **mode public d'abord** afin de limiter les éventuels problèmes ultérieurs en mode privé. + +## Administration d'un serveur privé derrière un routeur de réseau domestique + +### Redirection de port + +Pour faire fonctionner un serveur privé, vous devez configurer la redirection de port sur votre routeur. _(Si vous êtes curieux de savoir pourquoi vous devez faire cela pour les serveurs privés mais pas pour les serveurs publics, voir [cette note de base de page](#notes-pour-les-geeks))_. + +Normalement, les personnes extérieures à votre réseau domestique ne peuvent pas voir les choses à l'intérieur de celui-ci. Donc si vous voulez faire fonctionner un serveur Jamulus chez vous, vous devez ouvrir un trou dans votre routeur pour permettre aux clients Jamulus de s'y connecter. + +**Le port par défaut de la version actuelle de Jamulus est le port UDP (et non TCP) 22124.** + +La configuration exacte de la redirection de port diffère pour chaque routeur. Voici un exemple de paramètres de redirection de port dans un routeur Linksys : + +![Linksysportforwarding](https://user-images.githubusercontent.com/4561747/97542495-bc62bc00-19be-11eb-8e54-b6e906e676f6.jpg) + +Pour obtenir de l'aide, voir : [portforward.com](https://portforward.com) (en anglais). + +Une fois votre routeur configuré, vous pouvez obtenir votre adresse IP externe (WAN), par exemple en [utilisant Google](https://www.google.com/search?q=what+is+my+ip). Donnez cette adresse à vos amis pour qu'ils puissent se connecter à votre serveur (_mais voir aussi la note sur le DNS dynamique ci-dessous_). Quant à vous, vous devez vous connecter à votre propre ordinateur à la place, puisque c'est votre ordinateur qui fait tourner le serveur. Par conséquent, **seulement vous** devez vous connecter à `127.0.0.1`. + +### Points à noter + +* Vous n'avez pas besoin d'ouvrir une plage de ports comme montré dans l'exemple ci-dessus tant que vous ne souhaitez démarrer qu'une seule instance du serveur Jamulus sur la même machine. + +* Si vous utilisez un port différent du port par défaut (22124), vous devez entrer le numéro de port après le nom du serveur ou l'adresse IP, séparés par un double-point dans le client Jamulus (par exemple jamulus.dyndns.org:22120). + +* Voir aussi cet excellent [guide pour la gestion d'un serveur privé](https://www.facebook.com/notes/jamulus-online-musicianssingers-jamming/how-to-create-a-private-server-for-band-rehearsals/508642543044030/) (en anglais) par [Simon Tomlinson](https://www.facebook.com/simon.james.tomlinson?eid=ARBQoY3KcZAtS3pGdLJuqvQTeRSOo4gHdQZT7nNzOt1oPMGgZ4_3GERe-rOyH5PxsSHVYYXjWwcqd71a) sur Facebook. + +## Le DNS dynamique et pourquoi vous en aurez probablement besoin + +La plupart des connexions internet domestiques changent d'adresse IP après un certain temps (heures, jours ou semaines). Pour faciliter la connexion, vous pouvez donc également mettre en place une adresse DNS dynamique. Vous pouvez le faire sur [la machine](https://www.online-tech-tips.com/computer-tips/ddns-dynamic-dns-service/) (en anglais) sur laquelle vous faites tourner le serveur Jamulus ou, de préférence, sur votre routeur [s'il le prend en charge](https://www.noip.com/support/knowledgebase/how-to-configure-ddns-in-router/) (en anglais). + +Notez aussi que votre routeur domestique peut également modifier l'adresse IP de la machine sur laquelle vous administrez votre serveur. Dans ce cas, vous pourriez devoir donner à cette machine une adresse IP statique dans la configuration DHCP du routeur, ou simplement faire un transfert de port vers toutes les adresses de votre réseau local (LAN). + + +## Notes de bas de page pour les geeks + +L'une des nombreuses fonctionnalités de Jamulus qui le rendent orgasmiquement merveilleux est le fait que vous puissiez installer un serveur en quelques secondes. Mais pourquoi les serveurs publics n'ont-ils pas besoin d'une redirection de port pour cela ? + +Normalement, les pare-feu de traduction d'adresse réseau (NAT) empêchent les requêtes entrantes initiées depuis l'extérieur du réseau local. Le trafic entrant n'est possible que pour les paquets _reliés à une demande sortante_ (à proprement parler, les paquets « liés » et « établis » à une connexion sortante initiale). En mode public, lorsque votre serveur Jamulus se connecte à un serveur central, il initie bien sûr une connexion sortante. À partir de ce moment, le serveur central envoie des « pings » de connexion (établis/liés) (pas des pings ICMP) à votre serveur à intervalles réguliers pour maintenir le(s) port(s) NAT pertinent(s) ouvert(s) sur votre routeur/pare-feu. + +Toutefois, en mode privé, les clients doivent _initier_ des connexions dans le réseau du serveur. Les pare-feu NAT empêchent cela, et vous devez donc leur dire d'autoriser les requêtes de connexion entrantes sur le port Jamulus en utilisant la redirection de port. From 05a3c6071903d8626d5e59203a8a82eabee61d3e Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Mon, 21 Dec 2020 18:07:04 +0100 Subject: [PATCH 118/280] uncomment kb --- 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 ea7585c18..4934d58e2 100644 --- a/wiki/en/en-Onboarding.md +++ b/wiki/en/en-Onboarding.md @@ -42,7 +42,7 @@ While we're already here: "Settings" opens – of course – the settings window More information about using Jamulus can be found in the [Software Manual](Software-Manual). ## Advanced - + Of course, you can do a lot more with Jamulus (like setting up a private server, doing online concerts,...). Have a look at the navigation on this website. Furthermore, the community publishes guides, tips, tricks in the [knowledge base](/kb/). ## Help and Community If you need help or want to contribute to the Jamulus Project, you can have a look at the following links: From e5da747a69161efb751727ff006306e52d536208 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Mon, 21 Dec 2020 19:17:45 +0100 Subject: [PATCH 119/280] [en] consistency: Internet speed not clear: MBit/s, Mbps,... (#204) * MBit/s * kbps --> Kbit/s * consistency * add spaces * add more spaces --- wiki/en/en-Getting-Started.md | 2 +- wiki/en/en-Hardware-Setup.md | 2 +- wiki/en/en-Network-Requirements.md | 22 +++++++++++----------- wiki/en/en-Running-a-Server.md | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/wiki/en/en-Getting-Started.md b/wiki/en/en-Getting-Started.md index cce472b8e..9392c5227 100644 --- a/wiki/en/en-Getting-Started.md +++ b/wiki/en/en-Getting-Started.md @@ -64,5 +64,5 @@ Further information about how to avoid listening to yourself (and help with othe _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 every client. If a server is made public and registered on a central server, its information will be broadcasted to all clients._ ## Footnotes -[^1]: [Full details here](Network-Requirements){: target="_blank" rel="noopener noreferrer"}. If you have 10Mbits down and 1Mbps up, you're unlikely to run into bandwidth-related issues. +[^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). diff --git a/wiki/en/en-Hardware-Setup.md b/wiki/en/en-Hardware-Setup.md index 9fc7b1298..86fe8f3a0 100644 --- a/wiki/en/en-Hardware-Setup.md +++ b/wiki/en/en-Hardware-Setup.md @@ -71,7 +71,7 @@ _(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. +**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!) diff --git a/wiki/en/en-Network-Requirements.md b/wiki/en/en-Network-Requirements.md index e0be92b84..f5d799c08 100644 --- a/wiki/en/en-Network-Requirements.md +++ b/wiki/en/en-Network-Requirements.md @@ -12,25 +12,25 @@ permalink: "/wiki/Network-Requirements" The audio settings have an impact on the required network bandwidth. The below table summarizes the network requirements with respect to the configuration of: * channels : stereo/mono * quality : high/medium/low -* audio buffer duration : 2.67ms, 5.33ms, 10.67ms, 21.33ms +* audio buffer duration : 2.67 ms, 5.33 ms, 10.67 ms, 21.33 ms With the following units * ms : milliseconds -* Kbps : Kilo-bits per seconds (Reminder : 1Mbps = 1024Kbps, 1KByte = 8Kbits) -* Mbps : Mega-bits per seconds +* Kbit/s : Kilo-bits per seconds (Reminder : 1 Mbit/s = 1024 Kbit/s, 1 KByte/s = 8 Kbit/s) +* Mbit/s : Mega-bits per seconds -| Channels | Quality | Bandwidth (for buffer : 2.67ms) | Bandwidth (for buffer : 5.33ms) | Bandwidth (for buffer : 10.67ms) | Bandwidth (for buffer : 21.33ms) | +| 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) | | --------- | ------ | -------- | -------- | -------- | -------- | -| Stereo | High | 894 Kbps | 657 Kbps | 541 Kbps | 483 Kbps | -| Stereo | Medium | 672 Kbps | 444 Kbps | 328 Kbps | 270 Kbps | -| Stereo | Low | 606 Kbps | 372 Kbps | 256 Kbps | 198 Kbps | -| Mono | High | 672 Kbps | 444 Kbps | 328 Kbps | 270 Kbps | -| Mono | Medium | 594 Kbps | 366 Kbps | 250 Kbps | 192 Kbps | -| Mono | Low | 534 Kbps | 306 Kbps | 190 Kbps | 132 Kbps | +| 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 | +| Stereo | Low | 606 Kbit/s | 372 Kbit/s | 256 Kbit/s | 198 Kbit/s | +| Mono | High | 672 Kbit/s | 444 Kbit/s | 328 Kbit/s | 270 Kbit/s | +| Mono | Medium | 594 Kbit/s | 366 Kbit/s | 250 Kbit/s | 192 Kbit/s | +| Mono | Low | 534 Kbit/s | 306 Kbit/s | 190 Kbit/s | 132 Kbit/s | ## Network bandwidth 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 Mbits/second for downstream and 1 Mbit/second for upstream. The actual performance depends on distance to the provider, which may [theoretically range from 24Mb/s at 0.3km to 1.5Mb/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.3km to 1.5 Mbit/s at 5.2km](https://en.wikipedia.org/wiki/Asymmetric_digital_subscriber_line) for download rate. diff --git a/wiki/en/en-Running-a-Server.md b/wiki/en/en-Running-a-Server.md index 9bb4996b4..215fbb9da 100644 --- a/wiki/en/en-Running-a-Server.md +++ b/wiki/en/en-Running-a-Server.md @@ -39,7 +39,7 @@ Once any issues with musicians have been solved in this way, you can then invest ### Bandwidth – do you have enough? -A typical jam might have 4 people, for which you would need 200Kbps * 4 = 800Kbs (0.8Mbps) up and down. So if you have a 10Mbits down and 1Mbps up broadband connection, **you may start running out of bandwidth if a fifth player joins**, particularly if other musicians choose settings that increase their usage. You may want to [check that you have enough speed](https://fast.com) for that. [Read more about bandwidth use](Network-Requirements) at different quality settings. +A typical jam might have 4 people, for which you would need 200 Kbit/s * 4 = 800 Kbit/s (0.8 Mbit/s) up and down. So if you have a 10 Mbit/s down and 1 Mbit/s up broadband connection, **you may start running out of bandwidth if a fifth player joins**, particularly if other musicians choose settings that increase their usage. You may want to [check that you have enough speed](https://fast.com) for that. [Read more about bandwidth use](Network-Requirements) at different quality settings. ### In general From ffd5d94ac3ffa210c06f8112e8d5553f30a01a37 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Mon, 21 Dec 2020 22:21:57 +0100 Subject: [PATCH 120/280] remove some target blank --- wiki/en/en-Hardware-Setup.md | 4 ++-- wiki/en/en-Installation-for-Linux.md | 4 ++-- wiki/en/en-Installation-for-Macintosh.md | 2 +- wiki/en/en-Installation-for-Windows.md | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/wiki/en/en-Hardware-Setup.md b/wiki/en/en-Hardware-Setup.md index 86fe8f3a0..c2c06464f 100644 --- a/wiki/en/en-Hardware-Setup.md +++ b/wiki/en/en-Hardware-Setup.md @@ -25,7 +25,7 @@ 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"}. +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). 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.**_ @@ -56,7 +56,7 @@ 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/){: target="_blank" rel="noopener noreferrer"} 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 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. ## Points to note about inputs diff --git a/wiki/en/en-Installation-for-Linux.md b/wiki/en/en-Installation-for-Linux.md index e62d22075..8be779230 100644 --- a/wiki/en/en-Installation-for-Linux.md +++ b/wiki/en/en-Installation-for-Linux.md @@ -14,7 +14,7 @@ Although we don't provide official packages, you might find Jamulus in the packa [![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 need to 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). If you don't find it in your package manager, you need to compile Jamulus from source. That's quite easy: ## Get Jamulus sources @@ -71,7 +71,7 @@ sudo make install ## Set up your sound card ### Configure JACK with QjackCtl -Jamulus clients need [JACK](https://jackaudio.org/){: target="_blank" rel="noopener noreferrer"} to run, but you need to configure that first. The recommended method is to use `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** 2. Configure your audio interface as follows (the exact settings for JACK will depend on what your audio interface/sound card is capable of): diff --git a/wiki/en/en-Installation-for-Macintosh.md b/wiki/en/en-Installation-for-Macintosh.md index ee7446df4..1a4f4e394 100644 --- a/wiki/en/en-Installation-for-Macintosh.md +++ b/wiki/en/en-Installation-for-Macintosh.md @@ -31,7 +31,7 @@ To open Jamulus 1. Now control-click (or right-click) on Jamulus, 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 about this warning see [this Apple Support Page](https://support.apple.com/en-gb/guide/mac-help/mh40616/mac){: target="_blank" rel="noopener noreferrer"}. +For further information about this warning see [this Apple Support Page](https://support.apple.com/en-gb/guide/mac-help/mh40616/mac). ## All installed? Jamulus has been installed and can be used now. You can now take a look at the diff --git a/wiki/en/en-Installation-for-Windows.md b/wiki/en/en-Installation-for-Windows.md index 4b6bb099b..8627e2bbb 100644 --- a/wiki/en/en-Installation-for-Windows.md +++ b/wiki/en/en-Installation-for-Windows.md @@ -44,7 +44,7 @@ Concerning the inputs/outputs: Headphones and speakers are often labeled as outp 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](https://github.com/trombonepizza){: target="_blank" rel="noopener noreferrer"} which gives more detailed setup information on ASIO4ALL. +Have a look at [this video](https://youtu.be/_GzOsitVgLI) from [trombonepizza](https://github.com/trombonepizza) which gives more detailed setup information on ASIO4ALL. 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\`). From fc7d947c03c1aeb406559c351cad1f576519d023 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Mon, 21 Dec 2020 22:24:09 +0100 Subject: [PATCH 121/280] fix syntax --- 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 ee7446df4..b7e3ca5f0 100644 --- a/wiki/en/en-Installation-for-Macintosh.md +++ b/wiki/en/en-Installation-for-Macintosh.md @@ -10,7 +10,7 @@ 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. **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. **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. From fa3c141014df5e87c8a5130bfbdc406a3ed0f0dd Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Mon, 21 Dec 2020 22:25:33 +0100 Subject: [PATCH 122/280] add anc to compiling os --- wiki/en/en-Installation-for-Macintosh.md | 2 +- wiki/en/en-Installation-for-Windows.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wiki/en/en-Installation-for-Macintosh.md b/wiki/en/en-Installation-for-Macintosh.md index b7e3ca5f0..bc89e07f1 100644 --- a/wiki/en/en-Installation-for-Macintosh.md +++ b/wiki/en/en-Installation-for-Macintosh.md @@ -16,7 +16,7 @@ Make sure you've already read the [Getting Started](Getting-Started) page. _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) if you feel so inclined. +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 4b6bb099b..b414480cf 100644 --- a/wiki/en/en-Installation-for-Windows.md +++ b/wiki/en/en-Installation-for-Windows.md @@ -13,7 +13,7 @@ Make sure you read the [Getting Started](Getting-Started) page. 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. +You can also [compile your own binary](Compiling#windows) if you feel so inclined. *** From 9ca5edd7b1c9ad5bfb43ac2a862a8b366bbb526f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 22 Dec 2020 22:49:07 +0100 Subject: [PATCH 123/280] W: [fr] fr-Hardware-Setup.md (#117) (#209) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * W: [fr] fr-Hardware-Setup.md * Update fr-Hardware-Setup.md Co-authored-by: Olivier Humbert Co-authored-by: Gérald Niel Co-authored-by: Olivier Humbert --- wiki/fr/fr-Hardware-Setup.md | 80 ++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100644 wiki/fr/fr-Hardware-Setup.md diff --git a/wiki/fr/fr-Hardware-Setup.md b/wiki/fr/fr-Hardware-Setup.md new file mode 100644 index 000000000..ef8a016b1 --- /dev/null +++ b/wiki/fr/fr-Hardware-Setup.md @@ -0,0 +1,80 @@ +--- +layout: wiki +title: "Configuration du matériel" +lang: "fr" +permalink: "/wiki/Hardware-Setup" +--- + + +# Configuration du matériel + +## Infos générales + +**Pour que Jamulus soit stable, il est recommandé d'utiliser un PC avec une fréquence processeur d'au moins 1,5 GHz** + +**Utilisateurs de Windows :** vous devez installer un pilote ASIO. Une carte son avec un pilote ASIO natif est recommandée. Consultez la page [Installation sous Windows](Installation-for-Windows) pour plus d'informations. + +## Exemples de configurations + +L'installation du matériel se résume généralement en quatre points, bien que chaque configuration soit différente. + +1. Brancher l'interface audio à un port USB de votre ordinateur +2. Fermer tous les programmes et démarrer Jamulus (n'oubliez pas de choisir les bonnes entrées dans les paramètres de Jamulus) +3. Brancher votre instrument/microphone et votre casque +4. Se connecter à un serveur Jamulus et s'amuser ! + + +## Windows : connexion de l'interface audio - ASIO4All + +Voici un exemple d'installation de client Windows avec un périphérique audio [Behringer U-CONTROL UCA202]https://www.amazon.com/Behringer-U-Phono-UFO202-Audiophile-Interface/dp/B002GHBYZ0){: target="_blank" rel="noopener noreferrer"} (en anglais). +Les instructions suivantes devraient être similaires à celles pour d'autres périphériques audio. + +_**La méthode exacte pour connecter vos instruments différera évidement en fonction de votre matériel**_ + +#### 1. Brancher l'interface audio à un port USB de votre ordinateur + +Par la suite, utilisez toujours le même port USB pour le périphérique audio. + +**Utilisateurs de Windows** : si ce n'est pas encore fait, téléchargez et installez le [pilote audio ASIO (ASIO4ALL) gratuit](https://www.asio4all.org){: target="_blank" rel="noopener noreferrer"}. Certaines personnes ont également indiqué avoir utilisé avec succès [ce pilote ASIO natif](http://www.behringerdownload.de/_software/BEHRINGER_2902_X64_2.8.40.zip){: target="_blank" rel="noopener noreferrer"} +__actuellement non disponible__, bien qu'il ne figure plus sur les pages produits Berhinger en avril 2020. + +#### 2. Démarrez Jamulus + +Configurez Jamulus pour qu'il utilise la configuration sonore correcte (voir [cet excellent guide](https://www.facebook.com/notes/jamulus-online-musicianssingers-jamming/idiots-guide-to-jamulus-app/510044532903831/) (en anglais) par [Simon Tomlinson](https://www.facebook.com/simon.james.tomlinson?eid=ARBQoY3KcZAtS3pGdLJuqvQTeRSOo4gHdQZT7nNzOt1oPMGgZ4_3GERe-rOyH5PxsSHVYYXjWwcqd71a) sur Facebook). + +Assurez vous d'avoir bien éteint le bouton de monitoring de votre Behringer U-CONTROL UCA202 (sinon vous entendrez à la fois le son original que vous envoyez au serveur Jamulus ainsi que le son revenant, et vous risquez d'avoir un retour). + +#### 3. Branchez votre instrument et votre casque + +Branchez votre instrument sur les fiches d'entrée du Behringer U-CONTROL UCA202. Branchez votre casque sur le Behringer U-CONTROL UCA202. + +#### 4. Connectez vous a un serveur Jamulus. + +Vous y êtes ! Amusez-vous ! + +## Linux : connexion de l'interface audio avec QjackCtl + +Consultez la page du [guide d'installation du client](Installation-for-Linux#configurer-jack-avec-qjackctl). + +## Linux : noyaux à faible latence pour Jamulus +Vous voudrez peut-être installer [Ubuntu Studio](https://ubuntustudio.org/){: target="_blank" rel="noopener noreferrer"}, elle propose une seconde option à votre menu de démarrage avec un noyau à faible latence. La clef d'un bœuf résussi est la « faible latence » entre les serveurs et les clients Jamulus connectés. Si le système Linux sous-jacent est démarré avec une faible latence, cela a un impact positif sur vos sessions Jamulus. + +## Points à noter à propos des entrées + +- Si vous voulez connecter deux sources ou plus (par exemple, voix + synthé + guitare), il est important de noter que Jamulus ne supporte pour le moment que deux canaux d'entrée (G/D). Donc le matériel utilisé doit produire un mixage stéréo en sortie vers Jamulus. +- Les interfaces audio ressortent généralement un signal mixé sur leurs sorties analogiques, mais des signaux séparés (un par source) sur leurs sorties numériques (USB/Firewire/Thunderbolt). +- Les consoles de mixage ne ressortent généralement qu'un signal mixé sur leur sorties analogiques. +- Les consoles de mixage avec USB/Firewire/Thunderbolt ne ressortent généralement qu'un signal mixé sur leurs sorties **analogiques** ET uniquement des signaux séparés (pas de signal mixé) sur leurs sorties **numériques**. +- Quelques consoles de mixage avec USB/Firewire/Thunderbolt ressortiront soit **seulement** un signal mixé sur la sortie **numérique** (consoles d'entrée de bas de gamme), soit AJOUTERONT aussi un signal mixé aux signaux séparés sur la sorties numériques. + +_(Merci à [pcar75](https://github.com/pcar75) pour cette information)_ + +## Autres exemples + +**Cette vidéo documente une [session de bœuf live](https://youtu.be/c8838jS2g3U).** J'utilise une carte audio Lexicon Omega USB sur un Mac Mini de 2009. Les membres de mon groupe utilisent tous sous Windows 10 et ont des cartes audio Behringer, par exemple la Behringer Xenyx 1204USB. Ma connexion internet a 10 Mb/s en descendant et 1 Mb/s en montant via DSL. + +**Un utilisateur de Jamulus [Andrew Evans](https://sourceforge.net/u/belvario/profile/)**: les membres du groupe sont tous dans la même ville (mais connectés avec deux FAI) et atteignent un temps de ping de 20 ms, le serveur fonctionnant sur une machine Windows dédiée séparée et un client sur un Macbook Pro. Les joueurs distants avec un Macbook Air. Tous en connexions filaires ethernet sur leurs routeurs/passerelles personnels. Nous avons utilisé la vidéo WhatsApp pour nous voir (avec l'audio en sourdine - c'est drôle de constater à quel point l'audio de Whatsapp est en retard par rapport à Jamulus !) + +## Des problèmes ? + +Veuillez consulter la [FAQ sur le dépannage client](Client-Troubleshooting) From 47fa85612d54e8cb14354095ba18bad05d39daa6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 23 Dec 2020 18:43:34 +0100 Subject: [PATCH 124/280] W: [fr] fr-Server-Linux.md (#118) (#212) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * W: [fr] fr-Server-Linux.md * [fr] update fr-Server-Linux.md Co-authored-by: Olivier Humbert Co-authored-by: Gérald Niel Co-authored-by: Olivier Humbert --- wiki/fr/fr-Server-Linux.md | 216 +++++++++++++++++++++++++++++++++++++ 1 file changed, 216 insertions(+) create mode 100644 wiki/fr/fr-Server-Linux.md diff --git a/wiki/fr/fr-Server-Linux.md b/wiki/fr/fr-Server-Linux.md new file mode 100644 index 000000000..f14fb063a --- /dev/null +++ b/wiki/fr/fr-Server-Linux.md @@ -0,0 +1,216 @@ +--- +layout: wiki +title: "Installation d'un serveur sous Linux" +lang: "fr" +permalink: "/wiki/Server-Linux" +--- + +# Installation d'un serveur sous Linux + +**_Veuillez d'abord vous assurez d'avoir lu la [vue générale d'un serveur](Running-a-Server)_** + + +## Exécuter un serveur avec IUG + +Si vous prévoyez d'exécuter le serveur sur votre poste de travail (et que vous avez déjà installé le client Jamulus), vous pouvez exécuter le serveur dans le [mode serveur](Choosing-a-Server-Type) choisi en exécutant Jamulus avec l'option `-s` comme suit : + +1. Ouvrir une fenêtre de terminal (`CTRL+ALT+t` sur Ubuntu et distributions associées). +1. Partant du principe que Jamulus est dans `/usr/local/bin`, taper `Jamulus -s` + +Appuyez sur entrée et vous devriez voir la fenêtre de contrôle du serveur. Vous pouvez arrêter le serveur en fermant la fenêtre du serveur, ou en tapant CTRL+C dans le terminal. + +**Pour configurer le serveur**, veuillez vous référer aux [instructions pour Windows et Macintosh](Server-Win-Mac). + +Voir aussi les [options en ligne de commande](Command-Line-Options) pour les autres paramètres que vous pouvez configurer. + +## Exécuter un serveur sans IUG + +Le guide suivant permet d'utiliser Jamulus comme un serveur "pur" sur du **matériel sans audio** (par exemple sur un hôte tiers ou dans le nuage) et suppose des distributions Ubuntu/Debian utilisant systemd. Nous avons également des instructions pour [Raspberry Pi](Server-Rpi), qui est aussi très bien. + +* _L'utilisateur de Jamulus [Grigory](https://sourceforge.net/u/cidnurg/profile/), maintient une **[image Docker pour Jamulus](https://hub.docker.com/r/grundic/jamulus)** que vous pouvez utiliser._ + +### Compilation des sources, création d'un utilisateur + + +1. [Téléchargez les sources](Installation-for-Linux#obtenir-les-sources-de-jamulus), installez les [paquets dépendants](Installation-for-Linux#installation-des-dépendances) comme indiqué dans le guide d'installation du client Linux. À noter que **vous n'avez pas besoin d'installer le(s) paquet(s) JACK** pour un serveur sans IUG. _Si vous prévoyez d'éxecuter un serveur sans IUG sous Gentoo, ou que vous compilez sous Ubuntu pour une utilisation sur une autre machine Ubuntu, [voir les notes de bas de page](#que-fait-le-drapeau-de-compilation--headless--)._ +1. Compilez les sources en ignorant la bibliothèque audio JACK : + +~~~ +qmake "CONFIG+=nosound headless" Jamulus.pro +make clean +make +~~~ + +3. Déplacez le fichier binaire `Jamulus` résultant vers un emplacement permanent, ou utilisez la commande `sudo make install`. Vous pouvez désormais retirer le répertoire des sources si vous le désirez. +  +**Le reste de ce guide suppose que vous utilisez `/usr/local/bin/Jamulus`**. + +4. Créez un utilisateur système sans privilège pour le fonctionnement du serveur (il s'exécutera en tant qu'utilisateur _jamulus_, groupe _nogroup_.) : + +`sudo adduser --system --no-create-home jamulus` + +### Création d'un script de démarrage + +Après avoir décidé dans quel mode vous souhaitez faire fonctionner votre serveur, utilisez systemd pour le démarrer. + +Créez un fichier d'unité systemd qui lancera le serveur au moment du démarrage (merci à [David Harrold](https://sourceforge.net/u/dkxl/profile/) pour cela). + +Le fichier d'unité applique une priorité élevée au processeur et à l'ordonnancement des E/S au traitement du serveur. Ceci est optionnel (et peut être ignoré sur certains hôtes). + +Notez aussi que les entrées de journalisation du serveur iront dans journalctl (utilisez [journald](https://www.digitalocean.com/community/tutorials/how-to-use-journalctl-to-view-and-manipulate-systemd-logs) pour les consulter). + +**Note** : le reste de ce guide suppose que vous êtes en mode "public" en utilisant l'option `-e` (`--centralserver`). Ceci précise dans quelle liste de genres musicaux votre serveur apparaîtra. Voir [la liste des genres disponibles ici](Central-Servers)). + +~~~ +[Unit] +Description=Jamulus-Server +After=network.target + +[Service] +Type=simple +User=jamulus +Group=nogroup +NoNewPrivileges=true +ProtectSystem=true +ProtectHome=true +Nice=-20 +IOSchedulingClass=realtime +IOSchedulingPriority=0 + +#### Change this to set genre, location and other parameters. +#### See [Command-Line-Options](Command-Line-Options) #### +ExecStart=/usr/local/bin/Jamulus -s -n -e jamulus.fischvolk.de -o "yourServerName;yourCity;[country ID]" + +Restart=on-failure +RestartSec=30 +StandardOutput=journal +StandardError=inherit +SyslogIdentifier=jamulus + +[Install] +WantedBy=multi-user.target +~~~ + +Copier le fichier d'unité dans `/etc/systemd/system` et donnez lui les permissions : + +`sudo cp jamulus.service /etc/systemd/system/jamulus.service` + +`sudo chmod 644 /etc/systemd/system/jamulus.service` + + +Testez que ça démarre bien : + +`sudo systemctl start jamulus` + +`sudo systemctl status jamulus` + +Vous devriez voir quelque chose comme ceci : + +~~~ +● jamulus.service + Loaded: loaded (/lib/systemd/system/jamulus.service; enabled; vendor preset: enabled) + Active: active (running) since Thu 2020-03-26 11:52:34 GMT; 4s ago + Main PID: 1308 (Jamulus) + Tasks: 2 (limit: 4915) + CGroup: /system.slice/jamulus.service + └─1308 /usr/local/bin/Jamulus -s -n -e jamulus.fischvolk.de -o yourServerName;yourCity;[country ID] + +Mar 26 11:52:34 oddjob systemd[1]: Started jamulus.service. +Mar 26 11:52:35 oddjob jamulus[1308]: - server mode chosen +Mar 26 11:52:35 oddjob jamulus[1308]: - no GUI mode chosen +Mar 26 11:52:35 oddjob jamulus[1308]: - central server: jamulus.fischvolk.de +Mar 26 11:52:35 oddjob jamulus[1308]: - server info: yourServerName;yourCity;[country ID] +Mar 26 11:52:35 oddjob jamulus[1308]: - welcome message: Thanks for connecting! +Mar 26 11:52:35 oddjob jamulus[1308]: *** Jamulus, Version [version] +Mar 26 11:52:35 oddjob jamulus[1308]: *** Internet Jam Session Software +Mar 26 11:52:35 oddjob jamulus[1308]: *** Under the GNU General Public License (GPL) +~~~ + +Si tout va bien, activez le service de lancement au démarrage avec : + +`sudo systemctl enable jamulus` + +Vous pouvez aussi contrôler Jamulus avec la commande `service`. Par exemple : + +`sudo service jamulus status` + +qui indique si Jamulus fonctionne bien, et affiche les quelques dernières lignes du journal (où vous verrez les connexions actives). +Note : pressez `q` pour quitter le statut de service. + +### Mettre à jour votre installation vers une nouvelle version + +Téléchargez les nouvelles sources comme indiqué dans les [instructions ci-dessus](#compilation-des-sources--creation-d-un-utilisateur) et répétez la compilation à l'étape 2 comme pour une nouvelle installation. Arrêtez le serveur, copiez le fichier binaire Jamulus en écrasant l'ancien, et redémarrez le serveur. + +*** + +Voir aussi les [options en ligne de commandee](Command-Line-Options) pour les autres paramètres que vous pouvez configurer. + +## Notes de bas de page + +### Contrôler les enregistrements + +Lorsque vous utilisez la [fonction d'enregistrement](Server-Win-Mac#enregistrement) avec [l'option en ligne de commande](Command-Line-Options) `-R`, si le serveur reçoit un signal SIGUSR1 pendant un enregistrement, il commencera un nouvel enregistrement dans un nouveau répertoire. SIGUSR2 activera/désactivera l'enregistrement. + +Pour envoyer ces signaux en utilisant systemd, créez les deux fichiers `.service` suivants dans `/etc/systemd/system`, en les appelant par un nom approprié (par exemple `nouvelEnregistrement-Jamulus-server.service`). + +Pour activer ou désactiver l'enregistrement (en fonction de l'état courant) : + +~~~ +[Unit] +Description=Toggle recording state of Jamulus server +Requisite=Jamulus-Server + +[Service] +Type=oneshot +ExecStart=/bin/systemctl kill -s SIGUSR2 Jamulus-Server +~~~ + +Pour démarrer un nouvel enregistrement : + +~~~ +[Unit] +Description=Start a new recording on Jamulus server +Requisite=Jamulus-Server + +[Service] +Type=oneshot +ExecStart=/bin/systemctl kill -s SIGUSR1 Jamulus-Server +~~~ + +_Note : le nom du service Jamulus dans la ligne `ExecStart` doit être le même que le nom du fichier `.service` que vous avez créé lors de la configuration de systemd pour contrôler votre serveur Jamulus. Ainsi dans cet exemple, ça serait `Jamulus-Server.service`._ + +Exécutez `sudo systemctl daemon-reload` pour les sauvegarder pour la première utilisation. + +Vous pouvez maintenant les exécuter avec la commande `service start`, par exemple : + +`sudo service jamulusTogglerec start` (en supposant que vous ayez nommé votre fichier d'unité `jamulusTogglerec.service`) + +Vous pouvez voir le résultat de ces commandes di vous lancez `service jamulus status`, ou en consultant les journaux. + +### Consulter les journaux + +Jamulus journalisera dans le fichier du système si vous avez laissé le paramètre `StandardOutput=journal` dans le fichier d'unité. Il est recommandé de se connecter au journal du système, car le système gère le fichier journal pour vous, sans avoir à revenir pour le purger plus tard ou à vous soucier du remplissement de votre disque. + +Pour lire le journal, utilisez `journalctl` (pressez Ctrl-C pour quitter). Par exemple, pour lire le fichier de journalisation du système, filtré sur le service Jamulus : + +`journalctl -u jamulus` + +Pour les entrées du jour : + +`journalctl -u jamulus` + +Pour la dernière heure : + +`journalctl -u jamulus --since "1 hour ago"` + +Filtrez le journal pour voir les messages de connexion de votre serveur Jamulus : + +`journalctl -u jamulus | grep connected` + +Suivre (affichez à l'écran) les messages du journal Jamulus en temps réel : + +`journalctl -f -u jamulus` + +### Que fait le drapeau de compilation « headless » ? + +Bien que cela ne soit pas strictement nécessaire, nous recommandons d'utiliser le drapeau `headless` pour accélérer le processus de construction. Les utilisateurs de Gentoo devraient également éviter d'installer certaines dépendances en conséquence. [Plus d'informations ici](Compiling#le-fanion-de-compilation-headless). From d437130cda032354d7c42b9ff876b03bfd2c5757 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Wed, 23 Dec 2020 18:45:39 +0100 Subject: [PATCH 125/280] Add link to ASIO4ALL manual --- wiki/en/en-Installation-for-Windows.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wiki/en/en-Installation-for-Windows.md b/wiki/en/en-Installation-for-Windows.md index b414480cf..793996fca 100644 --- a/wiki/en/en-Installation-for-Windows.md +++ b/wiki/en/en-Installation-for-Windows.md @@ -46,7 +46,8 @@ Afterwards try to **setup the inputs/outputs again**. Enabled and accessible inp Have a look at [this video](https://youtu.be/_GzOsitVgLI){: target="_blank" rel="noopener noreferrer"} from [trombonepizza](https://github.com/trombonepizza){: target="_blank" rel="noopener noreferrer"} which gives more detailed setup information on ASIO4ALL. -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\`). +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 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\`)). ## All installed? From 9d7378f48489f865267e719c171e331dbe113029 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 26 Dec 2020 13:03:01 +0100 Subject: [PATCH 126/280] Update de-Contribution.md (#214) Co-authored-by: ann0see <20726856+ann0see@users.noreply.github.com> --- wiki/de/de-Contribution.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/de/de-Contribution.md b/wiki/de/de-Contribution.md index 320899d34..93dbe8c1e 100644 --- a/wiki/de/de-Contribution.md +++ b/wiki/de/de-Contribution.md @@ -5,7 +5,7 @@ lang: "de" permalink: "/wiki/Contribution" --- -# Beitragen zum Jamulus Project +# Bei Jamulus mithelfen ## Jamulus Software * Wenn du Code beisteuern willst, poste deine Idee im [developer forum](https://sourceforge.net/p/llcon/discussion/developerforum/)(Englisch), damit wir deine Idee erst diskutieren können. Danach kannst du einen Pull Request eröffnen. Lies dir am Besten erst einmal das [manifesto for contributions](https://github.com/corrados/jamulus/issues/596) von Volker Fischer (Hauptentwickler) durch. From 62592674c0f8770550802928a91e10cf209e1939 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Sat, 26 Dec 2020 13:21:49 +0100 Subject: [PATCH 127/280] Update de-Installation-for-Windows.md --- wiki/de/de-Installation-for-Windows.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wiki/de/de-Installation-for-Windows.md b/wiki/de/de-Installation-for-Windows.md index 75528d78c..a02166499 100644 --- a/wiki/de/de-Installation-for-Windows.md +++ b/wiki/de/de-Installation-for-Windows.md @@ -19,7 +19,7 @@ Wenn du willst, kannst du Jamulus auch selbst [kompilieren](Compiling). ## ASIO4All einrichten *Fast alle integrierten Soundkarten benötigen diesen Treiber. Du solltest ASIO4All nur dann nutzen, wenn deine Soundkarte keinen nativen, vom Hersteller der Soundkarte entwickelten ASIO Treiber anbietet, da native ASIO Treiber eine bessere Latenz haben könnten.* -Wenn du ASIO4All nutzt, musst du möglicherweise ein bisschen herumprobieren, bis du deine individuell richtige Konfiguration eingestellt hast. Jeder PC ist etwas anders. Am Besten verbindest du dich mit einem Server und richtest dann gleichzeitig ASIO4All ein. Das erleichtert dir das Setup, da du dann mit deinem Instrument oder deiner Stimme testen kannst, ob alles richtig eingestellt ist. +Wenn du ASIO4All nutzt, musst du möglicherweise ein bisschen herumprobieren, bis du deine individuell richtige Konfiguration eingestellt hast, da jeder PC immer etwas anders ist. Am Besten verbindest du dich mit einem Server und richtest dann gleichzeitig ASIO4All ein. Das erleichtert dir das Setup, da du dann mit deinem Instrument oder deiner Stimme testen kannst, ob alles richtig eingestellt ist. Bevor du Jamulus startest solltest du: @@ -29,10 +29,10 @@ Bevor du Jamulus startest solltest du: ### ASIO4All Ein/Ausgänge einrichten (Anleitung) 1. Jamulus Einstellungen öffnen (linke Spalte in Jamulus) -1. Klick auf _„ASIO-Einstellungen“_ +1. Klick auf _„ASIO-Einstellung“_ 1. Aktiviere die _erweiterte Ansicht_ in ASIO4ALL (klicke auf das Werkzeug-Icon unten rechts) 1. Aktiviere nur die Soundkarte, die du nutzen willst, indem du auf den Knopf direkt neben dem Namen der Soundkarte klickst -1. Öffne deine Soundkarte, um die Ein/Ausgänge anzuzeigen +1. Öffne deine Soundkarte über das Plus-Icon neben der Soundkarte, um die Ein/Ausgänge anzuzeigen 1. Aktiviere die richtigen Ein/Ausgänge in der Liste unter deiner Soundkarte und deaktiviere alle anderen Ein/Ausgänge **Tipp:** Viele interne Soundkarten heißen Realtek High Definition Audio, Conexant oder ähnlich. From add51421c0a6e45255993c584583a97dc6c11a94 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 26 Dec 2020 13:22:14 +0100 Subject: [PATCH 128/280] Update de-Getting-Started.md (#215) Co-authored-by: ann0see <20726856+ann0see@users.noreply.github.com> --- wiki/de/de-Getting-Started.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wiki/de/de-Getting-Started.md b/wiki/de/de-Getting-Started.md index d5157f6d3..d7099661d 100644 --- a/wiki/de/de-Getting-Started.md +++ b/wiki/de/de-Getting-Started.md @@ -17,11 +17,11 @@ permalink: "/wiki/Getting-Started" ### 1. Verringere die Latenz durch wenig Internetverkehr und schließe alle Programme auf deinem PC -Während du Jamulus verwendest, versuche keine anderen Programme auf deinem PC auszuführen und den Internetverkehr in deinem Netzwerk so gering wie möglich zu halten, damit die Audioverzögerung gering bleibt. Das heißt, dass du parallel z.B. keinen Videostream anschauen solltest. +Während du Jamulus verwendest sollten keine anderen Programme auf deinem PC bzw. andere Familienmitglieder in deinem Netzwerk das Internet benutzen. Das heißt, dass du parallel z.B. keinen Videostream anschauen solltest, da sonst die Tonqualität massiv leidet. ### 2. Nutze ein Audiointerface/USB-Mikrofon, nicht deine interne Soundkarte -Obwohl du auch das eingebaute Mikrofon und damit die Soundkarte deines Computers nutzen kannst, ist die Qualität und Latenz von externen Soundkarten (Interfaces) normalerweise deutlich besser. Ein Audiointerface ist eine Box, an die du dein(e) Instrument(e) anschließen kannst. Normalerweise verbindet man ein Interface per USB mit deinem PC. Du kannst natürlich auch ein externes USB-Mikrofon nutzen. Mehr Infos findest du unter [Audiohardware](#audiohardware). +Obwohl du auch das eingebaute Mikrofon und damit die Soundkarte deines Computers nutzen kannst, ist die Qualität und Latenz von externen Soundkarten/Interfaces normalerweise deutlich besser (das ist eine Box, an die du ein Mikrofon/Instrument anschließen kannst und die man z.B. per USB mit dem PC verbindet). Du kannst natürlich auch ein externes USB-Mikrofon nutzen. Mehr Infos findest du unter [Audiohardware](#audiohardware). ### 3. Verbinde dich mit Servern mit niedrigem Ping @@ -36,7 +36,7 @@ Die wichtigsten Faktoren kennst du jetzt! Los geht's:
    [Jamulus OS!](https://sourceforge.net/projects/jamulus-os/files/JamulusOS/){: target="_blank" rel="noopener noreferrer"} -Auf fast jedem PC (nur 64-Bit-Systeme) kannst du Jamulus mit einem USB-Stick starten! Jamulus OS prüft deine Hardware automatisch und richtet sie ein. +Auf fast jedem PC (nur 64-Bit-Systeme) kannst du Jamulus mit einem USB-Stick starten! [Jamulus OS!](https://sourceforge.net/projects/jamulus-os/files/JamulusOS/) prüft deine Hardware automatisch und richtet sie ein. ## Audiohardware Schau dir die [Liste von getesteter Hardware](Sound-Devices) und das [Hardware Setup](Hardware-Setup) an. @@ -51,7 +51,7 @@ Schau dir die [Liste von getesteter Hardware](Sound-Devices) und das [Hardware S Oder anders ausgedrückt, höre **nicht** auf dein direktes Signal. -Selbst wenn du eine gute Internetverbindung hast: Um den Rhythmus halten zu können, musst du dich auf das Signal vom Server und nicht auf dein Livesignal konzentrieren. _(Um Zweifel auszuschließen: das hat nichts mit den „Mute“-Reglern in Jamulus zu tun.)_ +Auch wenn du eine gute Internetverbindung hast, ist es besser (um den Rhythmus halten zu können), wenn du dich auf das Signal vom Server und nicht auf dein Livesignal konzentrierst. _(Um Zweifel auszuschließen: das hat nichts mit den „Mute“-Reglern in Jamulus zu tun.)_ Weitere Informationen darüber, wie du vermeiden kannst, auf dich selbst zu hören (und Hilfe bei anderen Problemen), findest du auf der [Fehlerbehebung FAQ](Client-Troubleshooting) Seite. (_momentan in Arbeit_) From 79229a77fee47b54f6c877f6fa694ca094a0faec Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Sun, 27 Dec 2020 22:02:54 +0100 Subject: [PATCH 129/280] Update CONTRIBUTING files (#157) * Add new contributing file * Clarify branches * Moved a bit to homepage * Review updates * fix typo * Grammar * Add more translation services * fix a few issues * small fix * Add github * Update README * @ignotus666 changes * Wording * ignotus rechnet * gilgongo fix * Update CONTRIBUTING.md * Update README.md * Update README.md * Update README.md --- CONTRIBUTING.md | 44 ++++++++++++++++++++++++++++++++++---- README.md | 34 ++++++++++++++--------------- wiki/en/en-Contribution.md | 23 +++++++++++++++----- 3 files changed, 75 insertions(+), 26 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2ee0fecd1..3ddafd97a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,5 +1,41 @@ -# Contribute +# Contribute to the documentation +We really appreciate your support! -Thanks for your support! -Please open an issue on github. More to come soon... -~~Please open a pull request on GitHub!~~ +Please note that discussions should be kept in English. If you don't speak English fluently you can use a reasonably good online translator (e.g. [DeepL](https://www.deepl.com), [Reverso](https://www.reverso.net/text_translation.aspx), ...) which might be able to translate your language to English. + +Please have a look at the [issues page on GitHub](https://github.com/jamulussoftware/jamuluswebsite/issues) and check if anybody has raised an issue with the same topic. + +If this is the case, please subscribe to the issue and explain your proposal. + +If that's not the case, please open a [new issue](https://github.com/jamulussoftware/jamuluswebsite/issues/new/choose), select which type of issue it is and describe your issue. + +If you want to open a Pull Request (after having described and discussed your proposal), keep in mind that your changes (if they are not just typos) might have to wait until everything is translated. We will bundle them (if everything is all right) with any other changes and upload all of them as a combined Pull Request to jamulus.io. + +Pull requests/issues for the website should have a title which looks like this: + +`[Tag (like Bug, Translation, etc.)][language code (e.g. en)] {short description of your changes}` + +## Branches, Translation and development process + +We currently use *multiple branches* to ensure that translators know what to translate. + +After having discussed and agreed on changes you want to be integrated to jamulus.io, you should ask yourself some questions: + +## 0. Is your content in a language that already exists on the site? +If not: This will be discussed this later (since you introduce a new language). +If so look here: +### 1. Be clear if your change needs translation +**No:** A fix which doesn't need to be translated (e.g. typo) --> Open a Pull Request to `release`. It will go live a few minutes after the PR is merged +**Yes:** A fix which needs to be translated (e.g. if you want to make a sentence or paragraph clearer) --> Commit to `changes` since others will need to translate it. It will be part of the next release. + +### 2. Be clear if a translation update is going on +You can see this if we ping the translators in a PR from changes to translate. + +**If yes:** only translate the changes of the Pull Request from changes to translation. If you find issues, start with 1 +**If no:** no need to care about the translate branch + +## Adding a new language + +1. Open an issue with the title [Translate] `yourLanguage` and say that you want to translate the homepage into your language. +2. If you start your new translation, follow the instructions to add a new language in the /README.md file on the changes branch. +3. Finally, open a PR to `translate` diff --git a/README.md b/README.md index 44dfbeb25..006542db1 100644 --- a/README.md +++ b/README.md @@ -1,44 +1,44 @@ # Jamulus Website -This is the home of the [Jamulus website](https://jamulus.io) and wiki. - -## Tech - -Built with Jekyll and Fox-CSS - -## Contribute and translation - -Do you want to contribute to the Jamulus Wiki/Website? Please open an issue since we're currently discussing how to fasciliate contribution. ~~See the [CONTRIBUTING.md](CONTRIBUTING.md) file and the [contributing wiki entry](https://jamulus.io/wiki/Contribution).~~ +This is the home of the [Jamulus website](https://jamulus.io). The goal of this page is to explain what Jamulus is and how to use it. ## Adding pictures Unfortunately GitHub doesn't enable picture upload on the normal md editor. Therefore you can attempt to open an issue, upload your image, copy the link to the page you want to integrate it into and then don't submit the issue. See this answer on stack overflow: https://stackoverflow.com/a/26601810 -## Translating +## Contribute a translation -Translations are handled by the [Polyglot jekyll Plug-in](https://github.com/untra/polyglot). +**Before translating, please have a look at the [CONTRIBUTING.md](CONTRIBUTING.md) file to get familiar with our translation process. Afterwards, check if there's already a discussion thread for your language here: https://github.com/jamulussoftware/jamuluswebsite/discussions and participate in it** + +Translations are handled by the [Polyglot Jekyll Plug-in](https://github.com/untra/polyglot). If you want to translate a file, you must first know where it is located on this repo: -- General translations especially for the wiki can be found in \_includes/wiki/yourlanguagecode folder. These files **must** be translated in order not to break the site. -- The homepage is located in the repo root and named [langcode]-index.html +- General translations (especially for the wiki) can be found in \_includes/wiki/yourlanguagecode folder. These files **must** be translated in order not to break the site. +- The homepage (https://jamulus.io/) is located in the repo root and named 1-[langcode]-index.html - The wiki content can be found in the wiki/ folder. Make sure to read the README.md file in the wiki/ folder. - The navigation and general translations can be found in the \_data/yourlanguagecode folder -To translate a file, please duplicate it and change the `lang:` attribute to the language you want to translate it to. If you want to translate an English page to German, you need to change the `lang: "en"` attribute to `lang: "de"`. This attribute can be found at the top of the file in the front matter (right at the top in between the `---`). Do not change the permalink attribute. It links pages with the same content but different languages and enables polyglot to know which page to change to if you change the language via the language picker. +To translate a file, please duplicate it and change the `lang:` attribute to the language you want to translate it to. If you want to translate an English page to German, you need to change the `lang: "en"` attribute to `lang: "de"`. This attribute can be found at the top of the file in the front matter (right at the top in between the `---`). Do not change the permalink attribute (It internally links pages with the same content but different languages and enables polyglot to know which page to change to if you change the language via the language picker.) ### Adding a new language If you want to add a new language, you must follow the instructions on the polyglot site and add the folders/files. - Make sure to add your language to the \_config.yml file (in the languages array.) - At least, the main includes for the wiki (see \_includes/wiki/) have to be translated. -- The navigation and general site wide strings (see the \_data/ folder) and the homepage (see the 1-index.html file in the root of this repo) should be translated. +- The navigation and general site-wide strings (see the \_data/ folder) and the homepage (see the 1-index.html file in the root of this repo) should be translated. Have a look at the README.md files in these folders. +## Tech + +This site is built with Jekyll and Fox-CSS. + ## Contribute to the design/site structure +Please open an issue and see the [CONTRIBUTING.md](CONTRIBUTING.md) file. -Since this page uses Jekyll, please have a look at the [jekyll documentation](https://jekyllrb.com/docs/). -This project uses the fox css framework. See the [FOX-CSS documentation](http://www.fox-css.com/documents/). +### A few tips/links +Since this page uses Jekyll, please have a look at the [Jekyll documentation](https://jekyllrb.com/docs/). +This project uses the FOX-CSS framework. See the [FOX-CSS documentation](http://www.fox-css.com/documents/). CSS files can be found in the assets/css folder. The \_layouts folder holds the main layouts for the page. More information can be found at the README.md files in (almost) every folder. diff --git a/wiki/en/en-Contribution.md b/wiki/en/en-Contribution.md index e77369647..107c6dfe5 100644 --- a/wiki/en/en-Contribution.md +++ b/wiki/en/en-Contribution.md @@ -8,18 +8,31 @@ permalink: "/wiki/Contribution" # Contributing to the Jamulus Project ## Jamulus Software -* If you want to contribute code, post your idea on [the developer forum](https://sourceforge.net/p/llcon/discussion/developerforum/) first so that it can be discussed before making a pull request (be sure to read main dev's [Volker's manifesto for contributions](https://github.com/corrados/jamulus/issues/596)) + +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)) See the [Jamulus GitHub repo](https://github.com/corrados/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 [raise it as an issue here](https://github.com/jamulussoftware/jamuluswebsite/issues). +* 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. -Pull requests for the website should look like this: +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? + +**The following content is for the documentation on jamulus.io only, not for the Jamulus software!** + +If you aren't comfortable with Pull Requests, commits, etc. just open an issue. We will then take care of your changes. If you want to do the changes on your own and open a Pull Request, follow these instructions: -`[language code (e.g. en)] {short description of your changes}` +1. Fork the repo (there's a fork button on the top right of the GitHub page) +2. Decide which branch you have to commit your changes to (rule of thumb: everything which might need translation should go to the `changes` branch, typos should go to the `release` branch; more information can be found in the [CONTRIBUTING file](https://github.com/jamulussoftware/jamuluswebsite/blob/changes/CONTRIBUTING.md)). Create a new branch from the up-to-date branch you chose +3. Make your changes +4. If you did the changes offline, push the new branch to your repository +5. Submit your Pull Request, give a short description of your changes and link the issue you opened +6. Wait for a review and a merge -See the [Website GitHub repo](https://github.com/jamulussoftware/jamuluswebsite) for further information. +**Hint (for git):** *Do not merge your work* into your local `changes` branch, only keep it in sync by pooling from the remote Jamulus website repository. Create a new branch for your proposed changes. +If the `changes` branch is modified before submitting your request, keep the local `changes` branch in sync by pooling from the official one, merge the local changes branch into your working branch, resolve conflicts, push your changes and create the Pull Request. From 40cb627810dd27e30e3e1da32a4de6a73ff577a4 Mon Sep 17 00:00:00 2001 From: Olivier Humbert Date: Tue, 29 Dec 2020 00:18:45 +0100 Subject: [PATCH 130/280] Update 2020-11-24-Multiple-Audio-Interfaces.md --- _posts/2020-11-24-Multiple-Audio-Interfaces.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_posts/2020-11-24-Multiple-Audio-Interfaces.md b/_posts/2020-11-24-Multiple-Audio-Interfaces.md index c5a972909..8bb13971b 100644 --- a/_posts/2020-11-24-Multiple-Audio-Interfaces.md +++ b/_posts/2020-11-24-Multiple-Audio-Interfaces.md @@ -19,7 +19,7 @@ Under Windows, the best option to run multiple interfaces through Jamulus at the **Steps:** 1. [Install and configure JACK on Windows](https://jackaudio.org/faq/jack_on_windows.html) - Make sure you select your best audio interface in the configuration steps, also add `-r 48000 -p ` to ensure JACK is outputting audio in the required sample rate for Jamulus (48.000Hz). If your frame buffer size is too low for your hardware, you'll need to change it to a higher value; 2. Install and open Voicemeeter; -3. Open configured Jack PortAudio shortcut, Jack Control and Jamulus software; +3. Open configured JACK PortAudio shortcut, Jack Control and Jamulus software; 4. On Voicemeeter, go to HARDWARE OUT and on A1 dropdown list, select JackRouter. On Hardware Input 1 select your computer microphone. You can make your computer microphone have the lowest latency possible by going into _Menu > System Settings/Options..._ and enabling _WDM Input Exclusive Mode_ (if you experience crackling noises while speaking, disable this) and changing the _Engine Mode_ to _Swift_; 5. Make sure the Hardware Input where you selected your microphone is sending sound through A1 by enabling the corresponding button next to the fader; 6. On Jamulus, under Settings, select JackRouter as your Soundcard Device; @@ -41,7 +41,7 @@ Under Windows, the best option to run multiple interfaces through Jamulus at the ### Linux -On Linux, it is possible to route additional devices to Jack by using alsa_in. +On Linux, it is possible to route additional devices to JACK by using alsa_in. **Requirements:** @@ -49,7 +49,7 @@ On Linux, it is possible to route additional devices to Jack by using alsa_in. * alsa **Steps:** -1. Follow [this tutorial](https://www.penguinproducer.com/Blog/2011/11/using-multiple-devices-with-jack/) to route the desired interface into Jack by using alsa_in. +1. Follow [this tutorial](https://www.penguinproducer.com/Blog/2011/11/using-multiple-devices-with-jack/) to route the desired interface into JACK by using alsa_in. 2. Jamulus should automatically route the JACK configured interface, adjustments can be made through the _Connect_ button. 3. Connect the device configured on step 1 into jamulus input. 4. Use Patchbay as described on Windows section to make connections permanent. From 38d5b14a5ff3fd101d746140038267792db6a8e5 Mon Sep 17 00:00:00 2001 From: Olivier Humbert Date: Tue, 29 Dec 2020 00:20:47 +0100 Subject: [PATCH 131/280] 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 8be779230..f5d887776 100644 --- a/wiki/en/en-Installation-for-Linux.md +++ b/wiki/en/en-Installation-for-Linux.md @@ -44,7 +44,7 @@ sudo dnf install qt5-qtdeclarative-devel jack-audio-connection-kit-dbus libQt5Co ### QjackCtl: Optional, but recommended -[QjackCtl](https://qjackctl.sourceforge.io) is a utility to help you set up the Jack audio server (installed as part of the dependencies above). Install it via e.g. +[QjackCtl](https://qjackctl.sourceforge.io) is a utility to help you set up the JACK audio server (installed as part of the dependencies above). Install it via e.g. ```shell sudo apt-get install qjackctl @@ -73,7 +73,7 @@ sudo make install ### 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) From 9900d77be3f335535e4e01f19130d02e5897e6f8 Mon Sep 17 00:00:00 2001 From: Olivier Humbert Date: Tue, 29 Dec 2020 15:52:39 +0100 Subject: [PATCH 132/280] [en] en-Compiling.md (consistency: QT -> Qt) --- wiki/en/en-Compiling.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/en/en-Compiling.md b/wiki/en/en-Compiling.md index c3b18fe7c..ef6e8baeb 100644 --- a/wiki/en/en-Compiling.md +++ b/wiki/en/en-Compiling.md @@ -62,7 +62,7 @@ Will build the file and make it available in `./Release/Jamulus.app` ## Windows You don't need to compile Jamulus for Windows since we provide official binaries, but if you really want to, follow the instructions below. -**Required software**: [QT](https://www.qt.io/download), a compiler like Visual Studio, ASIO development files +**Required software**: [Qt](https://www.qt.io/download), a compiler like Visual Studio, ASIO development files - get the Jamulus source code e.g. via git or via zip download from the Jamulus Repo - get and copy the [ASIOSDK](https://www.steinberg.net/de/company/developer.html) development files in `[\path\to\jamulus\source]\windows` directory so that, e.g., the From 209d74915f3931a8d1fe614a16c0ce796ac22bc8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 29 Dec 2020 17:23:02 +0100 Subject: [PATCH 133/280] [fr] consistency: jack Jack JACK (#219) (#221) * Update fr-Software-Manual.md * Update fr-Command-Line-Options.md * Update fr-Installation-for-Linux.md Co-authored-by: Olivier Humbert --- wiki/fr/fr-Command-Line-Options.md | 2 +- wiki/fr/fr-Installation-for-Linux.md | 16 ++++++++-------- wiki/fr/fr-Software-Manual.md | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/wiki/fr/fr-Command-Line-Options.md b/wiki/fr/fr-Command-Line-Options.md index db9a1ecbb..f7945470d 100644 --- a/wiki/fr/fr-Command-Line-Options.md +++ b/wiki/fr/fr-Command-Line-Options.md @@ -51,4 +51,4 @@ Vous pouvez voir toutes les options possibles prises en charge par votre version | `-w` |`--welcomemessage` | Accepte le formatage HTML et CSS en ligne (entre guillemets), ou définit le chemin d'accès vers un fichier texte. | (serveur uniquement) | | `-z` |`--startminimized` | Démarrage minimisé | (serveur uniquement) | | |`--ctrlmidich` | Canal de contrôle MIDI à écouter et décalage de numéro de contrôle, format : `channel[;offset]` | (client uniquement) voir [Trucs et astuces](Tips-Tricks-More#using-ctrlmidich-for-midi-controllers) | -| |`--clientname` | Titre de la fenêtre et nom du client Jack | (client uniquement) | +| |`--clientname` | Titre de la fenêtre et nom du client JACK | (client uniquement) | diff --git a/wiki/fr/fr-Installation-for-Linux.md b/wiki/fr/fr-Installation-for-Linux.md index 1435669c3..7e6e7de30 100644 --- a/wiki/fr/fr-Installation-for-Linux.md +++ b/wiki/fr/fr-Installation-for-Linux.md @@ -46,7 +46,7 @@ sudo dnf install qt5-qtdeclarative-devel jack-audio-connection-kit-dbus libQt5Co ### Qjackctl : optionnel, mais recommandé -[QjackCtl](https://qjackctl.sourceforge.io) est un utilitaire qui vous aide à configurer le serveur audio Jack (installé dans le cadre des dépendances ci-dessus). Installez-le, par ex., via +[QjackCtl](https://qjackctl.sourceforge.io) est un utilitaire qui vous aide à configurer le serveur audio JACK (installé dans le cadre des dépendances ci-dessus). Installez-le, par ex., via ```shell sudo apt-get install qjackctl @@ -74,19 +74,19 @@ sudo make install ## Configurez votre interface audio -### Configurer Jack avec QjackCtl +### Configurer JACK avec QjackCtl -Les clients Jamulus ont besoin de [Jack](https://jackaudio.org/){: target="_blank" rel="noopener noreferrer"} pour fonctionner, mais vous devez d'abord le configurer. La méthode recommandée est d'utiliser `QjackCtl`. +Les clients Jamulus ont besoin de [JACK](https://jackaudio.org/){: target="_blank" rel="noopener noreferrer"} pour fonctionner, mais vous devez d'abord le configurer. La méthode recommandée est d'utiliser `QjackCtl`. 1. Ouvrez le terminal de commande, par ex. avec Crtl-Alt-T et -1. Exécutez la commande `qjackctl` vous verrez le **Jack Audio Connection Kit** -2. Configurez votre interface audio comme suit (les paramètres exacts pour Jack dépendront des fonctionnalités de votre interface audio/carte son) : +1. Exécutez la commande `qjackctl` vous verrez le **JACK Audio Connection Kit** +2. Configurez votre interface audio comme suit (les paramètres exacts pour JACK dépendront des fonctionnalités de votre interface audio/carte son) : - Réglez l'**Interface audio** sur celle que vous souhaitez (il peut y en avoir plusieurs dans la liste) - Paramétrez la **Fréquence d'échantillonnage à 48000** - Paramétrez les **Échantillons/Période à 128** et les Périodes/Tampons à 2 pour commencer -Redémarrez Jack pour prendre en compte ces nouveaux paramètres. +Redémarrez JACK pour prendre en compte ces nouveaux paramètres. ### Démarrer Jamulus @@ -94,7 +94,7 @@ Ouvrez Jamulus, par ex. en ligne de commande. Si vous utilisez la ligne de comma Jamulus se trouve dans `/usr/local/bin`. Vous pouvez maintenant supprimer le répertoire des sources que vous venez de compiler. -Si vous avez des problèmes de son qui se coupe (en particulier les erreurs XRUN rapportées par Jack/QJackCtl), essayez de définir des valeurs plus élevées (par exemple 256 échantillons ou 3 périodes) à l'étape 3 ci-dessus. Des valeurs plus basses (par ex. 64 échantillons) pourraient apporter de meilleures performances mais peut-être plus de problèmes avec le son. Sinon, consultez la [section dépannage](Client-Troubleshooting). +Si vous avez des problèmes de son qui se coupe (en particulier les erreurs XRUN rapportées par JACK/QJackCtl), essayez de définir des valeurs plus élevées (par exemple 256 échantillons ou 3 périodes) à l'étape 3 ci-dessus. Des valeurs plus basses (par ex. 64 échantillons) pourraient apporter de meilleures performances mais peut-être plus de problèmes avec le son. Sinon, consultez la [section dépannage](Client-Troubleshooting). ## Tout est installé ? @@ -114,6 +114,6 @@ Téléchargez les nouvelles sources conformément à la section [Obtenir les sou * Pour utiliser ce fichier, configurez le logiciel avec `qmake "CONFIG+=noupcasename" Jamulus.pro` pour vous assurer que le nom du binaire cible soit **j**amulus au lieu de **J**amulus. -* Utilisateurs de Raspberry Pi : vous pourriez vouloir compiler le client sur une autre machine et exécuter le binaire sur le Raspberry Pi. Dans ce cas, les seules bibliothèques dont vous avez besoin pour l'exécuter sont celles d'un [serveur sans IUG](Server-Linux#serveur-sans-iug), mais _avec_ les paquets sons Jack. En particulier, jetez un œil à la note de bas de page pour la compilation sans IUG. +* Utilisateurs de Raspberry Pi : vous pourriez vouloir compiler le client sur une autre machine et exécuter le binaire sur le Raspberry Pi. Dans ce cas, les seules bibliothèques dont vous avez besoin pour l'exécuter sont celles d'un [serveur sans IUG](Server-Linux#serveur-sans-iug), mais _avec_ les paquets sons JACK. En particulier, jetez un œil à la note de bas de page pour la compilation sans IUG. * À partir de la version 3.5.3, Jamulus n'est plus compatible avec Qt4. diff --git a/wiki/fr/fr-Software-Manual.md b/wiki/fr/fr-Software-Manual.md index ff18fcbe8..81d9ff925 100644 --- a/wiki/fr/fr-Software-Manual.md +++ b/wiki/fr/fr-Software-Manual.md @@ -149,7 +149,7 @@ Dans ce cas, le réglage du délai de tampon est désactivé et doit être modif ![Délai de tampon Windows](https://user-images.githubusercontent.com/20726856/97361808-65ff5b80-18a0-11eb-88d6-fb2131f10c75.png) -Sous Linux, utilisez l'outil de configuration Jack pour modifier la taille du tampon. +Sous Linux, utilisez l'outil de configuration JACK pour modifier la taille du tampon. Le délai actuel du tampon a une influence sur l'état de la connexion, le taux de transfert courant et le délai global. Plus la taille du tampon est faible, plus la probabilité d'un voyant rouge dans l'indicateur d'état (décrochages) est élevée et plus le taux de transfert est élevé et le délai global est faible. From 82d31da420c347602c5d7454cc99ef97ad9d1245 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Wed, 30 Dec 2020 08:51:55 +0100 Subject: [PATCH 134/280] Change some texts on the homepage (#217) * Small changes with SEO in mind Jamulus is currently bad at SEO. I think we could improve the wording here. * Update 1-index.html --- 1-index.html | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/1-index.html b/1-index.html index a327e7987..b570e3395 100644 --- a/1-index.html +++ b/1-index.html @@ -1,5 +1,5 @@ --- -title: "Jamulus ‒ Play music online. With friends. For free." +title: "Jamulus ‒ Jam online. With friends. For free." lang: "en" permalink: / layout: mainhomepage @@ -16,11 +16,7 @@

    What is Jamulus?

    - Jamulus is for playing, rehearsing, or just jamming with your friends, your band or just anyone you find online. Use your Windows, macOS or Linux machine to connect to Jamulus servers worldwide, for free over a normal broadband - connection. Or - host your own private server. Jamulus is designed for high quality, low-latency sound, making it easy to play together remotely and in time. Have a look at how people - do it! + Jamulus is software for playing music, rehearsing, or just jamming with anyone online with low latency. You can use your Windows, macOS or Linux machine to connect to Jamulus servers worldwide. Jamulus is free and you can just use your normal broadband connection. Simply connect to a public server or host your own private one. Jamulus has been in development since 2006 and is designed for high quality, low-latency sound, making it easy to play together remotely and in time. Have a look at how people do it!
    @@ -34,11 +30,11 @@

    What is Jamulus?

    Jamulus worldwide

    - All over the world Jamulus allows huge choirs to sing, loud rock bands to play, and brings folk and classical musicians together. It's being used for remote music lessons, + All over the world Jamulus allows huge choirs to rehearse, loud rock bands to play, and brings folk and classical musicians together. It's being used for remote music lessons, in schools and universities, in private and in public. Even just for the spoken word – all in real time on the Internet, as if you were there in person.

    Help needed?

    - Have a look at the documentation. Especially consider the documentation and consider the troubleshooting section! You can also ask on the forums.

    @@ -46,8 +42,8 @@

    Help needed?

    Contribute!

    - Ideas? Found a bug? Want to contribute? Since Jamulus is free and open source software licensed under the GPL.
    - Take a look at our contribution guidelines to find out how. You're welcome! + Ideas? Found a bug? Want to contribute? Since Jamulus is free and open source software licensed under the GPL, you can help us!
    + Take a look at our contribution guidelines to find out how. Everybody is welcome!

    From ad28394cdc67b68d669def512dd1846358147c05 Mon Sep 17 00:00:00 2001 From: Olivier Humbert Date: Wed, 30 Dec 2020 19:30:42 +0100 Subject: [PATCH 135/280] [en] QjackCtl spelling (2020-11-24-Multiple-Audio-Interfaces.md) --- _posts/2020-11-24-Multiple-Audio-Interfaces.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_posts/2020-11-24-Multiple-Audio-Interfaces.md b/_posts/2020-11-24-Multiple-Audio-Interfaces.md index 8bb13971b..21dd5cd3d 100644 --- a/_posts/2020-11-24-Multiple-Audio-Interfaces.md +++ b/_posts/2020-11-24-Multiple-Audio-Interfaces.md @@ -45,7 +45,7 @@ On Linux, it is possible to route additional devices to JACK by using alsa_in. **Requirements:** -* QJackCtl +* QjackCtl * alsa **Steps:** From b507a35b4e792695be91e57b61bddc2d7d0e66e5 Mon Sep 17 00:00:00 2001 From: Olivier Humbert Date: Wed, 30 Dec 2020 19:32:38 +0100 Subject: [PATCH 136/280] [en] QjackCtl spelling (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 c2c06464f..ad3d44193 100644 --- a/wiki/en/en-Hardware-Setup.md +++ b/wiki/en/en-Hardware-Setup.md @@ -51,7 +51,7 @@ Connect your instrument to the input plugs of the Behringer U-CONTROL UCA202. Pl You're done! Have fun! -## Linux: Audio interface connection with QJackCtrl +## Linux: Audio interface connection with QjackCtl Refer to the Linux [client install guide](Installation-for-Linux#configure-jack-with-qjackctl). From 7592c92c9232354fcad5570fb7811094090993a0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 31 Dec 2020 18:27:43 +0100 Subject: [PATCH 137/280] [fr] typo fix Berhinger/Behringer (#224) (#225) Co-authored-by: Olivier Humbert --- wiki/fr/fr-Hardware-Setup.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/fr/fr-Hardware-Setup.md b/wiki/fr/fr-Hardware-Setup.md index ef8a016b1..a167b959b 100644 --- a/wiki/fr/fr-Hardware-Setup.md +++ b/wiki/fr/fr-Hardware-Setup.md @@ -36,7 +36,7 @@ _**La méthode exacte pour connecter vos instruments différera évidement en fo Par la suite, utilisez toujours le même port USB pour le périphérique audio. **Utilisateurs de Windows** : si ce n'est pas encore fait, téléchargez et installez le [pilote audio ASIO (ASIO4ALL) gratuit](https://www.asio4all.org){: target="_blank" rel="noopener noreferrer"}. Certaines personnes ont également indiqué avoir utilisé avec succès [ce pilote ASIO natif](http://www.behringerdownload.de/_software/BEHRINGER_2902_X64_2.8.40.zip){: target="_blank" rel="noopener noreferrer"} -__actuellement non disponible__, bien qu'il ne figure plus sur les pages produits Berhinger en avril 2020. +__actuellement non disponible__, bien qu'il ne figure plus sur les pages produits Behringer en avril 2020. #### 2. Démarrez Jamulus From 89c1af59fdb38c8d5f1af412b19a68d2b7fc854b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 1 Jan 2021 21:18:57 +0100 Subject: [PATCH 138/280] =?UTF-8?q?[fr]=20d=C3=A9monstrations=20->=20d?= =?UTF-8?q?=C3=A9mos=20(#226)=20(#227)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [fr] update fr-Demos.md (démonstrations -> démos) * [fr] update navigation.yml (démonstrations -> démos) Co-authored-by: Olivier Humbert --- _data/fr/navigation.yml | 2 +- wiki/fr/fr-Demos.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/_data/fr/navigation.yml b/_data/fr/navigation.yml index b882f1065..a076bc7e6 100644 --- a/_data/fr/navigation.yml +++ b/_data/fr/navigation.yml @@ -24,7 +24,7 @@ nav: url: /wiki/Command-Line-Options - page: Trucs et astuces url: /wiki/Tips-Tricks-More - - page: Démonstrations + - page: Démos url: /wiki/Demos - page: Déclaration de confidentialité url: /wiki/Privacy-Statement diff --git a/wiki/fr/fr-Demos.md b/wiki/fr/fr-Demos.md index b8e0ed44d..d7b201ca9 100644 --- a/wiki/fr/fr-Demos.md +++ b/wiki/fr/fr-Demos.md @@ -1,6 +1,6 @@ --- layout: wiki -title: "Démonstrations de Jamulus" +title: "Démos de Jamulus" lang: "fr" permalink: "/wiki/Demos" --- From 6c257aab34ade70a6613731519e8a3a8f3fd1ad1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 2 Jan 2021 18:27:55 +0100 Subject: [PATCH 139/280] [fr] consistency: Internet -> internet (#228) (#229) * [fr] consistency: Internet -> internet (1-fr-index.html) * [fr] consistency: Internet -> internet (fr-Getting-Started.md) * [fr] consistency: Internet -> internet (fr-Client-Troubleshooting.md) * [fr] consistency: Internet -> internet (fr-Demos.md) Co-authored-by: Olivier Humbert --- 1-fr-index.html | 6 +++--- wiki/fr/fr-Client-Troubleshooting.md | 2 +- wiki/fr/fr-Demos.md | 2 +- wiki/fr/fr-Getting-Started.md | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/1-fr-index.html b/1-fr-index.html index 7defc61b3..997645ebf 100644 --- a/1-fr-index.html +++ b/1-fr-index.html @@ -6,7 +6,7 @@ ldjAppCategory: "Musique" ldjSlogan: "Jouez de la musique en ligne. Avec vos amis. Librement et gratuitement." ldjCreator: "Volker Fischer et contributeurs" -metadescription: "Jamulus est un logiciel à source ouverte qui permet aux musiciens de jouer de la musique, de répéter ou simplement bœuffer en ligne et en temps réel via Internet." +metadescription: "Jamulus est un logiciel à source ouverte qui permet aux musiciens de jouer de la musique, de répéter ou simplement bœuffer en ligne et en temps réel via internet." mAltProgIcon: "Icône de Jamulus" mTSlogan: "Jouez de la musique en ligne. Avec vos amis. Librement et gratuitement." mTGetStartedNow: "Commencer maintenant !" @@ -16,7 +16,7 @@

    Qu'est-ce que c'est Jamulus ?

    - Jamulus est un logiciel pour jouer, répéter ou juste bœuffer avec vos amis, votre groupe ou n'importe qui rencontré en ligne. Utilisez votre ordinateur Windows, macOS ou Linux pour vous connecter aux serveurs de Jamulus dans le monde gratuitement avec votre connexion Internet standard. Ou hébergez votre propre serveur privé. + Jamulus est un logiciel pour jouer, répéter ou juste bœuffer avec vos amis, votre groupe ou n'importe qui rencontré en ligne. Utilisez votre ordinateur Windows, macOS ou Linux pour vous connecter aux serveurs de Jamulus dans le monde gratuitement avec votre connexion internet standard. Ou hébergez votre propre serveur privé. Jamulus est conçu pour offrir un son de haute qualité et à faible latence, ce qui vous permet de jouer ensemble facilement à distance et en rythme. Regardez comment les gens l'utilisent !
    @@ -31,7 +31,7 @@

    Qu'est-ce que c'est Jamulus ?

    Jamulus dans le monde

    - Partout dans le monde, Jamulus permet à d'immenses chorales de chanter, à de bruyants groupes de rock de jouer, et réunit des musiciens folkloriques et classiques. Il est utilisé pour les cours de musique à distance, dans des écoles et des universités, en privé et en public. Même pour une simple discussion, tout cela en temps réel sur Internet, comme si vous y étiez en personne. + Partout dans le monde, Jamulus permet à d'immenses chorales de chanter, à de bruyants groupes de rock de jouer, et réunit des musiciens folkloriques et classiques. Il est utilisé pour les cours de musique à distance, dans des écoles et des universités, en privé et en public. Même pour une simple discussion, tout cela en temps réel sur internet, comme si vous y étiez en personne.

    Besoin d'aide ?

    Lisez la documentation. Regardez bien la section dépannage ! diff --git a/wiki/fr/fr-Client-Troubleshooting.md b/wiki/fr/fr-Client-Troubleshooting.md index 688f04fa5..6aa7f38ef 100644 --- a/wiki/fr/fr-Client-Troubleshooting.md +++ b/wiki/fr/fr-Client-Troubleshooting.md @@ -54,7 +54,7 @@ Vérifiez d'abord que vous avez le bon serveur de genre musical sélectionné da ### Vous ne voyez pas du tout la liste des serveurs ? -Au Royaume-Uni (et éventuellement dans d'autres régions/routeurs), le réglage du modem Internet par câble de Virgin Media peut poser problème. « Block Fragmented IP Packets » ne doit pas être cochée. Pour les autres routeurs/FAI (fournisseur d'accès internet), essayez également de désactiver le SPI (Stateful Packet Inspection) et si cela résout le problème, vous pouvez décider de le laisser désactivé ou non. +Au Royaume-Uni (et éventuellement dans d'autres régions/routeurs), le réglage du modem internet par câble de Virgin Media peut poser problème. « Block Fragmented IP Packets » ne doit pas être cochée. Pour les autres routeurs/FAI (fournisseur d'accès internet), essayez également de désactiver le SPI (Stateful Packet Inspection) et si cela résout le problème, vous pouvez décider de le laisser désactivé ou non. Dans certains cas, il se peut que ce soit votre FAI qui bloque votre utilisation pour Jamulus. Voir la note sur la [page de dépannage du serveur](Server-Troubleshooting#personne-ne-peut-se-connecter-à-mon-serveur-mais-je-peux-my-connecter-localement) à propos de « Personne ne peut se connecter à mon serveur ». diff --git a/wiki/fr/fr-Demos.md b/wiki/fr/fr-Demos.md index d7b201ca9..d8df35726 100644 --- a/wiki/fr/fr-Demos.md +++ b/wiki/fr/fr-Demos.md @@ -20,6 +20,6 @@ permalink: "/wiki/Demos" * [Les IP Rockers en live sur Jamulus](https://soundcloud.com/dematteoss/sets/the-ip-rockers-live-on-jamulus) * [Vidéo d'introduction montrant l'installation avec des instruments acoustiques](https://www.youtube.com/watch?v=lB4ZxDb9vnU) (pas vraiment une démo) -* [WorldJam](https://worldjam.vip/) Chaque samedi soir il y a une session « Jam » mondiale en ligne à travers Internet. +* [WorldJam](https://worldjam.vip/) Chaque samedi soir il y a une session « Jam » mondiale en ligne à travers internet. ![Un bœuf Jamulus typique !](https://user-images.githubusercontent.com/4561747/79686157-1f1c1380-8236-11ea-9fdb-8a791dd2713f.png) diff --git a/wiki/fr/fr-Getting-Started.md b/wiki/fr/fr-Getting-Started.md index 6f66e8cb1..6e22973a0 100644 --- a/wiki/fr/fr-Getting-Started.md +++ b/wiki/fr/fr-Getting-Started.md @@ -10,12 +10,12 @@ permalink: "/wiki/Getting-Started" ## Pré-requis 1. **Un ordinateur** au moins sous **Windows 10**, **macOS** (**MacOS X** El Capitan v10.11 ou plus récent), ou **Linux**. -1. **Une connection Internet filaire** (n'utilisez pas le Wi-Fi, cela va causer des problèmes de son). La plupart des connexions à haut-débit suffisent[^1]. +1. **Une connection internet filaire** (n'utilisez pas le Wi-Fi, cela va causer des problèmes de son). La plupart des connexions à haut-débit suffisent[^1]. 1. **Des casques ou écouteurs filaires - pas de haut parleurs** pour éviter de l'écho ou des larsens et pour minimiser le délai[^2]. ## Maximiser la qualité et diminuer le délai -### 1. Réduisez votre trafic Internet et fermez les programmes de votre PC +### 1. Réduisez votre trafic internet et fermez les programmes de votre PC Essayez de vous assurer que rien sur votre machine ou votre réseau (comme un flux vidéo) ne soit en concurrence avec Jamulus lorsque vous l'utilisez. From cee4d2711b238b2647bc911d9dbab3b4c91077dc Mon Sep 17 00:00:00 2001 From: Olivier Humbert Date: Mon, 4 Jan 2021 16:10:24 +0100 Subject: [PATCH 140/280] [en] consistency alsa -> ALSA (2020-11-24-Multiple-Audio-Interfaces.md) --- _posts/2020-11-24-Multiple-Audio-Interfaces.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_posts/2020-11-24-Multiple-Audio-Interfaces.md b/_posts/2020-11-24-Multiple-Audio-Interfaces.md index 21dd5cd3d..d104974e5 100644 --- a/_posts/2020-11-24-Multiple-Audio-Interfaces.md +++ b/_posts/2020-11-24-Multiple-Audio-Interfaces.md @@ -46,7 +46,7 @@ On Linux, it is possible to route additional devices to JACK by using alsa_in. **Requirements:** * QjackCtl -* alsa +* ALSA **Steps:** 1. Follow [this tutorial](https://www.penguinproducer.com/Blog/2011/11/using-multiple-devices-with-jack/) to route the desired interface into JACK by using alsa_in. From 6ac66fd84f29cf3eddcac54a6ba270969f412ea6 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Mon, 4 Jan 2021 23:56:46 +0100 Subject: [PATCH 141/280] Add Debian packages --- wiki/en/en-Installation-for-Linux.md | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/wiki/en/en-Installation-for-Linux.md b/wiki/en/en-Installation-for-Linux.md index f5d887776..d96c24d44 100644 --- a/wiki/en/en-Installation-for-Linux.md +++ b/wiki/en/en-Installation-for-Linux.md @@ -10,11 +10,23 @@ 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 of your distro. Have a look at this table: +Although we don't provide official packages for every Linux distribution, 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). If you don't find it in your package manager, you need to 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). + +### Debian and Ubuntu amd64 + +If you're on **Debian** or **Ubuntu** (only amd64), you may try the compiled deb packages from GitHub Actions. + +1. Download the deb file from the [Jamulus GitHub release](https://github.com/corrados/jamulus/releases/tag/latest) page +1. Update apt: `sudo apt-get update` +1. Install the package: `sudo dpkg -i .deb` + +**Note:** The generated deb files will install Jamulus with a lower case "j". You can therefore start it in terminal by typing `jamulus`. + +If you can't use one of these options, you need to compile Jamulus from source. That's quite easy: ## Get Jamulus sources From 09895a8c0c66a8745dbaab6cce1ecfa86c89bbf6 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Tue, 5 Jan 2021 09:49:31 +0100 Subject: [PATCH 142/280] A few changes (#210) * Add some small changes * remove duplicate * sync mac and windows * Update en-Installation-for-Windows.md * Remove compilation link since it might confuse people * Remove scroll down since there's nothing below * Change MacOS to macOS * Update en-Installation-for-Windows.md --- wiki/en/en-Installation-for-Macintosh.md | 5 ++--- wiki/en/en-Installation-for-Windows.md | 24 +++++++++++------------- wiki/en/en-Onboarding.md | 17 ++++++++++++++--- 3 files changed, 27 insertions(+), 19 deletions(-) diff --git a/wiki/en/en-Installation-for-Macintosh.md b/wiki/en/en-Installation-for-Macintosh.md index 3a37fad7a..104d7e925 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 dbc9dbe60..4289f29d9 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. From 4f28a57c452fc513032c420a84c633a824608f91 Mon Sep 17 00:00:00 2001 From: vdellamea <75564007+vdellamea@users.noreply.github.com> Date: Tue, 5 Jan 2021 14:02:54 +0100 Subject: [PATCH 143/280] Update it-Getting-Started.md (#230) Some small correction plus the main one: the meaning of footnote 1 was reversed in Italian. --- wiki/it/it-Getting-Started.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/wiki/it/it-Getting-Started.md b/wiki/it/it-Getting-Started.md index 19cbf048c..b502f5aaa 100644 --- a/wiki/it/it-Getting-Started.md +++ b/wiki/it/it-Getting-Started.md @@ -11,7 +11,7 @@ permalink: "/wiki/Getting-Started" 1. **Un computer** con installato **Windows 10**, **macOS** (**MacOS X** El Capitan v10.11 o versioni successive), oppure **Linux**. 1. **Una connessione cablata ad internet** (non usare il Wi-Fi, rende problematico l'uso del software creando problemi di ascolto). Una connessione in fibra offre le caratteristiche ideali per l'utilizzo[^1]. -1. **Usare le cuffie - non le casse** per prevenire effetti di echo o larsen e minimizzare il delay[^2]. +1. **Usare le cuffie con filo - non le casse** per prevenire effetti di echo o larsen e minimizzare il delay[^2]. ## Massimizza la qualità, minimizza i ritardi @@ -25,7 +25,7 @@ Raccomandiamo - anche se per cominciare ne puoi fare a meno - di usare una sched ### 3. Connettersi a server con latenza bassa -E' consigliabile scegliere server dalla lista che riportano ping inferiori o uguali a 15ms per un ottima esperienza di utilizzo (anche se ci sono altre cose che possono influenzare le prestazioni). Collegarsi a server con ping più alti potrebbe compromettere il corretto funzionamento del software. +E' consigliabile scegliere server dalla lista che riportano ping inferiori o uguali a 15ms per un ottima esperienza di utilizzo (anche se ci sono altre cose che possono influenzare le prestazioni). Collegarsi a server con ping più alti può comportare qualche possibile difficoltà in più. Ora che hai acquisito le nozioni di base, possiamo cominciare: @@ -52,7 +52,7 @@ In altre parole **evita** di ascoltare il segnale diretto del tuo strumento/micr Risulta sicuramente complicato per cantanti o musicisti di strumenti acustici ma, anche se la connessione è buona, quando non si ascolta il **segnale che proviene dal server**, la scincronizzazione con gli altri ne risentirà. _(A scanso di equivoci: questo non ha nulla a che fare con i controlli “mute” in Jamulus.)_ -Further information about how to avoid listening to yourself (and help with other problems) can be found in the [Troubleshooting FAQ section](Client-Troubleshooting) (_currently under construction_) +Si possono trovare ulteriori informazioni su come evitare di sentire se stessi (e aiuto su altri problemi) in [Troubleshooting FAQ section](Client-Troubleshooting) (_currently under construction_) ## Come funziona Jamulus (in generale) @@ -62,5 +62,5 @@ Further information about how to avoid listening to yourself (and help with othe _Jamulus funziona secondo il principio del client-server. L’audio di tutti viene inviato a un server, mixato ed elaborato. Successivamente l’audio viene inviato a ogni client. Se un server viene reso pubblico e registrato su un server centrale, le sue informazioni verranno trasmesse a tutti i client._ ## Note a pié di pagina -[^1]: [Dettagli di connessione](Network-Requirements){: target="_blank" rel="noopener noreferrer"}. Una connessione con 10Mbits in down e 1Mbps in up non è sufficiente, è probabile riscontrare problemi relativi alla connettività. -[^2]: Cuffie-Bluetooth di solito inseriscono latenza. Per questo è consigliabile usare cuffie con filo. In particolare per cantanti e musicisti di strumenti acustici (leggere [il paragrafo relativo](Getting-Started#having-trouble-cant-keep-in-time) per maggiori informazioni). +[^1]: [Dettagli di connessione](Network-Requirements){: target="_blank" rel="noopener noreferrer"}. Se hai una connessione con 10Mbits in down e 1Mbps in up, è improbabile riscontrare problemi relativi alla connettività. +[^2]: Cuffie-Bluetooth di solito inseriscono troppa latenza. Per questo è consigliabile usare cuffie con filo. In particolare per cantanti e musicisti di strumenti acustici (leggere [il paragrafo relativo](Getting-Started#having-trouble-cant-keep-in-time) per maggiori informazioni). From 2d9cb7e4ee10002c18f66671fd5adb4c277a1516 Mon Sep 17 00:00:00 2001 From: Olivier Humbert Date: Tue, 5 Jan 2021 17:34:50 +0100 Subject: [PATCH 144/280] [en] consistency Macintosh->macOS (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 9821fda52..b848fdcda 100644 --- a/wiki/en/en-Server-Linux.md +++ b/wiki/en/en-Server-Linux.md @@ -20,7 +20,7 @@ If you plan to run a server on your desktop machine (and you have installed the Hit return and you should see the server control window. You can stop the server by closing the server window, or by typing CTRL+C in the terminal. -**To configure the server**, please refer to [the Windows & Macintosh instructions](Server-Win-Mac). +**To configure the server**, please refer to [the Windows & macOS instructions](Server-Win-Mac). See also [Command Line Options](Command-Line-Options) for other parameters you can set. From 41ba9712ef254b5bfeba4bc051fab41c1aec9d3b Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Tue, 5 Jan 2021 20:40:12 +0100 Subject: [PATCH 145/280] Explain how the new installer can be compiled This will show how to compile the new installer on Windows. Have a look at the discussion in https://github.com/corrados/jamulus/issues/792 --- wiki/en/en-Compiling.md | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/wiki/en/en-Compiling.md b/wiki/en/en-Compiling.md index ef6e8baeb..5cebeb79e 100644 --- a/wiki/en/en-Compiling.md +++ b/wiki/en/en-Compiling.md @@ -62,13 +62,26 @@ Will build the file and make it available in `./Release/Jamulus.app` ## Windows You don't need to compile Jamulus for Windows since we provide official binaries, but if you really want to, follow the instructions below. -**Required software**: [Qt](https://www.qt.io/download), a compiler like Visual Studio, ASIO development files +**Required software**: [Qt](https://www.qt.io/download), a compiler like Visual Studio ([Build Tools 2017 or 2019](https://visualstudio.microsoft.com/thank-you-downloading-visual-studio/?sku=BuildTools&rel=16) recommended), [ASIO development files](https://www.steinberg.net/en/company/developers.html) -- get the Jamulus source code e.g. via git or via zip download from the Jamulus Repo -- get and copy the [ASIOSDK](https://www.steinberg.net/de/company/developer.html) development files in `[\path\to\jamulus\source]\windows` directory so that, e.g., the - directory `[\path\to\jamulus\source]\ASIOSDK2\common` exists -- open Jamulus.pro in Qt Creator then compile & run +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 open an issue on the Jamulus repo to tell us how). + +### Compiling and building installer + +Most users will probably want to use this method: +1. Open PowerShell +1. Navigate to the jamulus directory +1. To allow unsigned scripts, run `Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser`. You can also revert this after having run this script. For more information see the [Microsoft PowerShell documentation page](https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.security/set-executionpolicy) +1. Edit the $QtCompile32 and $QtCompile64 variables +1. Run the Jamulus compilation and installer script: `.\windows\deploy_windows.ps1 C:\Qt\QtVersion`. +1. You can now find the Jamulus installer in the `.\deploy` directory + +### Compiling only + +1. Get and copy the [ASIOSDK](https://www.steinberg.net/de/company/developer.html) development files in `[\path\to\jamulus\source]\windows` directory so that, e.g., the + directory `[\path\to\jamulus\source]\ASIOSDK2\common` exists +1. Open Jamulus.pro in Qt Creator then compile & run ## General notes From 7ba59776683d886ffd09e8589e5e1c0338f37b98 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Tue, 5 Jan 2021 20:51:57 +0100 Subject: [PATCH 146/280] Quote the directory name as code --- wiki/en/en-Compiling.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wiki/en/en-Compiling.md b/wiki/en/en-Compiling.md index 5cebeb79e..e37e5f6e0 100644 --- a/wiki/en/en-Compiling.md +++ b/wiki/en/en-Compiling.md @@ -64,14 +64,14 @@ You don't need to compile Jamulus for Windows since we provide official binaries **Required software**: [Qt](https://www.qt.io/download), a compiler like Visual Studio ([Build Tools 2017 or 2019](https://visualstudio.microsoft.com/thank-you-downloading-visual-studio/?sku=BuildTools&rel=16) recommended), [ASIO development files](https://www.steinberg.net/en/company/developers.html) -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 open an issue on the Jamulus repo to tell us how). +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 open an issue on the Jamulus repo to tell us how). ### Compiling and building installer Most users will probably want to use this method: 1. Open PowerShell -1. Navigate to the jamulus directory +1. Navigate to the `jamulus` directory 1. To allow unsigned scripts, run `Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser`. You can also revert this after having run this script. For more information see the [Microsoft PowerShell documentation page](https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.security/set-executionpolicy) 1. Edit the $QtCompile32 and $QtCompile64 variables 1. Run the Jamulus compilation and installer script: `.\windows\deploy_windows.ps1 C:\Qt\QtVersion`. From bce487709412186ab53d035af2783703e9e79bb5 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Tue, 5 Jan 2021 21:04:01 +0100 Subject: [PATCH 147/280] Create newsounddevice.md --- .github/ISSUE_TEMPLATE/newsounddevice.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/newsounddevice.md diff --git a/.github/ISSUE_TEMPLATE/newsounddevice.md b/.github/ISSUE_TEMPLATE/newsounddevice.md new file mode 100644 index 000000000..4fdffc7ee --- /dev/null +++ b/.github/ISSUE_TEMPLATE/newsounddevice.md @@ -0,0 +1,21 @@ +--- +name: New Sound device +about: Add a new device which you tested to the knowledge base +title: "[KB New Device]" +labels: kb +assignees: '' +--- +## Name of the device I want to add + +## Device type (Audio interface, Recorder) + connection type (USB, FireWire) + +## URL to manufacturer (if exists) + +## Tested operating systems +Add comments if you tested your device on this operating system and if you need to notice specific things (e.g. you need a special ASIO driver on Windows): + +**Windows:** +**macOS:** +**Linux:** + +## Additional information From a1aa5e4af2da0e9652fe729e88307faef1873387 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Tue, 5 Jan 2021 21:06:09 +0100 Subject: [PATCH 148/280] Create 2021-01-05-Jamulus-Sound-Devices.md --- _posts/2021-01-05-Jamulus-Sound-Devices.md | 141 +++++++++++++++++++++ 1 file changed, 141 insertions(+) create mode 100644 _posts/2021-01-05-Jamulus-Sound-Devices.md diff --git a/_posts/2021-01-05-Jamulus-Sound-Devices.md b/_posts/2021-01-05-Jamulus-Sound-Devices.md new file mode 100644 index 000000000..9e150af86 --- /dev/null +++ b/_posts/2021-01-05-Jamulus-Sound-Devices.md @@ -0,0 +1,141 @@ +--- +layout: post +title: "Audio devices for Jamulus" +lang: "en"" +heading: "Sound devices" +lang: "en" +--- + +# Sound Devices + +Thanks to Jamulus users, this page lists audio devices known to work (or not) with Jamulus. + + +_**Note**: If they work or not depends on your operating system (Linux, MacOS, Windows, etc.)_. + +You can update this page with the information you have. **Please indicate the platform(s) you are using!**. Just open an issue on the + +## Audio devices known to work with Jamulus + +### USB/USB-C devices + +#### Microphones / DI Boxes + +* **[Blue Yeti](https://www.bluemic.com/en-us/products/yeti/)**, USB Microphone +Works well under **macOS** (there is a check option to disable local monitoring). +Works well under **Windows 10 with ASIO4All**, a bit more latency than under macOS. You can disable local monitoring by going deep into the settings. +Latency is good under **Linux**. You can't disable local monitoring (or we haven't found out how to do it, feel free to send us the information if you know how to do it). + +* **[Shure X2u](https://www.shure.com/en-GB/products/accessories/x2u-xlr-usb-interface)**, USB to XLR audio interface with headphone jack connector that converts a wired microphone to a USB microphone. +Set the PC/Mix dialog box to 100% PC to listen to Jamulus' mix on the headphone output. +Tested with a Raspberry Pi 4 under **Raspberry Pi OS Buster**, kernel version 4.19. + +* **[Behringer UGC102](https://www.behringer.com/behringer/product?modelCode=P0198)**, Guitar-to-USB Interface (guitar and bass) +_Note: On **macOS**, this device appears as "USB Audio Codec". When selected for input and output in Jamulus, the **UGC102** headphone jack is the output (and cannot be used for input)._ + +#### Audio interfaces / digital mixing consoles + +* **[Solid State Logic SSL2+](https://www.solidstatelogic.com/products/ssl2-plus)**, USB-C/USB digital audio/MIDI interface 2 in/4 out +Works great under **Linux** (Ubunutu 20.04 or Raspberry Pi OS (Buster)), **macOS** (not tested on Big Sur) or **Windows 10** with the [native ASIO driver](http://eu1.download.solidstatelogic.com/SSL%202/SolidStateLogic_UsbAudio_v4.67.0_2019-10-21_setup%20(3).exe). +The monitoring of the Jamulus mix is done by moving the "MONITOR MIX" completely to the right to "USB". See the [official manual](http://eu1.download.solidstatelogic.com/2%20Plus%20/SSL%202%20Plus%20User%20Guide_ENGLISH.pdf). + +* **[Ammoon AGM02](https://www.ammoon.com/p-i3974.html)** and **[Ammoon AGM04](https://www.ammoon.com/p-i4049.html)**, low-cost USB 2-channel and 4-channel compact mixing consoles +Both tested on **macOS Catalina**. +The **AGM02** tested on **Windows 10**. On Windows 10, with ASIO4ALL, the **AGM02** can be used as an input, and the onboard audio as the output. There is no way to monitor only the USB return signal on the **AGM02**. +_**Note:** The Ammoon AGM04 appears to be a re-branded [ART USBMix4](https://artproaudio.com/product/usbmix4-four-channel-mixer-usb-audio-interface/)._ + +* **ART USBMix4**, USB 4-channel compact mixing console (_see above_) + +* **[Audient EVO 4](https://evo.audio/products/evo-4/overview/)**, USB digital audio interface 2-in/2-out +[Driver installation and download](https://evo.audio/driver-installation/), + +* **[Behringer UCA222](https://www.behringer.com/product.html?modelCode=P0A31)** & **Behringer UCA202 U-Control**, 2-in/2-out USB Audio Interface with Digital Output +_Note: Works best on **macOS** and **Linux**._ +On Windows, [ASIO4ALL](http://www.asio4all.org/) driver works OK but not great. There is also the [native driver](http://www.behringerdownload.de/_software/BEHRINGER_2902_X64_2.8.40.zip) which Behringer withdrew support for a while ago, and therefore removed from their download section. + +* **[Behringer UMC202HD](https://www.behringer.com/product.html?modelCode=P0BJZ)**, **UMC204HD**, et **UMC404HD** USB digital audio interfaces +[pilotes ASIO pour Windows 7 à 10](http://downloads.music-group.com/software/behringer/UMC/UMC-Driver_4-59-0.zip) + +* **[Behringer X32](https://www.behringer.com/behringer/product?modelCode=P0ASF)** X-USB digital mixing desk 32-in/32-out + +* **[Behringer XR18](https://www.behringer.com/product.html?modelCode=P0BI8)** (XR serie), USB digital mixing consoles + +* **[Berhinger XENYX serie](https://www.behringer.com/series.html?category=R-BEHRINGER-XENYXSERIES)**, USB digital audio interfaces +[Behringer ASIO Driver](http://www.behringerdownload.de/_software/BEHRINGER_2902_X64_2.8.40.zip). This Behringer ASIO Driver does not appear to be very good. Audio latency with this "unsupported" driver seems poor - not better than ASIO4all. It's good device for **macOS** and **Linux**, but perhaps not for Windows. More testing is required. + +* **[Focusrite Scarlett serie](https://focusrite.com/en/scarlett)**, USB digital audio interfaces +_Note: if you have issues with the buffer size going to 136, download the updated driver version `4.64.15.598` from [http://beta.focusrite.com/](http://beta.focusrite.com/)_ + +* **[iConnectivity AUDIO4+](https://www.iconnectivity.com/products/audio/iconnectaudio4plus)**, USB digital audio interface + +* **[Lexicon Omega](https://lexiconpro.com/en/products/omega)**, USB digital audio interface +_Note: Works best on **macOS** and **Linux**. There is a driver for Windows but this does not allow to use 64 samples buffer size and adds some latency compared to, e.g.,the mocOS driver._ + +* **[Native Instruments Komplete Audio 2](https://www.native-instruments.com/en/products/komplete/audio-interfaces/komplete-audio-1-audio-2/)**, USB digital audio interface +Tested on **Windows 10** with 64 sample buffer and am getting great sound and total latency around 15ms over the ping time. + +* **[Steinberg UR22C](https://new.steinberg.net/audio-interfaces/ur22c/)** USB-C/USB3 digital audio interface +Works directly on **macOS** with a beautiful sound even with un-balanced jack. +Works on a **Raspberry PI4** provided `jackd` version used is the one from `/usr/bin` (Tweaking `raspijamulus.sh`). Not tested on PC. + +* **[Steinberg UR22 MKII](https://www.steinberg.net/en/products/audio_interfaces/ur_series/models/ur22mkii.html)**, USB digital audio interface +Sounds great, can achieve 32 frame buffer and works on **Windows** and **Linux**. +Not tested on **macOS**. + +* **[Yamaha AG03](https://usa.yamaha.com/products/music_production/interfaces/ag_series/index.html)**, USB digital audio/MIDI interface + +#### Amp modelers/effects pedals for instruments + +* **[Line 6 HX Stomp](https://line6.com/hx-stomp/)**, USB multi-effects pedal for guitar +See [Remote Jam with Helix and Jamulus](https://jimamsden.wordpress.com/2020/04/04/remote-jamming-with-helix-and-jamulus/) for settings on a Mac. + +#### Digital recorders + +* **Tascam DR-07X** stereo recorder with USB audio into computer, headphones in line-out of the recorder. +It can also be used with an external mic in the line-in (had to use a pre-amp with that). Tested on **Windows 10**. + +* **Tascam DR-40X** stereo recorder as above. Set "Monitor" to "PC/Mac". **Linux Ubuntu 18.04**. + +* **[Zoom H4](https://zoomcorp.com/en/us/handheld-recorders/handheld-recorders/h4/)**, USB portable recorder +Works well on Mac, PC and Raspberry Pi4 + + +### Firewire devices + +* **[Presonus StudioLive 16.4.2 AI](https://www.presonus.com/products/StudioLive-1642AI)** (StudioLive AI series), Firewire digital mixing desk +Works perfectly with Jamulus under **macOS** (not yet tested on Big Sur). Assign the individual inputs in Jamulus or the corresponding inputs to a stereo auxiliary mix (to be patched in "Universal Control") if more than two channels. Use outputs 17-18 to monitor the Jamulus mix. +These devices work under Windows, they should work with Jamulus under this OS (not tested). +Not tested under Linux, may (or may not) work, see [here](https://forums.presonus.com/viewtopic.php?f=67&t=2717). + +* **[Edirol (Roland) FA-66](https://www.roland.com/global/products/fa-66/)** Firewire digital audio interface +Good on **macOS**, **Linux**, et **Windows**, [Pilote ASIO](https://www.roland.com/global/products/fa-66/downloads/). + +* **[MOTU Ultralite](https://motu.com/products/motuaudio/copy_of_ultralite/body-old.html)** (2010 models MK1/MK2), Firewire digital audio interface +Tested on e MacBook Pro 2015, **Mac OS X** 10.11.6 (El Capitan), Apple Thunderbolt/Firewire adaptor. + +### Thunderbolt devices + +* **[Focusrite Clarett 4Pre](https://focusrite.com/en/usb-c-audio-interface/clarett-usb/clarett-4pre-usb)**, Thunderbolt 2 digital audio interface + +* **[Resident Audio T4](http://www.residentaudio.com/t4overview)**, Thunderbolt 2 digital audio interface + +* **[Universal Audio Arrow](https://www.uaudio.com/audio-interfaces/arrow.html)**, Thunderbolt 3 digital audio interface +This device provides the lowest latency. + +* **[Zoom TAC-2](https://zoomcorp.com/en/us/audio-interface/audio-interfaces/tac-2/)**, Thunderbolt 2 digital audio interface + +### Internal soundcards + +* **[HiFiBerry DAC+ ADC](https://www.hifiberry.com/shop/boards/hifiberry-dac-adc/)**, Raspberry Pi compatible HAC internal sound card. +Virtually no jitter and good latency (20 milliseconds). No headphone amp, so you'll need one. Used with a mini console [Rolls MX122](https://rolls.com/product/MX22s). Tested on Raspberry Pi 4 under **Raspberry Pi OS Buster**, kernel version 4.19. + +* **[Soundblaster Live!](https://en.wikipedia.org/wiki/Sound_Blaster_Live!)**, PCI internal sound card +With [kX ASIO driver](https://www.kxproject.com/) + +* **[Soundblaster Audigy 4](https://en.wikipedia.org/wiki/Sound_Blaster_Audigy#Sound_Blaster_Audigy_4)**, PCI internal sound card + +## Audio devices known not to work with Jamulus + +* **Zoom B3**, USB amplifier modeling pedal for bass. **Does not support 48 KHz**. + +* **Line6 Bass POD**, USB amplifier modeling pedal for bass. **Does not support 48 KHz**. From f65f785fc8006c0f1e051ec89a1fd2658b859e1f Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Tue, 5 Jan 2021 21:17:55 +0100 Subject: [PATCH 149/280] Move Sound Devices to community KB --- _posts/2021-01-05-Jamulus-Sound-Devices.md | 18 ++--- wiki/en/en-Getting-Started.md | 2 +- wiki/en/en-Sound-Devices.md | 86 +--------------------- 3 files changed, 13 insertions(+), 93 deletions(-) diff --git a/_posts/2021-01-05-Jamulus-Sound-Devices.md b/_posts/2021-01-05-Jamulus-Sound-Devices.md index 9e150af86..a07e47f18 100644 --- a/_posts/2021-01-05-Jamulus-Sound-Devices.md +++ b/_posts/2021-01-05-Jamulus-Sound-Devices.md @@ -1,19 +1,19 @@ --- layout: post title: "Audio devices for Jamulus" -lang: "en"" +lang: "en" heading: "Sound devices" lang: "en" --- -# Sound Devices - Thanks to Jamulus users, this page lists audio devices known to work (or not) with Jamulus. - + _**Note**: If they work or not depends on your operating system (Linux, MacOS, Windows, etc.)_. -You can update this page with the information you have. **Please indicate the platform(s) you are using!**. Just open an issue on the +## Updating this page + +You can update this page with the information you have. **Please indicate the platform(s) you are using!**. Just [open an issue with the sound device topic on the Jamulus documentation repo](https://github.com/jamulussoftware/jamuluswebsite/issues/new?template=newsounddevice.md). ## Audio devices known to work with Jamulus @@ -30,7 +30,7 @@ Latency is good under **Linux**. You can't disable local monitoring (or we haven Set the PC/Mix dialog box to 100% PC to listen to Jamulus' mix on the headphone output. Tested with a Raspberry Pi 4 under **Raspberry Pi OS Buster**, kernel version 4.19. -* **[Behringer UGC102](https://www.behringer.com/behringer/product?modelCode=P0198)**, Guitar-to-USB Interface (guitar and bass) +* **[Behringer UGC102](https://www.behringer.com/behringer/product?modelCode=P0198)**, Guitar-to-USB Interface (guitar and bass) _Note: On **macOS**, this device appears as "USB Audio Codec". When selected for input and output in Jamulus, the **UGC102** headphone jack is the output (and cannot be used for input)._ #### Audio interfaces / digital mixing consoles @@ -39,7 +39,7 @@ _Note: On **macOS**, this device appears as "USB Audio Codec". When selected for Works great under **Linux** (Ubunutu 20.04 or Raspberry Pi OS (Buster)), **macOS** (not tested on Big Sur) or **Windows 10** with the [native ASIO driver](http://eu1.download.solidstatelogic.com/SSL%202/SolidStateLogic_UsbAudio_v4.67.0_2019-10-21_setup%20(3).exe). The monitoring of the Jamulus mix is done by moving the "MONITOR MIX" completely to the right to "USB". See the [official manual](http://eu1.download.solidstatelogic.com/2%20Plus%20/SSL%202%20Plus%20User%20Guide_ENGLISH.pdf). -* **[Ammoon AGM02](https://www.ammoon.com/p-i3974.html)** and **[Ammoon AGM04](https://www.ammoon.com/p-i4049.html)**, low-cost USB 2-channel and 4-channel compact mixing consoles +* **[Ammoon AGM02](https://www.ammoon.com/p-i3974.html)** and **[Ammoon AGM04](https://www.ammoon.com/p-i4049.html)**, low-cost USB 2-channel and 4-channel compact mixing consoles Both tested on **macOS Catalina**. The **AGM02** tested on **Windows 10**. On Windows 10, with ASIO4ALL, the **AGM02** can be used as an input, and the onboard audio as the output. There is no way to monitor only the USB return signal on the **AGM02**. _**Note:** The Ammoon AGM04 appears to be a re-branded [ART USBMix4](https://artproaudio.com/product/usbmix4-four-channel-mixer-usb-audio-interface/)._ @@ -56,7 +56,7 @@ On Windows, [ASIO4ALL](http://www.asio4all.org/) driver works OK but not great. * **[Behringer UMC202HD](https://www.behringer.com/product.html?modelCode=P0BJZ)**, **UMC204HD**, et **UMC404HD** USB digital audio interfaces [pilotes ASIO pour Windows 7 à 10](http://downloads.music-group.com/software/behringer/UMC/UMC-Driver_4-59-0.zip) -* **[Behringer X32](https://www.behringer.com/behringer/product?modelCode=P0ASF)** X-USB digital mixing desk 32-in/32-out +* **[Behringer X32](https://www.behringer.com/behringer/product?modelCode=P0ASF)** X-USB digital mixing desk 32-in/32-out * **[Behringer XR18](https://www.behringer.com/product.html?modelCode=P0BI8)** (XR serie), USB digital mixing consoles @@ -78,7 +78,7 @@ Tested on **Windows 10** with 64 sample buffer and am getting great sound and to Works directly on **macOS** with a beautiful sound even with un-balanced jack. Works on a **Raspberry PI4** provided `jackd` version used is the one from `/usr/bin` (Tweaking `raspijamulus.sh`). Not tested on PC. -* **[Steinberg UR22 MKII](https://www.steinberg.net/en/products/audio_interfaces/ur_series/models/ur22mkii.html)**, USB digital audio interface +* **[Steinberg UR22 MKII](https://www.steinberg.net/en/products/audio_interfaces/ur_series/models/ur22mkii.html)**, USB digital audio interface Sounds great, can achieve 32 frame buffer and works on **Windows** and **Linux**. Not tested on **macOS**. diff --git a/wiki/en/en-Getting-Started.md b/wiki/en/en-Getting-Started.md index 9392c5227..69f255d9a 100644 --- a/wiki/en/en-Getting-Started.md +++ b/wiki/en/en-Getting-Started.md @@ -41,7 +41,7 @@ Also - [Jamulus OS!](https://sourceforge.net/projects/jamulus-os/files/JamulusOS In general, your device must support a sample rate of **48kHz** (DVD quality) and should allow you to listen to the computer's audio signal. On Windows it's recommended to choose a device with a native [ASIO](https://en.wikipedia.org/wiki/Audio_Stream_Input/Output) driver. -See [the list of known good hardware](Sound-Devices). +See [the community list of known good hardware](/kb/2021/01/05/Jamulus-Sound-Devices.html). ## 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-Sound-Devices.md b/wiki/en/en-Sound-Devices.md index 63abbe7c0..72a4495cd 100644 --- a/wiki/en/en-Sound-Devices.md +++ b/wiki/en/en-Sound-Devices.md @@ -1,87 +1,7 @@ --- -layout: wiki -title: "Known Good Devices" +layout: redirect +redirect: "/kb/2021/01/05/Jamulus-Sound-Devices.html" lang: "en" permalink: "/wiki/Sound-Devices" +category: "hidden" --- - -# Known Good Devices - -This page lists hardware known to work or not work with Jamulus (although it may vary between Windows, Mac and Linux). Please update with any new information you have (and indicate the platform(s) you have used). - -### Known to Work with Jamulus - -#### USB Microphones - -* Blue Yeti microphone. Works well on Mac (there is a checkbox to turn off local monitoring). Works OK on Windows with ASIO4ALL but with a bit more latency than on Mac. You can turn off the local monitoring if you go deep into the settings. Latency on Linux is good but I did not find any way to turn off the local monitoring. - -* [Shure X2u](https://www.shure.com/en-GB/products/accessories/x2u-xlr-usb-interface) XLR to USB audio interface with headphone jack, converting an XLR mic into a USB mic. Set PC/Mic mix dial to 100% PC and listen to the output on headphones. Tested using Raspberry Pi 4 running Raspberry Pi OS Buster, kernel version 4.19. - - -#### Audio interfaces - -* Ammoon [AGM02](https://www.ammoon.com/p-i3974.html) and [AGM04](https://www.ammoon.com/p-i4049.html) USB mixer: relatively inexpensive 4 channel USB mixers, both tested on MacOS Catalina, the AGM02 tested on Windows 10. On Windows 10, with ASIO4ALL, the AGM02 can be used as an input, and the onboard audio as the output. There is no way to monitor only the USB return signal on the AGM02. (USB Audio) -**Note:** The Ammoon AGM04 appears to be a re-branded [ART USBMix4](https://artproaudio.com/product/usbmix4-four-channel-mixer-usb-audio-interface/). - -* ART USB Mix4 (USB audio interface + 4 channel mixer). - -* Audient EVO 4, [driver download and install](https://evo.audio/driver-installation/) (USB Audio) - -* Behringer UCA222 & UCA202 U-Control (USB audio) _Note: Works best on Mac and Linux. On Windows, [ASIO4ALL](https://www.asio4all.org/) driver works OK but not great. There is also the [native driver](http://www.behringerdownload.de/_software/BEHRINGER_2902_X64_2.8.40.zip) which Behringer withdrew support for a while ago, and therefore removed from their download section._ - -* Behringer UGC102 (USB interface for guitar/bass) _Note: On Mac, appears as "USB Audio Codec" - when selected for input and output in Jamulus, the UGC102 headphone jack is the output (and cannot be used for input)._ - -* Behringer UMC202HD, UMC204HD, and UMC404HD interfaces, [Windows 7 to 10 ASIO Driver](http://downloads.music-group.com/software/behringer/UMC/UMC-Driver_4-59-0.zip) (USB Audio) - -* Behringer X32 digital mixer with X-USB 32-in/32out (USB audio) - -* Behringer XENYX 302USB (USB audio) [Behringer ASIO Driver](http://www.behringerdownload.de/_software/BEHRINGER_2902_X64_2.8.40.zip) - -* Behringer XENYX Q502USB (USB audio) [Behringer ASIO Driver](http://www.behringerdownload.de/_software/BEHRINGER_2902_X64_2.8.40.zip) - -* Behringer XENYX Q802USB (USB audio) [Behringer ASIO Driver](http://www.behringerdownload.de/_software/BEHRINGER_2902_X64_2.8.40.zip). This Behringer ASIO Driver does not appear to be very good. Audio latency with this 'unsupported' driver seems poor - not better than ASIO4ALL. It's good device for Mac and Linux, but perhaps not for Windows. More testing is required. - -* Behringer XR18/XR16/XR12 digital mixers (USB Audio) - -* Edirol FA-66 (FireWire) - good on Mac, Linux, and Windows [ASIO driver](https://www.roland.com/global/products/fa-66/downloads/) - -* Focusrite Clarett 4Pre interface (Thunderbolt 2) - -* Focusrite Scarlett interfaces (USB Audio) _Note: if you have issues with the buffer size going to 136, download the updated driver version `4.64.15.598` from [http://beta.focusrite.com/](http://beta.focusrite.com/)_ - -* HiFiBerry DAC +ADC (HAT). Virtually no jitters and the good latency (20 millseconds). No headphone amplifier, so you'll need one of those. I used a Rolls MX122 mini mixer. Tested using Raspberry Pi 4 running Raspberry Pi OS Buster, kernel version 4.19. - -* iConnectivity AUDIO4+ interface (USB) - -* Lexicon Omega (USB audio) _Note: Works best on Mac and Linux. There is a driver for Windows but this does not allow to use 64 samples buffer size and adds some latency compared to, e.g., the Mac driver._ - -* Line 6 Helix Stomp, read [Remote Jamming with Helix and Jamulus](https://jimamsden.wordpress.com/2020/04/04/remote-jamming-with-helix-and-jamulus/) for setup on a Mac. (USB Audio) - -* MOTU Ultralite (2010 FireWire model mk1/mk2), 2015 MacBook Pro, OS X El Capitan 10.11.6, Apple Thunderbolt/FireWire adapter. - -* Native Instruments Komplete Audio 2, Tested on Win10 with 64 sample buffer and am getting great sound and total latency around 15ms over the ping time. (USB Audio) - -* Resident Audio T4 (Thunderbolt 2) - -* Soundblaster live with kX ASIO driver - -* Soundblaster Audigy 4 - -* Steinberg UR22C (USB3, USBC 32bits 192khz). Works directly on a Mac with a beautiful sound even with un-balanced jack. Works on a Raspberry PI4 provided jackd version used is the one from /usr/bin (Tweaking raspijamulus.sh). Not tested on PC. - -* Steinberg UR22 MKII. Sounds great, can achieve 32 frame buffer and works on Windows and Linux. Not tested on Mac. - -* Tascam DR-07X stereo recorder with USB audio into computer, headphones in line-out of the recorder. It can also be used with an external mic in the line-in (had to use a pre-amp with that). Windows 10. - -* Tascam DR-40X stereo recorder as above. Set "Monitor" to "PC/Mac". Ubuntu 18.04. - -* Universal Audio Arrow (Thunderbolt 3). Achieved lowest-ever latency with this device. - -* Yamaha AG03 (USB audio) - -* Zoom H4 (regular USB) - Works also Mac, PC and Raspberry Pi4 - -* Zoom TAC-2 (Thunderbolt 2) - -### Known Not to work with Jamulus -* Zoom B3 bass amp-modeling pedal. Does not support 48000 Hz. (USB Audio) From e89d062a9bafda1cec6ca14e7bf057f28e53b9c5 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Tue, 5 Jan 2021 22:30:07 +0100 Subject: [PATCH 150/280] Structure sound devices by OS --- _posts/2021-01-05-Jamulus-Sound-Devices.md | 310 ++++++++++++++++----- 1 file changed, 244 insertions(+), 66 deletions(-) diff --git a/_posts/2021-01-05-Jamulus-Sound-Devices.md b/_posts/2021-01-05-Jamulus-Sound-Devices.md index a07e47f18..66478e753 100644 --- a/_posts/2021-01-05-Jamulus-Sound-Devices.md +++ b/_posts/2021-01-05-Jamulus-Sound-Devices.md @@ -9,11 +9,11 @@ lang: "en" Thanks to Jamulus users, this page lists audio devices known to work (or not) with Jamulus. -_**Note**: If they work or not depends on your operating system (Linux, MacOS, Windows, etc.)_. +_**Note**: If they work or can also depend on your operating system (Linux, MacOS, Windows, etc.)_. ## Updating this page -You can update this page with the information you have. **Please indicate the platform(s) you are using!**. Just [open an issue with the sound device topic on the Jamulus documentation repo](https://github.com/jamulussoftware/jamuluswebsite/issues/new?template=newsounddevice.md). +You can update this page with the information you have. **Please indicate the platform(s) you are using!**. Just [open an issue with the sound device topic on the Jamulus documentation repo](https://github.com/jamulussoftware/jamuluswebsite/issues/new?template=newsounddevice.md) and fill the form. ## Audio devices known to work with Jamulus @@ -21,97 +21,261 @@ You can update this page with the information you have. **Please indicate the pl #### Microphones / DI Boxes -* **[Blue Yeti](https://www.bluemic.com/en-us/products/yeti/)**, USB Microphone -Works well under **macOS** (there is a check option to disable local monitoring). -Works well under **Windows 10 with ASIO4All**, a bit more latency than under macOS. You can disable local monitoring by going deep into the settings. -Latency is good under **Linux**. You can't disable local monitoring (or we haven't found out how to do it, feel free to send us the information if you know how to do it). +**[Blue Yeti](https://www.bluemic.com/en-us/products/yeti/)**, USB Microphone + +**Windows**: Works well *with ASIO4All*; a bit more latency than under macOS. You can disable local monitoring by going deep into the settings. + +**macOS**: Works well. (There is a check option to disable local monitoring). + +**Linux**: Latency is good. You can't disable local monitoring (or we haven't found out how to do it, feel free to add this information if you know how to do it). + +*** + +**[Shure X2u](https://www.shure.com/en-GB/products/accessories/x2u-xlr-usb-interface)**, USB to XLR audio interface with headphone jack connector that converts a wired microphone to a USB microphone. + +**Windows**: Set the PC/Mix dialog box to 100% PC to listen to Jamulus' mix on the headphone output. + +**macOS**: not yet tested. + +**Linux**: Tested with a Raspberry Pi 4 under *Raspberry Pi OS Buster*, kernel version 4.19. + +*** + +**[Behringer UGC102](https://www.behringer.com/behringer/product?modelCode=P0198)**, Guitar-to-USB Interface (guitar and bass) + +**Windows**: not yet tested. + +**macOS**: This device appears as "USB Audio Codec". When selected for input and output in Jamulus, the **UGC102** headphone jack is the output (and cannot be used for input). + +**Linux**: not yet tested. -* **[Shure X2u](https://www.shure.com/en-GB/products/accessories/x2u-xlr-usb-interface)**, USB to XLR audio interface with headphone jack connector that converts a wired microphone to a USB microphone. -Set the PC/Mix dialog box to 100% PC to listen to Jamulus' mix on the headphone output. -Tested with a Raspberry Pi 4 under **Raspberry Pi OS Buster**, kernel version 4.19. -* **[Behringer UGC102](https://www.behringer.com/behringer/product?modelCode=P0198)**, Guitar-to-USB Interface (guitar and bass) -_Note: On **macOS**, this device appears as "USB Audio Codec". When selected for input and output in Jamulus, the **UGC102** headphone jack is the output (and cannot be used for input)._ #### Audio interfaces / digital mixing consoles -* **[Solid State Logic SSL2+](https://www.solidstatelogic.com/products/ssl2-plus)**, USB-C/USB digital audio/MIDI interface 2 in/4 out -Works great under **Linux** (Ubunutu 20.04 or Raspberry Pi OS (Buster)), **macOS** (not tested on Big Sur) or **Windows 10** with the [native ASIO driver](http://eu1.download.solidstatelogic.com/SSL%202/SolidStateLogic_UsbAudio_v4.67.0_2019-10-21_setup%20(3).exe). +**[Solid State Logic SSL2+](https://www.solidstatelogic.com/products/ssl2-plus)**, USB-C/USB digital audio/MIDI interface 2 in/4 out + +**Windows**: Works great with the [native ASIO driver](http://eu1.download.solidstatelogic.com/SSL%202/SolidStateLogic_UsbAudio_v4.67.0_2019-10-21_setup%20(3).exe). + +**macOS**: Works great (not tested on Big Sur). + +**Linux**: Works great (Tested on Ubuntu 20.04 and Raspberry Pi OS (Buster)) + The monitoring of the Jamulus mix is done by moving the "MONITOR MIX" completely to the right to "USB". See the [official manual](http://eu1.download.solidstatelogic.com/2%20Plus%20/SSL%202%20Plus%20User%20Guide_ENGLISH.pdf). -* **[Ammoon AGM02](https://www.ammoon.com/p-i3974.html)** and **[Ammoon AGM04](https://www.ammoon.com/p-i4049.html)**, low-cost USB 2-channel and 4-channel compact mixing consoles -Both tested on **macOS Catalina**. -The **AGM02** tested on **Windows 10**. On Windows 10, with ASIO4ALL, the **AGM02** can be used as an input, and the onboard audio as the output. There is no way to monitor only the USB return signal on the **AGM02**. +*** + +**[Ammoon AGM02](https://www.ammoon.com/p-i3974.html)** and **[Ammoon AGM04](https://www.ammoon.com/p-i4049.html)**, low-cost USB 2-channel and 4-channel compact mixing consoles + +**Windows**: Works. Tested *AGM02*. On Windows 10, with ASIO4ALL, the **AGM02** can be used as an input, and the onboard audio as the output. There is no way to monitor only the USB return signal on the **AGM02**. + +**macOS**: Both tested on **macOS Catalina**. + +**Linux**: Not yet tested. + _**Note:** The Ammoon AGM04 appears to be a re-branded [ART USBMix4](https://artproaudio.com/product/usbmix4-four-channel-mixer-usb-audio-interface/)._ -* **ART USBMix4**, USB 4-channel compact mixing console (_see above_) +**ART USBMix4**, USB 4-channel compact mixing console (_see above_) + +*** + +**[Audient EVO 4](https://evo.audio/products/evo-4/overview/)**, USB digital audio interface 2-in/2-out + +**Windows**: Should work + +**macOS**: Should work + +**Linux**: Not yet tested. + +[Driver installation and download](https://evo.audio/driver-installation/) + +*** + +**[Behringer UCA222](https://www.behringer.com/product.html?modelCode=P0A31)** & **Behringer UCA202 U-Control**, 2-in/2-out USB Audio Interface with Digital Output + +**Windows**: [ASIO4ALL](http://www.asio4all.org/) driver works OK but not great. There is also the [native driver](http://www.behringerdownload.de/_software/BEHRINGER_2902_X64_2.8.40.zip) which Behringer withdrew support for a while ago, and therefore removed from their download section. + +**macOS**: Works better than on Windows. + +**Linux**: Works better than on Windows. + +*** + +**[Behringer UMC202HD](https://www.behringer.com/product.html?modelCode=P0BJZ)**, **UMC204HD**, and **UMC404HD** USB digital audio interfaces. Affordable. Behringer provides native ASIO drivers for Windows. + +**Windows**: Works great. [ASIO driver Windows 7 to 10](https://mediadl.musictribe.com/download/software/behringer/UMC/UMC-Driver_4-59-0.zip) + +**macOS**: Works great + +**Linux**: Works great + +*** + +**[Behringer X32](https://www.behringer.com/behringer/product?modelCode=P0ASF)** X-USB digital mixing desk 32-in/32-out + +**Windows**: Should work. + +**macOS**: Should work. + +**Linux**: Not yet tested. + +*** + +**[Behringer XR18](https://www.behringer.com/product.html?modelCode=P0BI8)** (XR serie), USB digital mixing consoles + +**Windows**: Should work. + +**macOS**: Should work. + +**Linux**: Not yet tested. + +*** + +**[Berhinger XENYX serie](https://www.behringer.com/series.html?category=R-BEHRINGER-XENYXSERIES)**, USB digital audio interfaces + +**Windows**: Works, but not great. The [Behringer ASIO Driver](http://www.behringerdownload.de/_software/BEHRINGER_2902_X64_2.8.40.zip) does not appear to be very good. Audio latency with this "unsupported" driver seems poor - not better than ASIO4ALL. + +**macOS**: Works great. + +**Linux**: Works great. -* **[Audient EVO 4](https://evo.audio/products/evo-4/overview/)**, USB digital audio interface 2-in/2-out -[Driver installation and download](https://evo.audio/driver-installation/), +_More testing required._ -* **[Behringer UCA222](https://www.behringer.com/product.html?modelCode=P0A31)** & **Behringer UCA202 U-Control**, 2-in/2-out USB Audio Interface with Digital Output -_Note: Works best on **macOS** and **Linux**._ -On Windows, [ASIO4ALL](http://www.asio4all.org/) driver works OK but not great. There is also the [native driver](http://www.behringerdownload.de/_software/BEHRINGER_2902_X64_2.8.40.zip) which Behringer withdrew support for a while ago, and therefore removed from their download section. +*** -* **[Behringer UMC202HD](https://www.behringer.com/product.html?modelCode=P0BJZ)**, **UMC204HD**, et **UMC404HD** USB digital audio interfaces -[pilotes ASIO pour Windows 7 à 10](http://downloads.music-group.com/software/behringer/UMC/UMC-Driver_4-59-0.zip) +**[Focusrite Scarlett serie](https://focusrite.com/en/scarlett)**, USB digital audio interfaces -* **[Behringer X32](https://www.behringer.com/behringer/product?modelCode=P0ASF)** X-USB digital mixing desk 32-in/32-out +**Windows**: Works great. If you have issues with the buffer size going to 136, download the updated driver version `4.64.15.598` from [http://beta.focusrite.com/](http://beta.focusrite.com/) -* **[Behringer XR18](https://www.behringer.com/product.html?modelCode=P0BI8)** (XR serie), USB digital mixing consoles +**macOS**: Should work great. -* **[Berhinger XENYX serie](https://www.behringer.com/series.html?category=R-BEHRINGER-XENYXSERIES)**, USB digital audio interfaces -[Behringer ASIO Driver](http://www.behringerdownload.de/_software/BEHRINGER_2902_X64_2.8.40.zip). This Behringer ASIO Driver does not appear to be very good. Audio latency with this "unsupported" driver seems poor - not better than ASIO4all. It's good device for **macOS** and **Linux**, but perhaps not for Windows. More testing is required. +**Linux**: Not tested, but should work great. -* **[Focusrite Scarlett serie](https://focusrite.com/en/scarlett)**, USB digital audio interfaces -_Note: if you have issues with the buffer size going to 136, download the updated driver version `4.64.15.598` from [http://beta.focusrite.com/](http://beta.focusrite.com/)_ +*** -* **[iConnectivity AUDIO4+](https://www.iconnectivity.com/products/audio/iconnectaudio4plus)**, USB digital audio interface +**[iConnectAUDIO4+](https://www.iconnectivity.com/products/audio/iconnectaudio4plus)**, Discontinued USB digital audio interface -* **[Lexicon Omega](https://lexiconpro.com/en/products/omega)**, USB digital audio interface -_Note: Works best on **macOS** and **Linux**. There is a driver for Windows but this does not allow to use 64 samples buffer size and adds some latency compared to, e.g.,the mocOS driver._ +**Windows**: Provides [ASIO drivers](https://www.iconnectivity.com/downloads). -* **[Native Instruments Komplete Audio 2](https://www.native-instruments.com/en/products/komplete/audio-interfaces/komplete-audio-1-audio-2/)**, USB digital audio interface -Tested on **Windows 10** with 64 sample buffer and am getting great sound and total latency around 15ms over the ping time. +**macOS**: Should work. -* **[Steinberg UR22C](https://new.steinberg.net/audio-interfaces/ur22c/)** USB-C/USB3 digital audio interface -Works directly on **macOS** with a beautiful sound even with un-balanced jack. -Works on a **Raspberry PI4** provided `jackd` version used is the one from `/usr/bin` (Tweaking `raspijamulus.sh`). Not tested on PC. +**Linux**: Not yet tested. -* **[Steinberg UR22 MKII](https://www.steinberg.net/en/products/audio_interfaces/ur_series/models/ur22mkii.html)**, USB digital audio interface -Sounds great, can achieve 32 frame buffer and works on **Windows** and **Linux**. -Not tested on **macOS**. +*** -* **[Yamaha AG03](https://usa.yamaha.com/products/music_production/interfaces/ag_series/index.html)**, USB digital audio/MIDI interface +**[Lexicon Omega](https://lexiconpro.com/en/products/omega)**, USB digital audio interface + +**Windows**: There is an ASIO driver which does not allow to use 64 samples buffer size and adds some latency. + +**macOS**: Should work. + +**Linux**: Not yet tested. + +*** + +**[Native Instruments Komplete Audio 2](https://www.native-instruments.com/en/products/komplete/audio-interfaces/komplete-audio-1-audio-2/)**, USB digital audio interface + +**Windows**: Tested on *Windows 10* with 64 sample buffer and am getting great sound and total latency around 15ms over the ping time. + +**macOS**: Should work + +**Linux**: Not yet tested. + +*** + +**[Steinberg UR22C](https://new.steinberg.net/audio-interfaces/ur22c/)** USB-C/USB3 digital audio interface + +**Windows**: Provides ASIO Driver. Not yet tested. + +**macOS**: Works directly on *macOS* with a beautiful sound even with un-balanced jack. + +**Linux**: Works on a *Raspberry PI4* provided `jackd` version used is the one from `/usr/bin` (Tweaking `raspijamulus.sh`). + +*** + +**[Steinberg UR22 MKII](https://www.steinberg.net/en/products/audio_interfaces/ur_series/models/ur22mkii.html)**, USB digital audio interface + +**Windows**: Works (great ?) on Windows. + +**macOS**: Not yet tested. + +**Linux**: Works (great?) on Linux. + +Sounds great, can achieve 32 frame buffer and works on *Windows* and *Linux*. + +*** + +**[Yamaha AG03](https://usa.yamaha.com/products/music_production/interfaces/ag_series/index.html)**, USB digital audio/MIDI interface + +**Windows**: Tested on *Windows 10* with 64 sample buffer and am getting great sound and total latency around 15ms over the ping time. + +**macOS**: Should work + +**Linux**: Not yet tested. #### Amp modelers/effects pedals for instruments -* **[Line 6 HX Stomp](https://line6.com/hx-stomp/)**, USB multi-effects pedal for guitar -See [Remote Jam with Helix and Jamulus](https://jimamsden.wordpress.com/2020/04/04/remote-jamming-with-helix-and-jamulus/) for settings on a Mac. +**[Line 6 HX Stomp](https://line6.com/hx-stomp/)**, USB multi-effects pedal for guitar + +**Windows**: not yet tested. + +**macOS**: See [Remote Jam with Helix and Jamulus](https://jimamsden.wordpress.com/2020/04/04/remote-jamming-with-helix-and-jamulus/) for settings on a Mac. + +**Linux**: not yet tested. #### Digital recorders -* **Tascam DR-07X** stereo recorder with USB audio into computer, headphones in line-out of the recorder. -It can also be used with an external mic in the line-in (had to use a pre-amp with that). Tested on **Windows 10**. +**Tascam DR-07X** stereo recorder with USB audio into computer, headphones in line-out of the recorder. -* **Tascam DR-40X** stereo recorder as above. Set "Monitor" to "PC/Mac". **Linux Ubuntu 18.04**. +**Windows**: Can also be used with an external mic in the line-in (had to use a pre-amp with that). -* **[Zoom H4](https://zoomcorp.com/en/us/handheld-recorders/handheld-recorders/h4/)**, USB portable recorder -Works well on Mac, PC and Raspberry Pi4 +**macOS**: should work. +**Linux**: not yet tested. -### Firewire devices +**Tascam DR-40X** stereo recorder as above. Set "Monitor" to "PC/Mac". **Linux Ubuntu 18.04**. -* **[Presonus StudioLive 16.4.2 AI](https://www.presonus.com/products/StudioLive-1642AI)** (StudioLive AI series), Firewire digital mixing desk -Works perfectly with Jamulus under **macOS** (not yet tested on Big Sur). Assign the individual inputs in Jamulus or the corresponding inputs to a stereo auxiliary mix (to be patched in "Universal Control") if more than two channels. Use outputs 17-18 to monitor the Jamulus mix. -These devices work under Windows, they should work with Jamulus under this OS (not tested). -Not tested under Linux, may (or may not) work, see [here](https://forums.presonus.com/viewtopic.php?f=67&t=2717). +*** -* **[Edirol (Roland) FA-66](https://www.roland.com/global/products/fa-66/)** Firewire digital audio interface -Good on **macOS**, **Linux**, et **Windows**, [Pilote ASIO](https://www.roland.com/global/products/fa-66/downloads/). +**[Zoom H4](https://zoomcorp.com/en/us/handheld-recorders/handheld-recorders/h4/)**, USB portable recorder -* **[MOTU Ultralite](https://motu.com/products/motuaudio/copy_of_ultralite/body-old.html)** (2010 models MK1/MK2), Firewire digital audio interface -Tested on e MacBook Pro 2015, **Mac OS X** 10.11.6 (El Capitan), Apple Thunderbolt/Firewire adaptor. +**Windows**: Works well. + +**macOS**: Works well. + +**Linux**: Tested on Raspberry Pi 4. Works well. + +### FireWire devices + +**[Presonus StudioLive 16.4.2 AI](https://www.presonus.com/products/StudioLive-1642AI)** (StudioLive AI series), FireWire digital mixing desk + +**Windows**: Since these devices work with Windows, they should also work with Jamulus. + +**macOS**: Works perfectly with Jamulus. Not yet tested on Big Sur. Assign the individual inputs in Jamulus or the corresponding inputs to a stereo auxiliary mix (to be patched in "Universal Control") if more than two channels. Use outputs 17-18 to monitor the Jamulus mix. + +**Linux**: Not tested under Linux, may (or may not) work, see [here](https://forums.presonus.com/viewtopic.php?f=67&t=2717). + +*** + +**[Edirol (Roland) FA-66](https://www.roland.com/global/products/fa-66/)** Firewire digital audio interface + +**Windows**: Works well. [ASIO driver download](https://www.roland.com/global/products/fa-66/downloads/) + +**macOS**: Works well. + +**Linux**: Works well. + +*** + +**[MOTU Ultralite](https://motu.com/products/motuaudio/copy_of_ultralite/body-old.html)** (2010 models MK1/MK2), Firewire digital audio interface + +**Windows**: Their page says it should work on Windows. + +**macOS**: Tested on MacBook Pro 2015, **Mac OS X** 10.11.6 (El Capitan) with Apple Thunderbolt/FireWire adapter. + +**Linux**: Not yet tested. Should work since it's class compliant. + +*** ### Thunderbolt devices @@ -120,22 +284,36 @@ Tested on e MacBook Pro 2015, **Mac OS X** 10.11.6 (El Capitan), Apple Thunderbo * **[Resident Audio T4](http://www.residentaudio.com/t4overview)**, Thunderbolt 2 digital audio interface * **[Universal Audio Arrow](https://www.uaudio.com/audio-interfaces/arrow.html)**, Thunderbolt 3 digital audio interface -This device provides the lowest latency. +This device provides the **lowest latency**. * **[Zoom TAC-2](https://zoomcorp.com/en/us/audio-interface/audio-interfaces/tac-2/)**, Thunderbolt 2 digital audio interface ### Internal soundcards -* **[HiFiBerry DAC+ ADC](https://www.hifiberry.com/shop/boards/hifiberry-dac-adc/)**, Raspberry Pi compatible HAC internal sound card. -Virtually no jitter and good latency (20 milliseconds). No headphone amp, so you'll need one. Used with a mini console [Rolls MX122](https://rolls.com/product/MX22s). Tested on Raspberry Pi 4 under **Raspberry Pi OS Buster**, kernel version 4.19. +**[HiFiBerry DAC+ ADC](https://www.hifiberry.com/shop/boards/hifiberry-dac-adc/)**, Raspberry Pi compatible HAC internal sound card. + +**Linux**: Virtually no jitter and good latency (20 milliseconds). No headphone amp, so you'll need one. Used with a mini console [Rolls MX122](https://rolls.com/product/MX22s). Tested on Raspberry Pi 4 under **Raspberry Pi OS Buster**, kernel version 4.19. + +**Windows**: Not yet tested (if anybody runs Windows ARM on a Raspberry Pi feel free to test it). Probably no ASIO Driver available. + +**macOS**: ? + +*** + +**[Soundblaster Live!](https://en.wikipedia.org/wiki/Sound_Blaster_Live!)**, PCI internal sound card + +**Windows**: Works with [kX ASIO driver](https://www.kxproject.com/) + +**macOS**: ? + +**Linux**: ? -* **[Soundblaster Live!](https://en.wikipedia.org/wiki/Sound_Blaster_Live!)**, PCI internal sound card -With [kX ASIO driver](https://www.kxproject.com/) +**[Soundblaster Audigy 4](https://en.wikipedia.org/wiki/Sound_Blaster_Audigy#Sound_Blaster_Audigy_4)**, PCI internal sound card -* **[Soundblaster Audigy 4](https://en.wikipedia.org/wiki/Sound_Blaster_Audigy#Sound_Blaster_Audigy_4)**, PCI internal sound card +See above. Not fully verified. ## Audio devices known not to work with Jamulus -* **Zoom B3**, USB amplifier modeling pedal for bass. **Does not support 48 KHz**. +* **Zoom B3**, USB amplifier modeling pedal for bass. **Does not support 48 kHz**. -* **Line6 Bass POD**, USB amplifier modeling pedal for bass. **Does not support 48 KHz**. +* **Line6 Bass POD**, USB amplifier modeling pedal for bass. **Does not support 48 kHz**. From 2d041907cef7c2643d7c04f057087ebbdc0e07ca Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Tue, 5 Jan 2021 22:33:00 +0100 Subject: [PATCH 151/280] Update 2021-01-05-Jamulus-Sound-Devices.md --- _posts/2021-01-05-Jamulus-Sound-Devices.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_posts/2021-01-05-Jamulus-Sound-Devices.md b/_posts/2021-01-05-Jamulus-Sound-Devices.md index 66478e753..28f61ab39 100644 --- a/_posts/2021-01-05-Jamulus-Sound-Devices.md +++ b/_posts/2021-01-05-Jamulus-Sound-Devices.md @@ -9,7 +9,7 @@ lang: "en" Thanks to Jamulus users, this page lists audio devices known to work (or not) with Jamulus. -_**Note**: If they work or can also depend on your operating system (Linux, MacOS, Windows, etc.)_. +_**Note**: If they work or not can depend on your operating system (Linux, MacOS, Windows, etc.)_. ## Updating this page From 08577dd8fb13d1934d9f792f821b9b42c6356d17 Mon Sep 17 00:00:00 2001 From: jdrage Date: Wed, 6 Jan 2021 10:19:43 -0800 Subject: [PATCH 152/280] Add more detail for Windows build process --- wiki/en/en-Compiling.md | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/wiki/en/en-Compiling.md b/wiki/en/en-Compiling.md index ef6e8baeb..27fceaf7d 100644 --- a/wiki/en/en-Compiling.md +++ b/wiki/en/en-Compiling.md @@ -62,12 +62,21 @@ Will build the file and make it available in `./Release/Jamulus.app` ## Windows You don't need to compile Jamulus for Windows since we provide official binaries, but if you really want to, follow the instructions below. -**Required software**: [Qt](https://www.qt.io/download), a compiler like Visual Studio, ASIO development files +###Required Software +- A compiler like [Visual Studio](https://visualstudio.microsoft.com) +- [Qt](https://www.qt.io/download) +-- Use the free GPLv2 license for Open Source development +-- Select Components during installation - Under **Qt 5.12.3**, 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/de/company/developer.html) -- get the Jamulus source code e.g. via git or via zip download from the Jamulus Repo -- get and copy the [ASIOSDK](https://www.steinberg.net/de/company/developer.html) development files in `[\path\to\jamulus\source]\windows` directory so that, e.g., the - directory `[\path\to\jamulus\source]\ASIOSDK2\common` exists -- open Jamulus.pro in Qt Creator then compile & run +###Setup Steps +1. Get the Jamulus source code e.g. via git or via .zip downloaded from the [Jamulus Repo](https://github.com/corrados/jamulus) + +1. Create a folder under windows called ASIOSDK2 + +1. Download the [ASIOSDK](https://www.steinberg.net/asiosdk), open the top level folder in the .zip file and copy the contents into `[\path\to\jamulus\source]\windows\ASIOSDK2` so that, e.g., the folder `[\path\to\jamulus\source]\windows\ASIOSDK2\common` exists + +1. Open Jamulus.pro in Qt Creator, configure the project with a default kit, then compile & run ## General notes From a393f73f6b68660e42fa1b433093c27bc1eda490 Mon Sep 17 00:00:00 2001 From: jdrage Date: Wed, 6 Jan 2021 10:25:37 -0800 Subject: [PATCH 153/280] Fix formatting --- wiki/en/en-Compiling.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wiki/en/en-Compiling.md b/wiki/en/en-Compiling.md index 27fceaf7d..a5451fedd 100644 --- a/wiki/en/en-Compiling.md +++ b/wiki/en/en-Compiling.md @@ -62,14 +62,14 @@ Will build the file and make it available in `./Release/Jamulus.app` ## Windows You don't need to compile Jamulus for Windows since we provide official binaries, but if you really want to, follow the instructions below. -###Required Software +### Required Software - A compiler like [Visual Studio](https://visualstudio.microsoft.com) - [Qt](https://www.qt.io/download) --- Use the free GPLv2 license for Open Source development --- Select Components during installation - Under **Qt 5.12.3**, add the compiler components for your compiler, e.g., MSVC 2017 32-bit / 64-bit for Visual Studio 2019 + - Use the free GPLv2 license for Open Source development + - Select Components during installation: Under **Qt 5.12.3**, 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/de/company/developer.html) -###Setup Steps +### Setup Steps 1. Get the Jamulus source code e.g. via git or via .zip downloaded from the [Jamulus Repo](https://github.com/corrados/jamulus) 1. Create a folder under windows called ASIOSDK2 From 92c23b13ee80d8c8471058a6d99d7def6cf142a5 Mon Sep 17 00:00:00 2001 From: jdrage Date: Wed, 6 Jan 2021 10:33:12 -0800 Subject: [PATCH 154/280] Add Qt versioning info --- wiki/en/en-Compiling.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wiki/en/en-Compiling.md b/wiki/en/en-Compiling.md index a5451fedd..60c2c5387 100644 --- a/wiki/en/en-Compiling.md +++ b/wiki/en/en-Compiling.md @@ -66,7 +66,8 @@ You don't need to compile Jamulus for Windows since we provide official binaries - A compiler like [Visual Studio](https://visualstudio.microsoft.com) - [Qt](https://www.qt.io/download) - Use the free GPLv2 license for Open Source development - - Select Components during installation: Under **Qt 5.12.3**, add the compiler components for your compiler, e.g., MSVC 2017 32-bit / 64-bit for Visual Studio 2019 + - 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. + - 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/de/company/developer.html) ### Setup Steps From 40e5ed0ea7d1e42221c608e5dc54744f816989ff Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Wed, 6 Jan 2021 21:12:55 +0100 Subject: [PATCH 155/280] Small edit --- wiki/en/en-Compiling.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/en/en-Compiling.md b/wiki/en/en-Compiling.md index d9103de1b..e3063b251 100644 --- a/wiki/en/en-Compiling.md +++ b/wiki/en/en-Compiling.md @@ -63,7 +63,7 @@ Will build the file and make it available in `./Release/Jamulus.app` You don't need to compile Jamulus for Windows since we provide official binaries, but if you really want to, follow the instructions below. ### Required Software -* 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 the full IDE from the [Visual Studio download page](https://visualstudio.microsoft.com/downloads/)) +* 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. From b5e601d74fc9d0d6808e54dd3d56de91e639a63c Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Mon, 11 Jan 2021 13:07:01 +0100 Subject: [PATCH 156/280] Add tested Behringer XENYX X1832 USB Thanks to @achim-grosse-oetringhaus #223 --- _posts/2021-01-05-Jamulus-Sound-Devices.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/_posts/2021-01-05-Jamulus-Sound-Devices.md b/_posts/2021-01-05-Jamulus-Sound-Devices.md index 28f61ab39..01bf7bfd5 100644 --- a/_posts/2021-01-05-Jamulus-Sound-Devices.md +++ b/_posts/2021-01-05-Jamulus-Sound-Devices.md @@ -131,19 +131,20 @@ _**Note:** The Ammoon AGM04 appears to be a re-branded [ART USBMix4](https://art *** -**[Berhinger XENYX serie](https://www.behringer.com/series.html?category=R-BEHRINGER-XENYXSERIES)**, USB digital audio interfaces +**[Berhinger XENYX series](https://www.behringer.com/series.html?category=R-BEHRINGER-XENYXSERIES)**, USB digital audio interfaces **Windows**: Works, but not great. The [Behringer ASIO Driver](http://www.behringerdownload.de/_software/BEHRINGER_2902_X64_2.8.40.zip) does not appear to be very good. Audio latency with this "unsupported" driver seems poor - not better than ASIO4ALL. **macOS**: Works great. -**Linux**: Works great. +**Linux**: Works great. +Tested Behringer XENYX X1832 USB (USB audio) on Ubuntu 20.04 LTS which works fine. _More testing required._ *** -**[Focusrite Scarlett serie](https://focusrite.com/en/scarlett)**, USB digital audio interfaces +**[Focusrite Scarlett range](https://focusrite.com/en/scarlett)**, USB digital audio interfaces **Windows**: Works great. If you have issues with the buffer size going to 136, download the updated driver version `4.64.15.598` from [http://beta.focusrite.com/](http://beta.focusrite.com/) From f90d00970f2cc862860266951d96f2a829e957aa Mon Sep 17 00:00:00 2001 From: achim-grosse-oetringhaus <57920844+achim-grosse-oetringhaus@users.noreply.github.com> Date: Mon, 11 Jan 2021 13:09:07 +0100 Subject: [PATCH 157/280] Update en-Sound-Devices.md (#223) Added Behringer XENYX 1832 USB Co-authored-by: ann0see <20726856+ann0see@users.noreply.github.com> --- wiki/en/en-Sound-Devices.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/en/en-Sound-Devices.md b/wiki/en/en-Sound-Devices.md index 72a4495cd..b70603a4f 100644 --- a/wiki/en/en-Sound-Devices.md +++ b/wiki/en/en-Sound-Devices.md @@ -4,4 +4,4 @@ redirect: "/kb/2021/01/05/Jamulus-Sound-Devices.html" lang: "en" permalink: "/wiki/Sound-Devices" category: "hidden" ---- +--- \ No newline at end of file From 55c44ad2ee8a9a501b33340292117dc2b699cdea Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 14 Jan 2021 21:08:18 +0100 Subject: [PATCH 158/280] [fr] links fixes (fr-Server-Win-Mac.md) (#235) (#236) Co-authored-by: Olivier Humbert --- wiki/fr/fr-Server-Win-Mac.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wiki/fr/fr-Server-Win-Mac.md b/wiki/fr/fr-Server-Win-Mac.md index 435e4888e..849571d0c 100644 --- a/wiki/fr/fr-Server-Win-Mac.md +++ b/wiki/fr/fr-Server-Win-Mac.md @@ -12,9 +12,9 @@ _(Note: les copies d'écran ont été faite avec l'interface en anglais, les ter * **Utilisateurs de Windows** : démarrez le serveur en utilisant l'entrée « Jamulus Server » du menu démarrer de Windows. -* **Utilisateurs de macOS** : double-cliquez sur l'icône « Jamulus server » dans Applications (en supposant que vous y avez placé les fichiers de l'installation conformément conformément à [ces instructions](Installation-for-macOS)). +* **Utilisateurs de macOS** : double-cliquez sur l'icône « Jamulus server » dans Applications (en supposant que vous y avez placé les fichiers de l'installation conformément conformément à [ces instructions](Installation-for-Macintosh)). -* **Utilisateurs de Linux** : veuillez vous référer aux [instructions serveur avec IUG](Server-Linux#running-a-server-with-the-gui). +* **Utilisateurs de Linux** : veuillez vous référer aux [instructions serveur avec IUG](Server-Linux#exécuter-un-serveur-avec-iug). configuration du serveur @@ -40,7 +40,7 @@ Activez l'enregistrement du serveur en paramétrant d'abord le répertoire d'enr _Note : lorsque votre serveur enregistre, les clients afficheront un message indiquant que l'enregistrement est en cours._ -Pour les serveurs sans IUG : vous pouvez contrôler la fonction d'enregistrement en [suivant ces instructions](Server-Linux#gestion-des-enregistrements). +Pour les serveurs sans IUG : vous pouvez contrôler la fonction d'enregistrement en [suivant ces instructions](Server-Linux#contrôler-les-enregistrements). ### Autres options @@ -48,7 +48,7 @@ Pour les serveurs sans IUG **Utilisateurs Windows** : si vous souhaitez que le serveur se lance automatiquement au démarrage du système, cochez l'option correspondante. -(Laissez le champ « Adresse personnalisée du serveur central » vide, sauf si vous devez inscrire votre serveur sur un [serveur central privé](Choosing-a-Server-Type#3-serveur-central)) +(Laissez le champ « Adresse personnalisée du serveur central » vide, sauf si vous devez inscrire votre serveur sur un [serveur central privé](Choosing-a-Server-Type#3-central)) *** From 9624431c4e39ad5d49602bbb839545375e0ed8cf Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 16 Jan 2021 08:45:53 +0100 Subject: [PATCH 159/280] [fr] update 1-fr-index.html (#238) (#239) --- 1-fr-index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/1-fr-index.html b/1-fr-index.html index 997645ebf..9979529ec 100644 --- a/1-fr-index.html +++ b/1-fr-index.html @@ -35,7 +35,7 @@

    Jamulus dans le monde

    Besoin d'aide ?

    Lisez la documentation. Regardez bien la section dépannage ! - Vous pouvez aussi demander de l'aide dans le forum. + Vous pouvez aussi demander de l'aide dans le forum (en anglais).

    From 7bda247eaa73c384b02ff448ec4cab2914c9429a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 16 Jan 2021 19:05:35 +0100 Subject: [PATCH 160/280] [fr] update fr-Command-Line-Options.md (#240) (#241) Co-authored-by: Olivier Humbert --- wiki/fr/fr-Command-Line-Options.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wiki/fr/fr-Command-Line-Options.md b/wiki/fr/fr-Command-Line-Options.md index f7945470d..6f8cc10b4 100644 --- a/wiki/fr/fr-Command-Line-Options.md +++ b/wiki/fr/fr-Command-Line-Options.md @@ -42,7 +42,7 @@ Vous pouvez voir toutes les options possibles prises en charge par votre version | `-n` |`--nogui` | Désactiver l'IUG | (client et serveur) | | `-o` |`--serverinfo` | Détails sur l'emplacement du serveur dans le format :
    `[nom];[ville];[valeur de la locale]` (voir [valeurs](https://doc.qt.io/qt-5/qlocale.html#Country-enum))| (serveurs publics uniquement) | | `-p` |`--port` | Numéro de port UDP local. 22124 par défaut | (serveur uniquement) | -| `-R` |`--recording` | Inclure un chemin d'accès en écriture où les fichiers doivent être stockés (entre guillemets si nécessaire). | (serveur uniquement) Voir la description dans [paramétrage du serveur](Server-Win-Mac#recording). | +| `-R` |`--recording` | Inclure un chemin d'accès en écriture où les fichiers doivent être stockés (entre guillemets si nécessaire). | (serveur uniquement) Voir la description dans [paramétrage du serveur](Server-Win-Mac##enregistrement). | | | `--norecord` | Démarrer l'enregistreur avec l'enregistrement désactivé | (serveur uniquement) | | `-s` |`--server` | Démarrer en mode serveur | (serveur uniquement) [Voir note](Choosing-a-Server-Type) | | `-t` |`--notranslation` | Désactiver les traductions | (client et serveur) | @@ -50,5 +50,5 @@ Vous pouvez voir toutes les options possibles prises en charge par votre version | `-u` |`--numchannels` | Nombre maximum d'utilisateurs. 10 par défaut, 50 au maximum | (serveur uniquement) | | `-w` |`--welcomemessage` | Accepte le formatage HTML et CSS en ligne (entre guillemets), ou définit le chemin d'accès vers un fichier texte. | (serveur uniquement) | | `-z` |`--startminimized` | Démarrage minimisé | (serveur uniquement) | -| |`--ctrlmidich` | Canal de contrôle MIDI à écouter et décalage de numéro de contrôle, format : `channel[;offset]` | (client uniquement) voir [Trucs et astuces](Tips-Tricks-More#using-ctrlmidich-for-midi-controllers) | +| |`--ctrlmidich` | Canal de contrôle MIDI à écouter et décalage de numéro de contrôle, format : `channel[;offset]` | (client uniquement) voir [Trucs et astuces](Tips-Tricks-More#utilisation-de-ctrlmidich-pour-les-contrôleurs-midi) | | |`--clientname` | Titre de la fenêtre et nom du client JACK | (client uniquement) | From fa17b50faf74c42d6e4332946c6a3d25cf06b8a8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 16 Jan 2021 22:23:27 +0100 Subject: [PATCH 161/280] Since GH Action fails remove CI (#243) Co-authored-by: ann0see <20726856+ann0see@users.noreply.github.com> --- .github/workflows/jekyll.yml | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 .github/workflows/jekyll.yml diff --git a/.github/workflows/jekyll.yml b/.github/workflows/jekyll.yml deleted file mode 100644 index e4a61e06f..000000000 --- a/.github/workflows/jekyll.yml +++ /dev/null @@ -1,20 +0,0 @@ -name: Jekyll site CI - -on: - push: - branches: [ release, changes ] - pull_request: - branches: [ release, changes ] - -jobs: - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - name: Build the site in the jekyll/builder container - run: | - docker run \ - -v ${{ github.workspace }}:/srv/jekyll -v ${{ github.workspace }}/_site:/srv/jekyll/_site \ - jekyll/builder:latest /bin/bash -c "chmod 777 /srv/jekyll && jekyll build --future" From d8da1f41e6d7af1a48afcfaf3f807a10f8e45378 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 17 Jan 2021 16:13:38 +0100 Subject: [PATCH 162/280] French translation update (#245) (#247) --- wiki/fr/fr-Compiling.md | 8 ++++---- wiki/fr/fr-Contribution.md | 10 +++++----- wiki/fr/fr-Demos.md | 10 +++++----- wiki/fr/fr-Getting-Started.md | 9 ++------- 4 files changed, 16 insertions(+), 21 deletions(-) diff --git a/wiki/fr/fr-Compiling.md b/wiki/fr/fr-Compiling.md index 0b6b4a058..85df800b0 100644 --- a/wiki/fr/fr-Compiling.md +++ b/wiki/fr/fr-Compiling.md @@ -9,7 +9,7 @@ permalink: "/wiki/Compiling" ## Linux -Veuillez vous référer à la [page d'installation du client](Installation-for-Linux) ou ces instructions si vous souhaitez [compiler un serveur sans IUG](Server-Linux#serveur-sans-iug). +Veuillez vous référer à la [page d'installation du client](Installation-for-Linux) ou ces instructions si vous souhaitez [compiler un serveur sans IUG](Server-Linux#exécuter-un-serveur-sans-iug). ## macOS Vous n'avez pas besoin de compiler Jamulus sous macOS puisque nous fournissons des binaires officiels, mais si vous souhaitez vraiment le faire, suivez les instructions ci-dessous. @@ -63,10 +63,10 @@ Construira l'application et la rendra disponible dans `./Release/Jamulus.app`. ## Windows Vous n'avez pas besoin de compiler Jamulus sous Windows puisque nous fournissons des binaires officiels, mais si vous souhaitez vraiment le faire, suivez les instructions ci-dessous. -**Logiciels pré-requis**: [QT](https://www.qt.io/download), un compilateur comme Visual Studio, les fichiers de développement ASIO +**Logiciels pré-requis** : [QT (en anglais)](https://www.qt.io/download), un compilateur comme Visual Studio, les fichiers de développement ASIO - Obtenez le code source de Jamulus, par ex. via git ou en téléchargeant l'archive zip depuis le dépôt de Jamulus. -- Obtenez et copiez les fichiers de développement [ASIOSDK](https://www.steinberg.net/de/company/developer.html) dans le répertoire `[\chemin\vers\les\sources\jamulus]\windows` afin que, par ex., le répertoire `[\chemin\vers\les\sources\jamulus]\ASIOSDK2\common` existe. +- Obtenez et copiez les fichiers de développement [ASIOSDK](https://www.steinberg.net/en/company/developers.html) dans le répertoire `[\chemin\vers\les\sources\jamulus]\windows` afin que, par ex., le répertoire `[\chemin\vers\les\sources\jamulus]\ASIOSDK2\common` existe. - ouvrez Jamulus.pro dans Qt Creator puis compilez et exécutez. @@ -80,4 +80,4 @@ La compilation avec le fanion `headless` signifie que vous pouvez éviter d'inst 1. Si vous utilisez Jamulus sur Ubuntu/Debian, vous aurez besoin de tous les paquets dépendants pour **compiler** le binaire, mais pour **executer** le serveur Jamulus sans IUG résultant, vous ne devriez avoir besoin que de `libqt5core5a`, `libqt5network5`, `libqt5xml5` et probablement `libqt5concurrent5`. Ceci peut être utile pour compiler/mettre à jour sur une machine pour exécuter le binaire sur une autre (un Raspberry Pi, par exemple). -1. Notez que si vous voulez compiler un client avec IUG sur une machine et l'exécuter sur une autre (par ex. un Raspberry Pi), vous n'avez besoin que des dépendances listées pour un [serveur sans IUG](Server-Linux#serveur-sans-iug) (voir le point ci-dessus), seulement _avec_ les bibliothèques JACK. +1. Notez que si vous voulez compiler un client avec IUG sur une machine et l'exécuter sur une autre (par ex. un Raspberry Pi), vous n'avez besoin que des dépendances listées pour un [serveur sans IUG](Server-Linux#exécuter-un-serveur-sans-iug) (voir le point ci-dessus), seulement _avec_ les bibliothèques JACK. diff --git a/wiki/fr/fr-Contribution.md b/wiki/fr/fr-Contribution.md index 87cc44246..4c40b4331 100644 --- a/wiki/fr/fr-Contribution.md +++ b/wiki/fr/fr-Contribution.md @@ -8,18 +8,18 @@ permalink: "/wiki/Contribution" # Contribuer au projet Jamulus ## Logiciel Jamulus -* Si vous voulez contribuer au code, postez d'abord votre idée sur [le forum des développeurs](https://sourceforge.net/p/llcon/discussion/developerforum/) (en anglais) afin qu'elle puisse être discutée avant de faire un « pull request » (assurez-vous de lire le [manifeste de Volker pour les contributions](https://github.com/corrados/jamulus/issues/596), en anglais, du développeur principal) +* Si vous voulez contribuer au code, postez d'abord votre idée sur [le forum des développeurs (en anglais)](https://sourceforge.net/p/llcon/discussion/developerforum/) afin qu'elle puisse être discutée avant de faire un « pull request » (assurez-vous de lire le [manifeste de Volker pour les contributions](https://github.com/corrados/jamulus/issues/596 (en anglais)), du développeur principal) -Voir le [dépôt de Jamulus GitHub](https://github.com/corrados/jamulus) (en anglais) pour plus d'informations. +Voir le [dépôt de Jamulus GitHub (en anglais)](https://github.com/corrados/jamulus) pour plus d'informations. ## Site web Jamulus -* Si vous trouvez une erreur, une faute de frappe ou quelque chose de dépassé (dans n'importe quelle langue) sur le site web, vous pouvez [le signaler comme un problème ici](https://github.com/jamulussoftware/jamuluswebsite/issues), en anglais). +* Si vous trouvez une erreur, une faute de frappe ou quelque chose de dépassé (dans n'importe quelle langue) sur le site web, vous pouvez [le signaler comme un problème ici (en anglais)](https://github.com/jamulussoftware/jamuluswebsite/issues). -* Si vous pensez que certaines documentations ou informations manquent ou peuvent être améliorées, postez à ce propos sur le [forum de discussion pertinent](https://sourceforge.net/p/llcon/discussion/) (en anglais) afin que ça puisse d'abord être discuté. +* Si vous pensez que certaines documentations ou informations manquent ou peuvent être améliorées, postez à ce propos sur le [forum de discussion pertinent (en anglais)](https://sourceforge.net/p/llcon/discussion/) afin que ça puisse d'abord être discuté. Les « pull request » pour le site web devraient ressembler à ceci : `[code de langue (par exemple fr)] {brève description de vos modifications}` -Voir le [dépôt github du site web](https://github.com/jamulussoftware/jamuluswebsite) (en anglais) pour plus d'informations. +Voir le [dépôt github du site web (en anglais)](https://github.com/jamulussoftware/jamuluswebsite) pour plus d'informations. diff --git a/wiki/fr/fr-Demos.md b/wiki/fr/fr-Demos.md index d8df35726..028e4656f 100644 --- a/wiki/fr/fr-Demos.md +++ b/wiki/fr/fr-Demos.md @@ -11,15 +11,15 @@ permalink: "/wiki/Demos" **Sentez-vous libre d'ajouter les vôtres !** -* [Cette vidéo (en anglais)](https://youtube.com/watch?v=c8838jS2g3U) documentée par [Volker Fischer](https://sourceforge.net/u/corrados/profile/) montre une séance d'improvisation en ligne avec son groupe _Jitterbuffer_ +* [Cette vidéo (en anglais)](https://youtube.com/watch?v=c8838jS2g3U) documentée par [Volker Fischer (en anglais)](https://sourceforge.net/u/corrados/profile/) montre une séance d'improvisation en ligne avec son groupe _Jitterbuffer_ * [Jamulus The Movie - 28th March 2020 (en anglais)](https://www.youtube.com/watch?v=2x-gwMmVK-s) -* [Concert en direct sur Youtube avec 8 musiciens de jazz](https://www.youtube.com/watch?v=MpSIYxZMHw8&t=3307s) pour la Journée internationale du jazz, le 30 Avril 2020 ([plus de détails ici](https://sourceforge.net/p/llcon/discussion/533517/thread/070485619d/#6b71)) +* [Concert en direct sur Youtube avec 8 musiciens de jazz (en anglais)](https://www.youtube.com/watch?v=MpSIYxZMHw8&t=3307s) pour la Journée internationale du jazz, le 30 Avril 2020 ([plus de détails ici (en anglais)](https://sourceforge.net/p/llcon/discussion/533517/thread/070485619d/#6b71)) -* [Les IP Rockers en live sur Jamulus](https://soundcloud.com/dematteoss/sets/the-ip-rockers-live-on-jamulus) +* [Les IP Rockers en live sur Jamulus (en anglais)](https://soundcloud.com/dematteoss/sets/the-ip-rockers-live-on-jamulus) -* [Vidéo d'introduction montrant l'installation avec des instruments acoustiques](https://www.youtube.com/watch?v=lB4ZxDb9vnU) (pas vraiment une démo) -* [WorldJam](https://worldjam.vip/) Chaque samedi soir il y a une session « Jam » mondiale en ligne à travers internet. +* [Vidéo d'introduction montrant l'installation avec des instruments acoustiques (en anglais)](https://www.youtube.com/watch?v=lB4ZxDb9vnU) (pas vraiment une démo) +* [WorldJam (en anglais)](https://worldjam.vip/) Chaque samedi soir il y a une session « Jam » mondiale en ligne à travers internet. ![Un bœuf Jamulus typique !](https://user-images.githubusercontent.com/4561747/79686157-1f1c1380-8236-11ea-9fdb-8a791dd2713f.png) diff --git a/wiki/fr/fr-Getting-Started.md b/wiki/fr/fr-Getting-Started.md index 6e22973a0..5cd86032a 100644 --- a/wiki/fr/fr-Getting-Started.md +++ b/wiki/fr/fr-Getting-Started.md @@ -35,16 +35,11 @@ Maintenant que vous avez les bases, c'est parti : Pour les utilisateurs de Linux
    -Découvrez aussi : [Jamulus OS !](https://sourceforge.net/projects/jamulus-os/files/JamulusOS/) Exécutez Jamulus sur n'importe quel ordinateur avec une clé USB (uniquement pour les systèmes en 64 bits). Vérifiez la compatibilité de votre matériel et profitez-en ! +Découvrez aussi : [Jamulus OS ! (en anglais)](https://sourceforge.net/projects/jamulus-os/files/JamulusOS/) Exécutez Jamulus sur n'importe quel ordinateur avec une clé USB (uniquement pour les systèmes en 64 bits). Vérifiez la compatibilité de votre matériel et profitez-en ! ## Matériel recommandé -Voir [la liste de bon matériel connu](Sound-Devices) et la [configuration du matériel](Hardware-Setup). - - -Si vous installez Jamulus, jetez un coup d'œil [la configuration matérielle](Hardware-Setup). - -Pour de plus amples informations à propos de l'utilisation de Jamulus, regardez [le manuel d'aide](https://github.com/corrados/jamulus/blob/master/src/res/homepage/manual.md). +Voir [la liste de bon matériel connu (en anglais)](Sound-Devices) et la [configuration du matériel](Hardware-Setup). ## D'autres guides * [Cet excellent guide (en)](https://www.facebook.com/notes/jamulus-online-musicianssingers-jamming/idiots-guide-to-jamulus-app/510044532903831/){: target="_blank" rel="noopener noreferrer"} par [Simon Tomlinson](https://www.facebook.com/simon.james.tomlinson?eid=ARBQoY3KcZAtS3pGdLJuqvQTeRSOo4gHdQZT7nNzOt1oPMGgZ4_3GERe-rOyH5PxsSHVYYXjWwcqd71a){: target="_blank" rel="noopener noreferrer"} (_Facebook_) pourrait aussi vous intéresser. From 2d3cacbf34ed9afea61d0cf56be570e2b7441d8c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 17 Jan 2021 16:13:52 +0100 Subject: [PATCH 163/280] [en] update en-Compiling.md (steinberg link in EN) (#244) (#246) --- wiki/en/en-Compiling.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/en/en-Compiling.md b/wiki/en/en-Compiling.md index ef6e8baeb..032aa36fe 100644 --- a/wiki/en/en-Compiling.md +++ b/wiki/en/en-Compiling.md @@ -65,7 +65,7 @@ You don't need to compile Jamulus for Windows since we provide official binaries **Required software**: [Qt](https://www.qt.io/download), a compiler like Visual Studio, ASIO development files - get the Jamulus source code e.g. via git or via zip download from the Jamulus Repo -- get and copy the [ASIOSDK](https://www.steinberg.net/de/company/developer.html) development files in `[\path\to\jamulus\source]\windows` directory so that, e.g., the +- get and copy the [ASIOSDK](https://www.steinberg.net/en/company/developers.html) development files in `[\path\to\jamulus\source]\windows` directory so that, e.g., the directory `[\path\to\jamulus\source]\ASIOSDK2\common` exists - open Jamulus.pro in Qt Creator then compile & run From b9144d6d6c55322f8e3b6e21776c2788cd0f9509 Mon Sep 17 00:00:00 2001 From: ann0see Date: Mon, 18 Jan 2021 12:37:23 +0100 Subject: [PATCH 164/280] Add contributors --- humans.txt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/humans.txt b/humans.txt index 29626b0ff..5785a9744 100644 --- a/humans.txt +++ b/humans.txt @@ -2,11 +2,9 @@ Texts and Software: corrados Site: https://github.com/corrados/ -Texts and translation: gilgongo -Site: https://github.com/gilgongo +Texts and translation: gilgongo and contributors +HTML and CSS Coding: ann0see and contributors -HTML and CSS Coding: ann0see -Site: https://github.com/ann0see Images: geheimerEichkater Site: https://github.com/geheimerEichkater From 7fc704c59543f99816851ee903e51072cfedee25 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Mon, 18 Jan 2021 13:49:40 +0100 Subject: [PATCH 165/280] Add qjackctl --- wiki/en/en-Installation-for-Linux.md | 1 + 1 file changed, 1 insertion(+) diff --git a/wiki/en/en-Installation-for-Linux.md b/wiki/en/en-Installation-for-Linux.md index d96c24d44..8bfa9af80 100644 --- a/wiki/en/en-Installation-for-Linux.md +++ b/wiki/en/en-Installation-for-Linux.md @@ -23,6 +23,7 @@ If you're on **Debian** or **Ubuntu** (only amd64), you may try the compiled deb 1. Download the deb file from the [Jamulus GitHub release](https://github.com/corrados/jamulus/releases/tag/latest) page 1. Update apt: `sudo apt-get update` 1. Install the package: `sudo dpkg -i .deb` +1. Since Jamulus needs JACK, you have to install it too. We recommend to use `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`. From 7524aaa6f23b3e3da161d7eda95f2746272f65df Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 18 Jan 2021 13:51:51 +0100 Subject: [PATCH 166/280] French l10n update (#248) (#249) * [fr] update fr-Onboarding.md * [fr] update fr-Installation-for-Windows.md * [fr] update fr-Installation-for-Macintosh.md * [fr] update fr-Installation-for-Linux.md Co-authored-by: Olivier Humbert --- wiki/fr/fr-Installation-for-Linux.md | 10 +++++----- wiki/fr/fr-Installation-for-Macintosh.md | 2 +- wiki/fr/fr-Installation-for-Windows.md | 8 ++++---- wiki/fr/fr-Onboarding.md | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/wiki/fr/fr-Installation-for-Linux.md b/wiki/fr/fr-Installation-for-Linux.md index 7e6e7de30..32b13a278 100644 --- a/wiki/fr/fr-Installation-for-Linux.md +++ b/wiki/fr/fr-Installation-for-Linux.md @@ -12,11 +12,11 @@ Assurez-vous d'avoir déjà lu la page [Premier pas](Getting-Started). ## Paquets jamulus -Bien que nous ne fournissions pas de paquets officiels, vous pourriez trouver Jamulus dans le gestionnaires de paquets de votre distribution. Consultez ce tableau : +Bien que nous ne fournissions pas de paquets officiels, vous pourriez trouver Jamulus dans le gestionnaire de paquets de votre distribution. Consultez ce tableau : [![Statut d'empaquetage](https://repology.org/badge/vertical-allrepos/jamulus.svg)](https://repology.org/project/jamulus/versions) -Il existe aussi une liste de [paquets non officiels pour les différentes distributions ici](https://github.com/corrados/jamulus/issues/223){: target="_blank" rel="noopener noreferrer"} (en anglais). Si vous ne le trouvez pas dans votre gestionnaire de paquet, vous devrez compiler Jamulus depuis le code source. C'est assez simple : +Il existe aussi une liste de [paquets non officiels pour les différentes distributions ici (en anglais)](https://github.com/corrados/jamulus/issues/223){: target="_blank" rel="noopener noreferrer"}. Si vous ne le trouvez pas dans votre gestionnaire de paquet, vous devrez compiler Jamulus depuis le code source. C'est assez simple : ## Obtenir les sources de Jamulus @@ -52,7 +52,7 @@ sudo dnf install qt5-qtdeclarative-devel jack-audio-connection-kit-dbus libQt5Co sudo apt-get install qjackctl ``` -Vous pouvez également envisager d'utiliser un [noyau à faible latence](https://help.ubuntu.com/community/UbuntuStudio/RealTimeKernel) (ex. pour Ubuntu 18.04 : `sudo apt-get install linux-lowlatency-hwe-18.04`). +Vous pouvez également envisager d'utiliser un [noyau à faible latence (en anglais)](https://help.ubuntu.com/community/UbuntuStudio/RealTimeKernel) (ex. pour Ubuntu 18.04 : `sudo apt-get install linux-lowlatency-hwe-18.04`). ## Compilons ce vilain garçon @@ -76,7 +76,7 @@ sudo make install ### Configurer JACK avec QjackCtl -Les clients Jamulus ont besoin de [JACK](https://jackaudio.org/){: target="_blank" rel="noopener noreferrer"} pour fonctionner, mais vous devez d'abord le configurer. La méthode recommandée est d'utiliser `QjackCtl`. +Les clients Jamulus ont besoin de [JACK (en anglais)](https://jackaudio.org/){: target="_blank" rel="noopener noreferrer"} pour fonctionner, mais vous devez d'abord le configurer. La méthode recommandée est d'utiliser `QjackCtl`. 1. Ouvrez le terminal de commande, par ex. avec Crtl-Alt-T et 1. Exécutez la commande `qjackctl` vous verrez le **JACK Audio Connection Kit** @@ -114,6 +114,6 @@ Téléchargez les nouvelles sources conformément à la section [Obtenir les sou * Pour utiliser ce fichier, configurez le logiciel avec `qmake "CONFIG+=noupcasename" Jamulus.pro` pour vous assurer que le nom du binaire cible soit **j**amulus au lieu de **J**amulus. -* Utilisateurs de Raspberry Pi : vous pourriez vouloir compiler le client sur une autre machine et exécuter le binaire sur le Raspberry Pi. Dans ce cas, les seules bibliothèques dont vous avez besoin pour l'exécuter sont celles d'un [serveur sans IUG](Server-Linux#serveur-sans-iug), mais _avec_ les paquets sons JACK. En particulier, jetez un œil à la note de bas de page pour la compilation sans IUG. +* Utilisateurs de Raspberry Pi : vous pourriez vouloir compiler le client sur une autre machine et exécuter le binaire sur le Raspberry Pi. Dans ce cas, les seules bibliothèques dont vous avez besoin pour l'exécuter sont celles d'un [serveur sans IUG](Server-Linux#exécuter-un-serveur-sans-iug), mais _avec_ les paquets sons JACK. En particulier, jetez un œil à la note de bas de page pour la compilation sans IUG. * À partir de la version 3.5.3, Jamulus n'est plus compatible avec Qt4. diff --git a/wiki/fr/fr-Installation-for-Macintosh.md b/wiki/fr/fr-Installation-for-Macintosh.md index 53b0cd916..347a8a678 100644 --- a/wiki/fr/fr-Installation-for-Macintosh.md +++ b/wiki/fr/fr-Installation-for-Macintosh.md @@ -28,7 +28,7 @@ La première fois que vous essaierez de double-cliquer sur Jamulus pour l'ouvrir Pour ouvrir Jamulus, naviguer vers le dossier Applications via le Finder, cliquez sur Jamulus, faites un clic-droit (ou un contrôle-clic) et sélectionnez « Ouvrir » dans le haut du menu. Vous aurez alors une version légèrement différente du même message, qui vous permettra de cliquer sur "Ouvrir" et de continuer à l'exécuter. Cet avertissement ne s'affichera plus et il suffira après ça de double-cliquer dessus pour le lancer. -Pour plus d'informations à propos de cet avertissement, consultez [cette page d'assistance Apple](https://support.apple.com/fr-fr/guide/mac-help/mh40616/mac){: target="_blank" rel="noopener noreferrer"} (en anglais). +Pour plus d'informations à propos de cet avertissement, consultez [cette page d'assistance Apple (en anglais)](https://support.apple.com/fr-fr/guide/mac-help/mh40616/mac){: target="_blank" rel="noopener noreferrer"}. ## Tout est installé ? diff --git a/wiki/fr/fr-Installation-for-Windows.md b/wiki/fr/fr-Installation-for-Windows.md index 55593113b..f3564dae2 100644 --- a/wiki/fr/fr-Installation-for-Windows.md +++ b/wiki/fr/fr-Installation-for-Windows.md @@ -9,8 +9,8 @@ permalink: "/wiki/Installation-for-Windows" Assurez-vous d'avoir déjà lu la page [Premier pas](Getting-Started). -1. **Téléchargez et installez un pilote ASIO**. Il est recommandé d'utiliser une interface audio ou une carte son avec un pilote ASIO natif. Si vous n'en avez pas (en particulier pour les cartes son internes), installez ce [pilote ASIO gratuit (ASIO4All)](http://www.asio4all.org){: target="_blank" rel="noopener noreferrer"} avant d'installer Jamulus. -1. [Téléchargez et installez Jamulus](https://sourceforge.net/projects/llcon/files/latest/download){: target="_blank" rel="noopener noreferrer"}. Si vous avez un avertissement de SmartScreen, cliquez sur « Plus d'infos » et « Exécuter quand même » pour installer Jamulus. C'est nécessaire car nous ne payons pas encore pour signer le code. +1. **Téléchargez et installez un pilote ASIO**. Il est recommandé d'utiliser une interface audio ou une carte son avec un pilote ASIO natif. Si vous n'en avez pas (en particulier pour les cartes son internes), installez ce [pilote ASIO gratuit (ASIO4All) (en anglais)](http://www.asio4all.org){: target="_blank" rel="noopener noreferrer"} avant d'installer Jamulus. +1. [Téléchargez et installez Jamulus (en anglais)](https://sourceforge.net/projects/llcon/files/latest/download){: target="_blank" rel="noopener noreferrer"}. Si vous avez un avertissement de SmartScreen, cliquez sur « Plus d'infos » et « Exécuter quand même » pour installer Jamulus. C'est nécessaire car nous ne payons pas encore pour signer le code. 1. **Lancez Jamulus**. Vous devriez maintenant pouvoir utiliser Jamulus comme n'importe quelle autre application. 1. **Configurez votre carte son**. Lorsque vous aurez fini, vous devrez configurer votre matériel audio. Regardez comment configurer ASIO4All si vous l'utilisez ([défilez vers le bas](#configuration-de-asio4all)), et consultez ensuite la [Configuration du matériel](Hardware-Setup). @@ -43,9 +43,9 @@ Avant de démarrer avec Jamulus : Si rien ne fonctionne, essayez tout d'abord de **redémarrer Jamulus et/ou votre ordinateur**. Ensuite, essayez de **configurer les entrées/sorties à nouveau**. Les entrées/sorties actives et accessibles affichent un bouton marche/arrêt allumé et un bouton de lecture. Si vous voyez une croix rouge ou un symbole jaune, vous devrez peut-être fermer d'autres applications comme votre navigateur, Zoom… -Regardez cette [vidéo](https://youtu.be/_GzOsitVgLI){: target="_blank" rel="noopener noreferrer"} (en anglais) de @trombonepizza qui donne des informations plus détaillées sur la configuration d'ASIO4All. +Regardez cette [vidéo (en anglais)](https://youtu.be/_GzOsitVgLI){: target="_blank" rel="noopener noreferrer"} de @trombonepizza qui donne des informations plus détaillées sur la configuration d'ASIO4All. -Des informations officielles plus détaillées sur la façon de configurer ASIO4All sont aussi documentées dans les [FAQ officielles d'ASIO4All sur le site web d'ASIO4All](http://www.asio4all.org/faq.html){: target="_blank" rel="noopener noreferrer"} ainsi que dans le manuel d'ASIO4All. Vous trouverez très probablement ceci sur votre bureau ou dans le dossier où le binaire d'ASIO4All est installé (généralement `C:\Program Files (x86)\ASIO4ALL v2\`). +Des informations officielles plus détaillées sur la façon de configurer ASIO4All sont aussi documentées dans la [FAQ officielle d'ASIO4All sur le site web d'ASIO4All (en anglais)](http://www.asio4all.org/faq.html){: target="_blank" rel="noopener noreferrer"} ainsi que dans le manuel d'ASIO4All. Vous trouverez très probablement ceci sur votre bureau ou dans le dossier où le binaire d'ASIO4All est installé (généralement `C:\Program Files (x86)\ASIO4ALL v2\`). ## Tout est installé ? diff --git a/wiki/fr/fr-Onboarding.md b/wiki/fr/fr-Onboarding.md index 31fdad659..f95fe82ff 100644 --- a/wiki/fr/fr-Onboarding.md +++ b/wiki/fr/fr-Onboarding.md @@ -49,9 +49,9 @@ De plus amples informations sur l'utilisation de Jamulus peuvent être trouvées Si vous avez besoin d'aide ou voulez contribuer au projet Jamulus, vous pouvez consulter les liens suivants : ### Forums de discussion -Pour de l'aide, du tchate, et des discussions générales à propos de Jamulus : jetez un œil aux [forums sur Sourceforge](https://sourceforge.net/p/llcon/discussion/) (en anglais). +Pour de l'aide, du tchate, et des discussions générales à propos de Jamulus : jetez un œil aux [forums sur Sourceforge (en anglais)](https://sourceforge.net/p/llcon/discussion/). ### Développement et contribution -Si vous voulez contribuer au logiciel Jamulus, jetez un œil au [dépôt Github de Jamulus](https://github.com/corrados/jamulus/) (en anglais) et y lire le fichier de contribution. +Si vous voulez contribuer au logiciel Jamulus, jetez un œil au [dépôt Github de Jamulus (en anglais)](https://github.com/corrados/jamulus/) et y lire le fichier de contribution. From 96900015cde606b250655b49ea8bd2aaa073916c Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Mon, 18 Jan 2021 18:41:17 +0100 Subject: [PATCH 167/280] Link quoting issue --- wiki/en/en-Compiling.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/en/en-Compiling.md b/wiki/en/en-Compiling.md index 6cb4b4461..5143232da 100644 --- a/wiki/en/en-Compiling.md +++ b/wiki/en/en-Compiling.md @@ -72,7 +72,7 @@ You don't need to compile Jamulus for Windows since we provide official binaries ### 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 open an issue on the Jamulus repo to tell us how). +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). ### Compiling and building installer From fe9cfac638a11d114d310a42d09e303a609d9eea Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Tue, 19 Jan 2021 08:43:47 +0100 Subject: [PATCH 168/280] ASIO description (#242) * Add ASIO description Since the new installer will link to this page, a description of ASIO is needed * Grammar mistake fixed --- wiki/en/en-Installation-for-Windows.md | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/wiki/en/en-Installation-for-Windows.md b/wiki/en/en-Installation-for-Windows.md index 4289f29d9..c1c6dd154 100644 --- a/wiki/en/en-Installation-for-Windows.md +++ b/wiki/en/en-Installation-for-Windows.md @@ -15,14 +15,19 @@ Make sure you read the [Getting Started](Getting-Started) page. *** -## Setting up ASIO4ALL -*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.* +## ASIO +To provide the lowest latency, Jamulus uses [ASIO](https://en.wikipedia.org/wiki/Audio_Stream_Input/Output). If you don't have an external sound card, you will probably also not have an ASIO driver. Therefore, you will need to install a generic one like ASIO4ALL which you can [download from the official ASIO4ALL website](https://www.asio4all.org/). If you own an external sound card/audio interface, you should check for an official ASIO driver and use it since they usually provide better quality. -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. +### Setting up ASIO4ALL +*ASIO4ALL is not recommended if your sound card/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. + +**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. 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. -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: +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) From e512fd748d76bda170faacb6508d7ae72f9664f0 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Tue, 19 Jan 2021 08:54:37 +0100 Subject: [PATCH 169/280] Add ASIO heading (#251) * [fr] links fixes (fr-Server-Win-Mac.md) (#235) * [fr] update 1-fr-index.html (#238) * [fr] update fr-Command-Line-Options.md (#240) * Since GH Action fails remove CI * French translation update (#245) * [en] update en-Compiling.md (steinberg link in EN) (#244) * French l10n update (#248) * [fr] update fr-Onboarding.md * [fr] update fr-Installation-for-Windows.md * [fr] update fr-Installation-for-Macintosh.md * [fr] update fr-Installation-for-Linux.md * Add small changes to link ASIO from new installer * Update en-Installation-for-Windows.md Co-authored-by: Olivier Humbert --- wiki/en/en-Installation-for-Windows.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wiki/en/en-Installation-for-Windows.md b/wiki/en/en-Installation-for-Windows.md index c1c6dd154..b02759e5d 100644 --- a/wiki/en/en-Installation-for-Windows.md +++ b/wiki/en/en-Installation-for-Windows.md @@ -21,10 +21,11 @@ To provide the lowest latency, Jamulus uses [ASIO](https://en.wikipedia.org/wiki ### Setting up ASIO4ALL *ASIO4ALL is not recommended if your sound card/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. +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. + 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: From 30011230e2be9fdea61901a311541530fad7361d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 19 Jan 2021 17:52:36 +0100 Subject: [PATCH 170/280] French l10v improvements (#253) (#254) --- wiki/fr/fr-Client-Troubleshooting.md | 18 +++++++++--------- wiki/fr/fr-Hardware-Setup.md | 19 +++++++++---------- wiki/fr/fr-Running-a-Server.md | 6 +++--- 3 files changed, 21 insertions(+), 22 deletions(-) diff --git a/wiki/fr/fr-Client-Troubleshooting.md b/wiki/fr/fr-Client-Troubleshooting.md index 6aa7f38ef..73fd11429 100644 --- a/wiki/fr/fr-Client-Troubleshooting.md +++ b/wiki/fr/fr-Client-Troubleshooting.md @@ -8,7 +8,7 @@ permalink: "/wiki/Client-Troubleshooting" # Dépannage ### Vous n'entendez aucun son ou les autres ne vous entendent pas ? -Commencez par les choses simples : assurez-vous que votre instrument ou micro et votre casque soient branchés sur les bonnes prises. Assurez-vous qu'aucune autre application comme votre navigateur, votre logiciel de vidéoconférence, etc. n'utilise votre carte son. Vous devriez les éteindre lorsque vous utilisez Jamulus. Si tout semble correct et que le problème persiste, il est probable qu'il y ait un problème avec les paramètres de votre périphérique son. Cela dépendra de votre configuration particulière (plate-forme, matériel, logiciel et pilotes), il est donc préférable de demander conseil sur [les forums](https://sourceforge.net/p/llcon/discussion/software/). +Commencez par les choses simples : assurez-vous que votre instrument ou micro et votre casque soient branchés sur les bonnes prises. Assurez-vous qu'aucune autre application comme votre navigateur, votre logiciel de vidéoconférence, etc. n'utilise votre carte son. Vous devriez les éteindre lorsque vous utilisez Jamulus. Si tout semble correct et que le problème persiste, il est probable qu'il y ait un problème avec les paramètres de votre périphérique son. Cela dépendra de votre configuration particulière (plate-forme, matériel, logiciel et pilotes), il est donc préférable de demander conseil sur [les forums (en anglais)](https://sourceforge.net/p/llcon/discussion/software/). **Utilisateurs de Windows (ASIO4All)** : si vous utilisez le pilote ASIO4All, consultez la [section de configuration ASIO4All](Installation-for-Windows#configuration-de-asio4all). @@ -19,14 +19,14 @@ Commencez par les choses simples : assurez-vous que votre instrument ou micro et Vous pouvez testez si vous entendez correctement votre signal en procédant comme suit : 1. Faites entrer votre signal audio dans votre ordinateur. -1. Utilisez une application d'enregistrement audio (telle que [Audacity](https://www.audacityteam.org/)) sur votre ordinateur pour enregistrer cette entrée et vérifier qu'elle est correcte. +1. Utilisez une application d'enregistrement audio (telle que [Audacity (en anglais)](https://www.audacityteam.org/)) sur votre ordinateur pour enregistrer cette entrée et vérifier qu'elle est correcte. 1. Assurez-vous que si vous mettez en silence votre entrée audio dans l'application d'enregistrement, vous ne pouvez pas vous entendre. 1. Fermez l'application d'enregistrement et lancez Jamulus. Vous ne devriez toujours pas vous entendre. 1. Connectez-vous à un serveur et jouez quelque chose. Maintenant, vous devriez vous entendre avec le délai du serveur. -**Si vous avez encore des problèmes**, essayez de demander sur le [forum du matériel](https://sourceforge.net/p/llcon/discussion/hardware/). La manière exacte dont vous éviterez d'écouter votre signal direct dépendra de votre configuration individuelle : votre interface son, votre console de mixage, l'endroit où est branché votre casque, etc… Par exemple, certaines interfaces audio ont des boutons « monitor » (désactivez-les), ou des options similaires. +**Si vous avez encore des problèmes**, essayez de demander sur le [forum du matériel (en anglais)](https://sourceforge.net/p/llcon/discussion/hardware/). La manière exacte dont vous éviterez d'écouter votre signal direct dépendra de votre configuration individuelle : votre interface son, votre console de mixage, l'endroit où est branché votre casque, etc… Par exemple, certaines interfaces audio ont des boutons « monitor » (désactivez-les), ou des options similaires. -Sachez que si l'écoute du signal du serveur vous assure d'être synchronisé avec les autres musiciens, vous pourriez également rencontrer des problèmes si votre latence globale (indiquée par le voyant lumineux « Délai » dans Jamulus) n'est pas verte ou au moins jaune la plupart du temps. Consultez le [manuel du logiciel](https://github.com/corrados/jamulus/blob/master/src/res/homepage/manual.md) pour comprendre comment ajuster votre configuration afin de vous aider dans cette tâche. +Sachez que si l'écoute du signal du serveur vous assure d'être synchronisé avec les autres musiciens, vous pourriez également rencontrer des problèmes si votre latence globale (indiquée par le voyant lumineux « Délai » dans Jamulus) n'est pas verte ou au moins jaune la plupart du temps. Consultez le [manuel du logiciel](Software-Manual) pour comprendre comment ajuster votre configuration afin de vous aider dans cette tâche. ### Vous n'arrivez pas à régler votre micro ? @@ -38,7 +38,7 @@ Le processeur de votre ordinateur peut avoir des problèmes. Essayez de ne rien ### Les temps de ping et de latence commencent bien, puis s'aggravent, causant des problèmes -Cela peut indiquer que quelque chose d'autre entre en concurrence avec Jamulus sur votre réseau, alors assurez-vous que personne ne regarde de films en HD sur Netflix ou ne participe à des vidéoconférences Zoom pendant que vous jouez. Une solution plus permanente pour les utilisateurs à vocation technique, peut être trouvée en examinant [le problème du gonflement de la mémoire tampon](https://www.bufferbloat.net/projects/bloat/wiki/) (en anglais) sur leur routeur, et en vérifiant si vous pouvez mettre en œuvre la gestion intelligente des files d'attente (Smart Queue Management - SQM). [Plus de détails ici](https://www.bufferbloat.net/projects/bloat/wiki/What_can_I_do_about_Bufferbloat/) (en anglais). +Cela peut indiquer que quelque chose d'autre entre en concurrence avec Jamulus sur votre réseau, alors assurez-vous que personne ne regarde de films en HD sur Netflix ou ne participe à des vidéoconférences Zoom pendant que vous jouez. Une solution plus permanente pour les utilisateurs à vocation technique, peut être trouvée en examinant [le problème du gonflement de la mémoire tampon (en anglais)](https://www.bufferbloat.net/projects/bloat/wiki/) sur leur routeur, et en vérifiant si vous pouvez mettre en œuvre la gestion intelligente des files d'attente (Smart Queue Management - SQM). [Plus de détails ici (en anglais)](https://www.bufferbloat.net/projects/bloat/wiki/What_can_I_do_about_Bufferbloat/). ### Vous n'êtes pas à l'aise avec les canaux du logiciel, le routage audio, les taux d'échantillonnage, et autres ? @@ -50,7 +50,7 @@ Vous pouvez régler votre « Niveau de nouveau client » sur une valeur faible ### Vous ne voyez pas le serveur que vous voulez rejoindre ? -Vérifiez d'abord que vous avez le bon serveur de genre musical sélectionné dans votre fenêtre des paramètres de connexion. Mais il arrive parfois que des problèmes de réseau empêchent votre client d'afficher la liste de tous les serveurs disponibles. Si vous connaissez le nom du serveur que vous souhaitez rejoindre, vous pouvez [rechercher son adresse IP ici](http://explorer.jamulus.io/)). Saisissez l'adresse IP dans le champ « Adresse du serveur » de la fenêtre « Paramètres de connexion » pour vous y connecter. +Vérifiez d'abord que vous avez le bon serveur de genre musical sélectionné dans votre fenêtre des paramètres de connexion. Mais il arrive parfois que des problèmes de réseau empêchent votre client d'afficher la liste de tous les serveurs disponibles. Si vous connaissez le nom du serveur que vous souhaitez rejoindre, vous pouvez [rechercher son adresse IP ici (en anglais)](http://explorer.jamulus.io/). Saisissez l'adresse IP dans le champ « Adresse du serveur » de la fenêtre « Paramètres de connexion » pour vous y connecter. ### Vous ne voyez pas du tout la liste des serveurs ? @@ -60,11 +60,11 @@ Dans certains cas, il se peut que ce soit votre FAI qui bloque votre utilisation ### Des problèmes pour utiliser Garageband (ou autre STAN) avec Jamulus ? -Voir [ce forum de discussion](https://sourceforge.net/p/llcon/discussion/533517/thread/d3dd58eedc/#b994) (en anglais). +Voir [ce forum de discussion (en anglais)](https://sourceforge.net/p/llcon/discussion/533517/thread/d3dd58eedc/#b994). ### Vous utilisez un Mac et votre signal d'entrée n'est pas entendu ? -(Avec nos remerciements à [Mark Anthony De Souza](https://www.facebook.com/groups/619274602254947/permalink/765122847670121/?comment_id=765525034296569) (en anglais)) +(Avec nos remerciements à [Mark Anthony De Souza (en anglais)](https://www.facebook.com/groups/619274602254947/permalink/765122847670121/?comment_id=765525034296569) (_Facebook_)) Peut-être n'avez-vous pas répondu « oui » à la question `« Jamulus souhaite accéder à votre micro »`. Pour y remédier : * Allez dans `Préférences Système` > `Sécurité et confidentialité` > onglet `Confidentialité` @@ -72,4 +72,4 @@ Peut-être n'avez-vous pas répondu « oui » à la question `« Jamulus souhai *** -Pour toute autre question, veuillez rechercher ou poster sur les [forums de discussion](https://sourceforge.net/p/llcon/discussion/software/). +Pour toute autre question, veuillez rechercher ou poster sur les [forums de discussion (en anglais)](https://sourceforge.net/p/llcon/discussion/software/). diff --git a/wiki/fr/fr-Hardware-Setup.md b/wiki/fr/fr-Hardware-Setup.md index a167b959b..8b44d7183 100644 --- a/wiki/fr/fr-Hardware-Setup.md +++ b/wiki/fr/fr-Hardware-Setup.md @@ -14,7 +14,7 @@ permalink: "/wiki/Hardware-Setup" **Utilisateurs de Windows :** vous devez installer un pilote ASIO. Une carte son avec un pilote ASIO natif est recommandée. Consultez la page [Installation sous Windows](Installation-for-Windows) pour plus d'informations. -## Exemples de configurations +## Exemple de configuration L'installation du matériel se résume généralement en quatre points, bien que chaque configuration soit différente. @@ -26,7 +26,7 @@ L'installation du matériel se résume généralement en quatre points, bien que ## Windows : connexion de l'interface audio - ASIO4All -Voici un exemple d'installation de client Windows avec un périphérique audio [Behringer U-CONTROL UCA202]https://www.amazon.com/Behringer-U-Phono-UFO202-Audiophile-Interface/dp/B002GHBYZ0){: target="_blank" rel="noopener noreferrer"} (en anglais). +Voici un exemple d'installation de client Windows avec un périphérique audio [Behringer U-CONTROL UCA202 (en anglais)](https://www.amazon.com/Behringer-U-Phono-UFO202-Audiophile-Interface/dp/B002GHBYZ0){: target="_blank" rel="noopener noreferrer"}. Les instructions suivantes devraient être similaires à celles pour d'autres périphériques audio. _**La méthode exacte pour connecter vos instruments différera évidement en fonction de votre matériel**_ @@ -35,12 +35,11 @@ _**La méthode exacte pour connecter vos instruments différera évidement en fo Par la suite, utilisez toujours le même port USB pour le périphérique audio. -**Utilisateurs de Windows** : si ce n'est pas encore fait, téléchargez et installez le [pilote audio ASIO (ASIO4ALL) gratuit](https://www.asio4all.org){: target="_blank" rel="noopener noreferrer"}. Certaines personnes ont également indiqué avoir utilisé avec succès [ce pilote ASIO natif](http://www.behringerdownload.de/_software/BEHRINGER_2902_X64_2.8.40.zip){: target="_blank" rel="noopener noreferrer"} -__actuellement non disponible__, bien qu'il ne figure plus sur les pages produits Behringer en avril 2020. +**Utilisateurs de Windows** : si ce n'est pas encore fait, téléchargez et installez le [pilote audio ASIO (ASIO4ALL) gratuit (en anglais)](https://www.asio4all.org){: target="_blank" rel="noopener noreferrer"}. Certaines personnes ont également indiqué avoir utilisé avec succès [ce pilote ASIO natif](http://www.behringerdownload.de/_software/BEHRINGER_2902_X64_2.8.40.zip){: target="_blank" rel="noopener noreferrer"} __actuellement non disponible__, bien qu'il ne figure plus sur les pages produits Behringer en avril 2020. #### 2. Démarrez Jamulus -Configurez Jamulus pour qu'il utilise la configuration sonore correcte (voir [cet excellent guide](https://www.facebook.com/notes/jamulus-online-musicianssingers-jamming/idiots-guide-to-jamulus-app/510044532903831/) (en anglais) par [Simon Tomlinson](https://www.facebook.com/simon.james.tomlinson?eid=ARBQoY3KcZAtS3pGdLJuqvQTeRSOo4gHdQZT7nNzOt1oPMGgZ4_3GERe-rOyH5PxsSHVYYXjWwcqd71a) sur Facebook). +Configurez Jamulus pour qu'il utilise la configuration sonore correcte (voir [cet excellent guide (en anglais)](https://www.facebook.com/notes/jamulus-online-musicianssingers-jamming/idiots-guide-to-jamulus-app/510044532903831/) par [Simon Tomlinson](https://www.facebook.com/simon.james.tomlinson?eid=ARBQoY3KcZAtS3pGdLJuqvQTeRSOo4gHdQZT7nNzOt1oPMGgZ4_3GERe-rOyH5PxsSHVYYXjWwcqd71a) sur Facebook). Assurez vous d'avoir bien éteint le bouton de monitoring de votre Behringer U-CONTROL UCA202 (sinon vous entendrez à la fois le son original que vous envoyez au serveur Jamulus ainsi que le son revenant, et vous risquez d'avoir un retour). @@ -57,7 +56,7 @@ Vous y êtes ! Amusez-vous ! Consultez la page du [guide d'installation du client](Installation-for-Linux#configurer-jack-avec-qjackctl). ## Linux : noyaux à faible latence pour Jamulus -Vous voudrez peut-être installer [Ubuntu Studio](https://ubuntustudio.org/){: target="_blank" rel="noopener noreferrer"}, elle propose une seconde option à votre menu de démarrage avec un noyau à faible latence. La clef d'un bœuf résussi est la « faible latence » entre les serveurs et les clients Jamulus connectés. Si le système Linux sous-jacent est démarré avec une faible latence, cela a un impact positif sur vos sessions Jamulus. +Vous voudrez peut-être installer [Ubuntu Studio (en anglais)](https://ubuntustudio.org/){: target="_blank" rel="noopener noreferrer"}, elle propose une seconde option à votre menu de démarrage avec un noyau à faible latence. La clef d'un bœuf résussi est la « faible latence » entre les serveurs et les clients Jamulus connectés. Si le système Linux sous-jacent est démarré avec une faible latence, cela a un impact positif sur vos sessions Jamulus. ## Points à noter à propos des entrées @@ -67,14 +66,14 @@ Vous voudrez peut-être installer [Ubuntu Studio](https://ubuntustudio.org/){: t - Les consoles de mixage avec USB/Firewire/Thunderbolt ne ressortent généralement qu'un signal mixé sur leurs sorties **analogiques** ET uniquement des signaux séparés (pas de signal mixé) sur leurs sorties **numériques**. - Quelques consoles de mixage avec USB/Firewire/Thunderbolt ressortiront soit **seulement** un signal mixé sur la sortie **numérique** (consoles d'entrée de bas de gamme), soit AJOUTERONT aussi un signal mixé aux signaux séparés sur la sorties numériques. -_(Merci à [pcar75](https://github.com/pcar75) pour cette information)_ +_(Merci à [pcar75 (en anglais)](https://github.com/pcar75) pour cette information)_ ## Autres exemples -**Cette vidéo documente une [session de bœuf live](https://youtu.be/c8838jS2g3U).** J'utilise une carte audio Lexicon Omega USB sur un Mac Mini de 2009. Les membres de mon groupe utilisent tous sous Windows 10 et ont des cartes audio Behringer, par exemple la Behringer Xenyx 1204USB. Ma connexion internet a 10 Mb/s en descendant et 1 Mb/s en montant via DSL. +**Cette vidéo documente une [session de bœuf live (en anglais)](https://youtu.be/c8838jS2g3U).** J'utilise une carte audio Lexicon Omega USB sur un Mac Mini de 2009. Les membres de mon groupe utilisent tous sous Windows 10 et ont des cartes audio Behringer, par exemple la Behringer Xenyx 1204USB. Ma connexion internet a 10 Mb/s en descendant et 1 Mb/s en montant via DSL. -**Un utilisateur de Jamulus [Andrew Evans](https://sourceforge.net/u/belvario/profile/)**: les membres du groupe sont tous dans la même ville (mais connectés avec deux FAI) et atteignent un temps de ping de 20 ms, le serveur fonctionnant sur une machine Windows dédiée séparée et un client sur un Macbook Pro. Les joueurs distants avec un Macbook Air. Tous en connexions filaires ethernet sur leurs routeurs/passerelles personnels. Nous avons utilisé la vidéo WhatsApp pour nous voir (avec l'audio en sourdine - c'est drôle de constater à quel point l'audio de Whatsapp est en retard par rapport à Jamulus !) +**Un utilisateur de Jamulus [Andrew Evans (en anglais)](https://sourceforge.net/u/belvario/profile/)**: les membres du groupe sont tous dans la même ville (mais connectés avec deux FAI) et atteignent un temps de ping de 20 ms, le serveur fonctionnant sur une machine Windows dédiée séparée et un client sur un Macbook Pro. Les joueurs distants avec un Macbook Air. Tous en connexions filaires ethernet sur leurs routeurs/passerelles personnels. Nous avons utilisé la vidéo WhatsApp pour nous voir (avec l'audio en sourdine - c'est drôle de constater à quel point l'audio de Whatsapp est en retard par rapport à Jamulus !) ## Des problèmes ? -Veuillez consulter la [FAQ sur le dépannage client](Client-Troubleshooting) +Veuillez consulter la [FAQ sur le dépannage client](Client-Troubleshooting). diff --git a/wiki/fr/fr-Running-a-Server.md b/wiki/fr/fr-Running-a-Server.md index 506007f5f..62a4b0c2c 100644 --- a/wiki/fr/fr-Running-a-Server.md +++ b/wiki/fr/fr-Running-a-Server.md @@ -35,7 +35,7 @@ Beaucoup de gens attribuent au serveur des problèmes qui sont en fait des probl Si vous prévoyez de jouer régulièrement avec les mêmes personnes, **il vous est fortement conseillé** de vous assurer d'abord que chaque membre du groupe est configuré pour utiliser Jamulus correctement. Pour ce faire, trouvez un serveur public avec un temps de ping raisonnable pour chacun d'entre vous (20ms ou moins peut-être), connectez-vous tous à ce serveur et essayez de résoudre les problèmes individuels (en vérifiant qu'ils peuvent [suivre la règle numéro un](Getting-Started#vous-avez-des-problèmes--vous-narrivez-pas-à-être-en-rythme-) en particulier). Utilisez la technique solo ci-dessus pour éviter d'être interrompu si nécessaire. -Une fois les problèmes avec les musiciens résolus de cette manière, vous pouvez alors envisager d'héberger votre propre serveur soit chez vous, soit sur un hôte dans le « Cloud » comme Amazon, ce qui pourrait entraîner une meilleure latence qu'un serveur fonctionnant à domicile. Par exemple, [voir ce guide](https://www.facebook.com/notes/jamulus-online-musicianssingers-jamming/howto-idiots-guide-to-installing-jamulus-server-on-amazon-aws-lightsail-ubuntu-i/507719749802976/) (en anglais) d'utilisation de AWS Lightsail par l'utilisateur de Jamulus [Simon Tomlinson](https://www.facebook.com/simon.james.tomlinson?eid=ARBQoY3KcZAtS3pGdLJuqvQTeRSOo4gHdQZT7nNzOt1oPMGgZ4_3GERe-rOyH5PxsSHVYYXjWwcqd71a) (_Facebook_). +Une fois les problèmes avec les musiciens résolus de cette manière, vous pouvez alors envisager d'héberger votre propre serveur soit chez vous, soit sur un hôte dans le « Cloud » comme Amazon, ce qui pourrait entraîner une meilleure latence qu'un serveur fonctionnant à domicile. Par exemple, [voir ce guide (en anglais)](https://www.facebook.com/notes/jamulus-online-musicianssingers-jamming/howto-idiots-guide-to-installing-jamulus-server-on-amazon-aws-lightsail-ubuntu-i/507719749802976/) (_Facebook_) d'utilisation de AWS Lightsail par l'utilisateur de Jamulus [Simon Tomlinson (en anglais)](https://www.facebook.com/simon.james.tomlinson?eid=ARBQoY3KcZAtS3pGdLJuqvQTeRSOo4gHdQZT7nNzOt1oPMGgZ4_3GERe-rOyH5PxsSHVYYXjWwcqd71a) (_Facebook_). ### Bande passante - en avez-vous suffisamment ? @@ -51,7 +51,7 @@ Un bœuf typique peut compter 4 personnes, pour lesquelles il faut 200Kbps x 4 = - Administrer un **serveur privé à domicile** (mais pas un serveur public) nécessitera que vous [redirigiez un port](Running-a-Private-Server) sur votre routeur. -- Jamulus ne prend pas actuellement en charge IPv6 +- Jamulus ne prend actuellement pas en charge IPv6 ## Tout va bien ? Alors, c'est parti !
    @@ -60,7 +60,7 @@ Un bœuf typique peut compter 4 personnes, pour lesquelles il faut 200Kbps x 4 = Raspberry Pi
    -Les administrateurs de serveur pourraient également être intéressés par le téléchargement de [cet ensemble d'outils utiles](https://github.com/corrados/jamulus/tree/master/tools) depuis le dépôt Jamulus (cloner le dépôt Git avec la commande `git submodule update --init`). +Les administrateurs de serveur pourraient également être intéressés par le téléchargement de [cet ensemble d'outils utiles (en anglais)](https://github.com/corrados/jamulus/tree/master/tools) depuis le dépôt Jamulus (cloner le dépôt Git avec la commande `git submodule update --init`). ## Vous avez des problèmes ? Des difficultés ? From ea539d8bd650cd43d66e16688dabefde3528b147 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 20 Jan 2021 16:32:33 +0100 Subject: [PATCH 171/280] French l10n improvements (#257) (#258) --- wiki/fr/fr-Privacy-Statement.md | 4 ++-- wiki/fr/fr-Running-a-Private-Server.md | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/wiki/fr/fr-Privacy-Statement.md b/wiki/fr/fr-Privacy-Statement.md index 708a515fd..6e2fa3f42 100644 --- a/wiki/fr/fr-Privacy-Statement.md +++ b/wiki/fr/fr-Privacy-Statement.md @@ -18,13 +18,13 @@ Nous ne plaçons pas de cookies de suivi, cependant SourceForge pourrait le fair Lorsque vous vous connectez à un serveur Jamulus public ou privé, tout ce que vous mettez dans Mon profil (dans les Paramètres) sera visible par les autres personnes sur ce serveur pendant que vous y serez connecté. Le serveur ne stocke ni ne sauvegarde par ailleurs les informations relatives à votre profil et l'administrateur du serveur n'y a pas accès sauf s'il y est également connecté en tant que client. -Lorsque vous vous connectez à un serveur public, votre profil est également accessible aux tiers à partir du serveur central auquel ce serveur est inscrit. Ceci peut être à des fins d'information sur l'état du réseau public Jamulus (par exemple, [ici](http://explorer.jamulus.io/)), mais ne se limite pas à ça. Les informations relatives au profil ne sont pas journalisées ou stockées par le serveur Jamulus auquel vous êtes connecté, ou par le serveur central Jamulus, mais peuvent être stockées ou traitées par des tiers. +Lorsque vous vous connectez à un serveur public, votre profil est également accessible aux tiers à partir du serveur central auquel ce serveur est inscrit. Ceci peut être à des fins d'information sur l'état du réseau public Jamulus (par exemple, [ici (en anglais)](http://explorer.jamulus.io/)), mais ne se limite pas à ça. Les informations relatives au profil ne sont pas journalisées ou stockées par le serveur Jamulus auquel vous êtes connecté, ou par le serveur central Jamulus, mais peuvent être stockées ou traitées par des tiers. ### Utilisation des adresses IP Lorsque vous vous connectez à un serveur public ou privé, l'administrateur du serveur peut voir votre adresse IP pendant que vous y êtes connecté. Si l'administrateur du serveur a activé la journalisation (qui est désactivée par défaut), votre adresse IP sera également journalisée et stockée dans le fichier journal du serveur. -En tant qu'administrateur de serveur, lorsque vous inscrivez un serveur public auprès d'un serveur central, votre adresse IP est envoyée à CloudFlare (1.1.1.1) afin d'identifier votre adresse IP publique. Les adresses IP de tous les serveurs publics enregistrés auprès du serveur central peuvent également être consultées par des tiers à des fins d'information ou autres (par exemple [ici](http://explorer.jamulus.io/)). Votre adresse IP publique n'est par ailleurs pas journalisée ou stockée par Jamulus, mais peut être stockée ou traitée par des tiers. +En tant qu'administrateur de serveur, lorsque vous inscrivez un serveur public auprès d'un serveur central, votre adresse IP est envoyée à CloudFlare (1.1.1.1) afin d'identifier votre adresse IP publique. Les adresses IP de tous les serveurs publics enregistrés auprès du serveur central peuvent également être consultées par des tiers à des fins d'information ou autres (par exemple [ici (en anglais)](http://explorer.jamulus.io/)). Votre adresse IP publique n'est par ailleurs pas journalisée ou stockée par Jamulus, mais peut être stockée ou traitée par des tiers. _Les utilisateurs concernés par l'utilisation du réseau CloudFlare peuvent [recompiler](Compiling) le code source de Jamulus afin d'utiliser une alternative pour WELL_KNOWN_HOST et WELL_KNOWN_PORT dans [global.h](https://github.com/corrados/jamulus/blob/master/src/global.h#L111)._ diff --git a/wiki/fr/fr-Running-a-Private-Server.md b/wiki/fr/fr-Running-a-Private-Server.md index 8db48ba25..05eb0c32c 100644 --- a/wiki/fr/fr-Running-a-Private-Server.md +++ b/wiki/fr/fr-Running-a-Private-Server.md @@ -17,7 +17,7 @@ Il est fortement recommandé de tester votre serveur en **mode public d'abord** ### Redirection de port -Pour faire fonctionner un serveur privé, vous devez configurer la redirection de port sur votre routeur. _(Si vous êtes curieux de savoir pourquoi vous devez faire cela pour les serveurs privés mais pas pour les serveurs publics, voir [cette note de base de page](#notes-pour-les-geeks))_. +Pour faire fonctionner un serveur privé, vous devez configurer la redirection de port sur votre routeur. _(Si vous êtes curieux de savoir pourquoi vous devez faire cela pour les serveurs privés mais pas pour les serveurs publics, voir [cette note de base de page](#notes-de-bas-de-page-pour-les-geeks))_. Normalement, les personnes extérieures à votre réseau domestique ne peuvent pas voir les choses à l'intérieur de celui-ci. Donc si vous voulez faire fonctionner un serveur Jamulus chez vous, vous devez ouvrir un trou dans votre routeur pour permettre aux clients Jamulus de s'y connecter. @@ -27,7 +27,7 @@ La configuration exacte de la redirection de port diffère pour chaque routeur. ![Linksysportforwarding](https://user-images.githubusercontent.com/4561747/97542495-bc62bc00-19be-11eb-8e54-b6e906e676f6.jpg) -Pour obtenir de l'aide, voir : [portforward.com](https://portforward.com) (en anglais). +Pour obtenir de l'aide, voir : [portforward.com (en anglais)](https://portforward.com). Une fois votre routeur configuré, vous pouvez obtenir votre adresse IP externe (WAN), par exemple en [utilisant Google](https://www.google.com/search?q=what+is+my+ip). Donnez cette adresse à vos amis pour qu'ils puissent se connecter à votre serveur (_mais voir aussi la note sur le DNS dynamique ci-dessous_). Quant à vous, vous devez vous connecter à votre propre ordinateur à la place, puisque c'est votre ordinateur qui fait tourner le serveur. Par conséquent, **seulement vous** devez vous connecter à `127.0.0.1`. @@ -37,11 +37,11 @@ Une fois votre routeur configuré, vous pouvez obtenir votre adresse IP externe * Si vous utilisez un port différent du port par défaut (22124), vous devez entrer le numéro de port après le nom du serveur ou l'adresse IP, séparés par un double-point dans le client Jamulus (par exemple jamulus.dyndns.org:22120). -* Voir aussi cet excellent [guide pour la gestion d'un serveur privé](https://www.facebook.com/notes/jamulus-online-musicianssingers-jamming/how-to-create-a-private-server-for-band-rehearsals/508642543044030/) (en anglais) par [Simon Tomlinson](https://www.facebook.com/simon.james.tomlinson?eid=ARBQoY3KcZAtS3pGdLJuqvQTeRSOo4gHdQZT7nNzOt1oPMGgZ4_3GERe-rOyH5PxsSHVYYXjWwcqd71a) sur Facebook. +* Voir aussi cet excellent [guide pour la gestion d'un serveur privé (en anglais)](https://www.facebook.com/notes/jamulus-online-musicianssingers-jamming/how-to-create-a-private-server-for-band-rehearsals/508642543044030/) par [Simon Tomlinson (en anglais)](https://www.facebook.com/simon.james.tomlinson?eid=ARBQoY3KcZAtS3pGdLJuqvQTeRSOo4gHdQZT7nNzOt1oPMGgZ4_3GERe-rOyH5PxsSHVYYXjWwcqd71a) sur Facebook. ## Le DNS dynamique et pourquoi vous en aurez probablement besoin -La plupart des connexions internet domestiques changent d'adresse IP après un certain temps (heures, jours ou semaines). Pour faciliter la connexion, vous pouvez donc également mettre en place une adresse DNS dynamique. Vous pouvez le faire sur [la machine](https://www.online-tech-tips.com/computer-tips/ddns-dynamic-dns-service/) (en anglais) sur laquelle vous faites tourner le serveur Jamulus ou, de préférence, sur votre routeur [s'il le prend en charge](https://www.noip.com/support/knowledgebase/how-to-configure-ddns-in-router/) (en anglais). +La plupart des connexions internet domestiques changent d'adresse IP après un certain temps (heures, jours ou semaines). Pour faciliter la connexion, vous pouvez donc également mettre en place une adresse DNS dynamique. Vous pouvez le faire sur [la machine (en anglais)](https://www.online-tech-tips.com/computer-tips/ddns-dynamic-dns-service/) sur laquelle vous faites tourner le serveur Jamulus ou, de préférence, sur votre routeur [s'il le prend en charge (en anglais)](https://www.noip.com/support/knowledgebase/how-to-configure-ddns-in-router/). Notez aussi que votre routeur domestique peut également modifier l'adresse IP de la machine sur laquelle vous administrez votre serveur. Dans ce cas, vous pourriez devoir donner à cette machine une adresse IP statique dans la configuration DHCP du routeur, ou simplement faire un transfert de port vers toutes les adresses de votre réseau local (LAN). From 3379abbefee7b98dd4447b53a84dca4c31cac1fd Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Wed, 20 Jan 2021 21:04:28 +0100 Subject: [PATCH 172/280] Re Add jekyll CI --- .github/workflows/jekyll.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 .github/workflows/jekyll.yml diff --git a/.github/workflows/jekyll.yml b/.github/workflows/jekyll.yml new file mode 100644 index 000000000..497a3857d --- /dev/null +++ b/.github/workflows/jekyll.yml @@ -0,0 +1,20 @@ +name: Jekyll site CI + +on: + push: + branches: [ changes, release, translate ] + pull_request: + branches: [ changes, release, translate ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Build the site in the jekyll/builder container + run: | + docker run \ + -v ${{ github.workspace }}:/srv/jekyll -v ${{ github.workspace }}/_site:/srv/jekyll/_site \ + jekyll/builder:latest /bin/bash -c "chmod 777 /srv/jekyll && jekyll build --future" From 057d6e479722d4e81f4379a1de7e463921eab590 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Wed, 20 Jan 2021 21:13:16 +0100 Subject: [PATCH 173/280] Review changes --- wiki/en/en-Compiling.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wiki/en/en-Compiling.md b/wiki/en/en-Compiling.md index 6cb4b4461..4b1704a3f 100644 --- a/wiki/en/en-Compiling.md +++ b/wiki/en/en-Compiling.md @@ -68,7 +68,7 @@ You don't need to compile Jamulus for Windows since we provide official binaries * 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. * 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/de/company/developer.html) +* [ASIO development files](https://www.steinberg.net/en/company/developer.html) ### Download Jamulus source code @@ -80,10 +80,10 @@ Most users will probably want to use this method: 1. Open PowerShell 1. Navigate to the `jamulus` directory -1. To allow unsigned scripts, run `Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser`. You can also revert this after having run this script. For more information see the [Microsoft PowerShell documentation page](https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.security/set-executionpolicy) -1. Edit the $QtCompile32 and $QtCompile64 variables +1. To allow unsigned scripts, run `Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser`. You can also revert this after having run this script. For more information see the [Microsoft PowerShell documentation page](https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.security/set-executionpolicy). +1. Edit the $QtCompile32 and $QtCompile64 variables. 1. Run the Jamulus compilation and installer script: `.\windows\deploy_windows.ps1 C:\Qt\QtVersion`. -1. You can now find the Jamulus installer in the `.\deploy` directory +1. You can now find the Jamulus installer in the `.\deploy` directory. ### Compiling only From 1b9f8db5597097726991d9ecafb35dc6fc3f5fc5 Mon Sep 17 00:00:00 2001 From: Olivier Humbert Date: Wed, 20 Jan 2021 21:22:12 +0100 Subject: [PATCH 174/280] updates/fixes a link --- _posts/2020-11-24-Multiple-Audio-Interfaces.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_posts/2020-11-24-Multiple-Audio-Interfaces.md b/_posts/2020-11-24-Multiple-Audio-Interfaces.md index d104974e5..937a005f0 100644 --- a/_posts/2020-11-24-Multiple-Audio-Interfaces.md +++ b/_posts/2020-11-24-Multiple-Audio-Interfaces.md @@ -49,7 +49,7 @@ On Linux, it is possible to route additional devices to JACK by using alsa_in. * ALSA **Steps:** -1. Follow [this tutorial](https://www.penguinproducer.com/Blog/2011/11/using-multiple-devices-with-jack/) to route the desired interface into JACK by using alsa_in. +1. Follow [this tutorial](https://web.archive.org/web/20201112033306/https://www.penguinproducer.com/Blog/2011/11/using-multiple-devices-with-jack/) to route the desired interface into JACK by using alsa_in. 2. Jamulus should automatically route the JACK configured interface, adjustments can be made through the _Connect_ button. 3. Connect the device configured on step 1 into jamulus input. 4. Use Patchbay as described on Windows section to make connections permanent. From b9bafaff972b0dabb14dc5712e1eafedb0093628 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Thu, 21 Jan 2021 13:54:45 +0100 Subject: [PATCH 175/280] Clarify the .deb package installation --- wiki/en/en-Installation-for-Linux.md | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/wiki/en/en-Installation-for-Linux.md b/wiki/en/en-Installation-for-Linux.md index 8bfa9af80..95600047d 100644 --- a/wiki/en/en-Installation-for-Linux.md +++ b/wiki/en/en-Installation-for-Linux.md @@ -16,16 +16,18 @@ Although we don't provide official packages for every Linux distribution, you mi There is also list of unofficial [packages for different distributions here](https://github.com/corrados/jamulus/issues/223). -### Debian and Ubuntu amd64 +### Debian and Ubuntu (amd64 .deb only) -If you're on **Debian** or **Ubuntu** (only amd64), you may try the compiled deb packages from GitHub Actions. +If you're on amd64 **Debian**/**Ubuntu**, you may try the compiled .deb packages from GitHub Actions. -1. Download the 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/corrados/jamulus/releases/tag/latest) page 1. Update apt: `sudo apt-get update` -1. Install the package: `sudo dpkg -i .deb` -1. Since Jamulus needs JACK, 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. 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` -**Note:** The generated deb files will install Jamulus with a lower case "j". You can therefore start it in terminal by typing `jamulus`. +**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*! + +Afterwards you should look at the "Set up your sound card" step on this page. If you can't use one of these options, you need to compile Jamulus from source. That's quite easy: @@ -80,6 +82,9 @@ make clean make sudo make install ``` +**Note:** The compiled version of Jamulus puts itself into `/usr/local/bin`. + +You can now delete the sources directory you compiled from. ## Set up your sound card @@ -97,9 +102,7 @@ Restart JACK to take any new settings ### Start Jamulus -Open Jamulus e.g. via your command shell. If you use the shell, execute the command `Jamulus` (with a capital 'J') which starts the Jamulus Client - -Jamulus puts itself into `/usr/local/bin`. You can now delete the sources directory you compiled from. +Open Jamulus e.g. via your command shell. If you use the shell and compiled Jamulus yourself, execute the command `Jamulus` (with a capital 'J') or if you used the .deb package with a lowercase j. This will start the Jamulus Client. If you get problems with sound breaking up (in particular XRUN errors reported by JACK/QjackCtl) try setting bigger values (e.g. 256 frames or 3 periods) in step 3 above. Lower ones (e.g. 64 frames) could bring better performance but maybe more sound problems. See the [troubleshooting page](Client-Troubleshooting) otherwise. @@ -111,7 +114,7 @@ Jamulus has been installed and can be used now. You can now take a look at the ## To update your installation to a new release -Download the new sources as per [Get Jamulus](Installation-for-Linux#get-jamulus-sources) and repeat just the [compilation instructions](Installation-for-Linux#compile-this-bad-boy) as if for a new installation above. +Download the new sources as per [Get Jamulus](Installation-for-Linux#get-jamulus-sources) and repeat just the [compilation instructions](Installation-for-Linux#compile-this-bad-boy) as if for a new installation above or use the new .deb package if you used it. ## Notes for geeks From 38511a38b4372e3843a2883dc2a0eb3f4e5e0cde Mon Sep 17 00:00:00 2001 From: Olivier Humbert Date: Fri, 22 Jan 2021 15:57:19 +0100 Subject: [PATCH 176/280] [en] update footertext.md closes #255 --- _includes/wiki/en/footertext.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/wiki/en/footertext.md b/_includes/wiki/en/footertext.md index 92630a0db..676bfa742 100644 --- a/_includes/wiki/en/footertext.md +++ b/_includes/wiki/en/footertext.md @@ -1,6 +1,6 @@ -**Summer 2020! Tell us about Jamulus - [take our anonymous survey!](https://forms.gle/hSSjsxjWj2Pnp5kr7)** +**Tell us about Jamulus - [take our anonymous survey!](https://forms.gle/hSSjsxjWj2Pnp5kr7)** _This documentation is licensed under a [Creative Commons License](https://creativecommons.org/licenses/by-sa/4.0/deed.en){: target="_blank" rel="noreferrer" }. Want to [contribute](Contribution)?_ From f36bf73f627f1ac2e0bb5dd03eac12147b2cb1af Mon Sep 17 00:00:00 2001 From: Gilgongo Date: Sun, 24 Jan 2021 14:48:46 +0000 Subject: [PATCH 177/280] Checking spelling and grammar --- wiki/en/en-Central-Servers.md | 17 ++++++++++------- wiki/en/en-Client-Troubleshooting.md | 2 +- wiki/en/en-Command-Line-Options.md | 4 ++-- wiki/en/en-Getting-Started.md | 2 +- wiki/en/en-Hardware-Setup.md | 6 +++--- wiki/en/en-Installation-for-Windows.md | 2 +- wiki/en/en-Onboarding.md | 4 ++-- 7 files changed, 20 insertions(+), 17 deletions(-) diff --git a/wiki/en/en-Central-Servers.md b/wiki/en/en-Central-Servers.md index ee45689ae..9510c5a0a 100644 --- a/wiki/en/en-Central-Servers.md +++ b/wiki/en/en-Central-Servers.md @@ -7,18 +7,21 @@ permalink: "/wiki/Central-Servers" # Public Server Registration -As of May 2020, in order to minimise the problem of exceeding the server limit, we have created genre-based Central Servers (each with a current limit of 150 servers). +As of May 2020, in order to minimise the problem of exceeding the server limit, we have created genre-based Central Servers (each with a current limit of 150 servers). When you start a public server, you will see a message saying whether your server has been successfully listed or not. If you leave your server running, it will re-try its attempts to register until a free slot becomes available. ## Headless servers -As of Jamulus v3.5.4, you will need to set central (genre) server manually using the `--centralserver` (`-e`) option as follows: +Set central (genre) server using the `--centralserver` (`-e`) option as follows: + | Genre | Server address | |-----------|------------------| -|**All/Any** |`jamulusallgenres.fischvolk.de:22224` | -|**Rock**|`jamulusrock.fischvolk.de:22424`| -|**Jazz**|`jamulusjazz.fischvolk.de:22324`| -|**Classical/Folk/Choir**|`jamulusclassical.fischvolk.de:22524`| -|Default _(deprecated as of Jamulus v3.5.4)_|`jamulus.fischvolk.de:22124`| +|**Any Genre 1** |`jamulus.fischvolk.de:22124`| +|**Any Genre 2** |`jamulusallgenres.fischvolk.de:22224`| +|**Any Genre 3** |`jamulusanygenre3.fischvolk.de:22624`| +|**Genre Rock** |`jamulusrock.fischvolk.de:22424`| +|**Genre Jazz** |`jamulusjazz.fischvolk.de:22324`| +|**Genre Classical/Folk** |`jamulusclassical.fischvolk.de:22524`| +|**Genre Choral/Barbershop** |`jamuluschoral.fischvolk.de:22724`| diff --git a/wiki/en/en-Client-Troubleshooting.md b/wiki/en/en-Client-Troubleshooting.md index e22b1525f..2ea5c8a17 100644 --- a/wiki/en/en-Client-Troubleshooting.md +++ b/wiki/en/en-Client-Troubleshooting.md @@ -8,7 +8,7 @@ permalink: "/wiki/Client-Troubleshooting" # Troubleshooting ### Don’t hear any sound/Others don’t hear you? -Start with the simple stuff: make sure your instrument/microphone and headphones are connected to the correct sockets. Make sure no other applications like your browser, video conferencing tool etc. is also using your soundcard. You should shut those down when using Jamulus. If that all looks OK and the problem persists, it's likely there's an issue with your sound device settings. This will depend on your particular setup (platform, hardware, software and drivers), so it's best to ask on [the forums](https://sourceforge.net/p/llcon/discussion/software/) for guidance. +Start with the simple stuff: make sure your instrument/microphone and headphones are connected to the correct sockets. Make sure no other applications like your browser, video conferencing tool etc. is also using your sound card. You should shut those down when using Jamulus. If that all looks OK and the problem persists, it's likely there's an issue with your sound device settings. This will depend on your particular setup (platform, hardware, software and drivers), so it's best to ask on [the forums](https://sourceforge.net/p/llcon/discussion/software/) for guidance. **Windows users (ASIO4ALL)**: If you’re using the ASIO4ALL driver have a look at the [ASIO4LL setup section](Installation-for-Windows#setting-up-asio4all) diff --git a/wiki/en/en-Command-Line-Options.md b/wiki/en/en-Command-Line-Options.md index 22e638bac..355baab9e 100644 --- a/wiki/en/en-Command-Line-Options.md +++ b/wiki/en/en-Command-Line-Options.md @@ -31,7 +31,7 @@ You can see all possible options your version supports by starting Jamulus with | `-c` |`--connect` | Connect to given server address on startup, format `address[:port]` | (client only) | | `-d` |`--discononquit` | Disconnect all clients on quit | (server only) | | `-e` |`--centralserver` | Makes the server public and sets its genre. See also `-o`| (server only) [See list](Central-Servers). | -| `-f` |`--listfilter` | Whitelist servers registering on the serverlist, format `ip address 1[;ip address 2]` | (central server only) [See note](Choosing-a-Server-Type#3-central). | +| `-f` |`--listfilter` | Whitelist servers registering on the server list, format `ip address 1[;ip address 2]` | (central server only) [See note](Choosing-a-Server-Type#3-central). | | `-F` |`--fastupdate` | 64 samples frame size mode. Reduces latency if clients connect with "Enable Small Network Buffers" option. Requires faster CPU to avoid dropouts, and more bandwidth to enabled clients. | (server only) | | `-h,-?` |`--help` | This help text | (client and server) | | `-i` |`--inifile` | Set location of initialization file (overrides default) | (client (always) and server (with GUI)) | @@ -42,7 +42,7 @@ You can see all possible options your version supports by starting Jamulus with | `-n` |`--nogui` | Disable GUI | (client and server) | | `-o` |`--serverinfo` | Server location details in the format:
    `[name];[city];[locale value]` (see [values](https://doc.qt.io/qt-5/qlocale.html#Country-enum))| (public servers only) | | `-p` |`--port` | Local UDP port number. Default is 22124 | (server only) | -| `-R` |`--recording` | Include a writable path where the files should be stored (in quotes if needed). | (server only) See description in [Server Setup](Server-Win-Mac#recording). | +| `-R` |`--recording` | Include a writeable path where the files should be stored (in quotes if needed). | (server only) See description in [Server Setup](Server-Win-Mac#recording). | | | `--norecord` | Start recorder with recording disabled | (server only) | | `-s` |`--server` | Start in server mode | (server only) [See note](Choosing-a-Server-Type) | | `-t` |`--notranslation` | Disable translations | (client and server) | diff --git a/wiki/en/en-Getting-Started.md b/wiki/en/en-Getting-Started.md index 69f255d9a..f1f6ff9b5 100644 --- a/wiki/en/en-Getting-Started.md +++ b/wiki/en/en-Getting-Started.md @@ -61,7 +61,7 @@ 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 every client. If a server is made public and registered on a central server, its information will be broadcasted 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 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. diff --git a/wiki/en/en-Hardware-Setup.md b/wiki/en/en-Hardware-Setup.md index ad3d44193..b3484d188 100644 --- a/wiki/en/en-Hardware-Setup.md +++ b/wiki/en/en-Hardware-Setup.md @@ -62,9 +62,9 @@ You might want to install [Ubuntu Studio](https://ubuntustudio.org/) it adds a s ## 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. -- Audio interfaces generally output a mixed signal on their analog output, but separate signals (1 per source) on their digital output (USB/FireWire/Thunderbolt). -- Mixers generally only output mixed-down signals on their analog output. -- Mixers with USB/FireWire/Thunderbolt generally output mixed-down signal on their **analog** output AND separate signals only (no mixed-down signal) on their **digital** output. +- 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. _(Thanks to [pcar75](https://github.com/pcar75) for this information)_ diff --git a/wiki/en/en-Installation-for-Windows.md b/wiki/en/en-Installation-for-Windows.md index b02759e5d..2acc1a6ef 100644 --- a/wiki/en/en-Installation-for-Windows.md +++ b/wiki/en/en-Installation-for-Windows.md @@ -37,7 +37,7 @@ Before you start with Jamulus: 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. Now enable the correct inputs/outputs in the list under your soundcard and disable everything else +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. diff --git a/wiki/en/en-Onboarding.md b/wiki/en/en-Onboarding.md index 9ad4058c9..0ad8dfeae 100644 --- a/wiki/en/en-Onboarding.md +++ b/wiki/en/en-Onboarding.md @@ -5,7 +5,7 @@ lang: "en" permalink: "/wiki/Onboarding" --- # Jamulus onboarding -Let's have a look at what Jamulus looks like and what you should do after having installed the software. +Let's have a look at what you should do after having installed the software. ## First start Before you start Jamulus: 1. For now, **close all other applications**. It's best to start from zero at first. @@ -27,7 +27,7 @@ When you open Jamulus, you will see a window which looks like this: ![Jamulus main window](https://user-images.githubusercontent.com/20726856/100796017-4cfa4500-3420-11eb-9d35-aa206d392a5a.png) ### 1. Setting up a profile -To let others know who you are, you should set up your *profile*. To do so, click on "View" (bar on the top)>"My Profile..." +To let others know who you are, you should set up your *profile*. To do so, click on "View" (bar on the top) > "My Profile..." Now you will see this: ![Musician Profile](https://user-images.githubusercontent.com/20726856/100796411-e590c500-3420-11eb-9b62-e50d02cb009b.png) From fae9e0ff459e68e4aaccb9096f8fe79356765925 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Tue, 26 Jan 2021 22:59:58 +0100 Subject: [PATCH 178/280] Delete cherrypick.yml --- .github/workflows/cherrypick.yml | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 .github/workflows/cherrypick.yml diff --git a/.github/workflows/cherrypick.yml b/.github/workflows/cherrypick.yml deleted file mode 100644 index eb24d7bf7..000000000 --- a/.github/workflows/cherrypick.yml +++ /dev/null @@ -1,20 +0,0 @@ -name: PR for release branch -on: - push: - branches: - - release -jobs: - release_pull_request: - runs-on: ubuntu-latest - name: release_pull_request - steps: - - name: checkout - uses: actions/checkout@v1 - - name: Create PR to branch - uses: gorillio/github-action-cherry-pick@master - with: - pr_branch: 'changes' - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GITBOT_EMAIL: - DRY_RUN: false From 93312b82ab2585a6da728b55c6f6d5f5acb0fee1 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Tue, 26 Jan 2021 23:00:18 +0100 Subject: [PATCH 179/280] Create syncbranches.yml --- .github/workflows/syncbranches.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .github/workflows/syncbranches.yml diff --git a/.github/workflows/syncbranches.yml b/.github/workflows/syncbranches.yml new file mode 100644 index 000000000..b55179988 --- /dev/null +++ b/.github/workflows/syncbranches.yml @@ -0,0 +1,18 @@ +name: Sync release to changes +on: + push: + branches: + - 'changes' +jobs: + sync-branch: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@master + + - name: Merge release -> changes + uses: devmasx/merge-branch@v1.3.1 + with: + type: now + from_branch: release + target_branch: changes + github_token: ${{ github.token }} From b51366e533c0c030a5fbdc8224dbd647388afa13 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Tue, 26 Jan 2021 23:08:49 +0100 Subject: [PATCH 180/280] Sync on release merge only --- .github/workflows/sync.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml index b55179988..f965b796a 100644 --- a/.github/workflows/sync.yml +++ b/.github/workflows/sync.yml @@ -2,7 +2,7 @@ name: Sync release to changes on: push: branches: - - 'changes' + - 'release' jobs: sync-branch: runs-on: ubuntu-latest From bc97defaa230eadecddd3a1e54e5bb88a59b7aa7 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Wed, 27 Jan 2021 13:00:05 +0100 Subject: [PATCH 181/280] Sync md style --- wiki/en/en-Software-Manual.md | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/wiki/en/en-Software-Manual.md b/wiki/en/en-Software-Manual.md index 27a2f74c6..bf3e8e62b 100644 --- a/wiki/en/en-Software-Manual.md +++ b/wiki/en/en-Software-Manual.md @@ -4,12 +4,9 @@ title: "Software Manual" lang: "en" permalink: "/wiki/Software-Manual" --- -Jamulus Help (Software Manual) -============================== - -Main Window ------------ +# Jamulus Software Manual +## Main Window ![Main window](https://user-images.githubusercontent.com/20726856/97360410-77476880-189e-11eb-99c6-f4a68258bf31.png) @@ -33,10 +30,6 @@ The **Delay** status LED shows the current audio delay status: **Red** - The delay is too large for jamming - - - - The **Buffers** status LED shows the current audio/streaming status. If the light is **red**, the audio stream is interrupted. This is caused by one of the following problems: - The network jitter buffer is not large enough for the current network/audio interface jitter. @@ -133,8 +126,7 @@ If the server operator has enabled recording, you will see a message above the m -Settings Window ---------------- +## Settings Window ![image](https://user-images.githubusercontent.com/4561747/99384700-b7ab6c80-28c7-11eb-845e-c137793941d4.png) From b8a29042ed97109d3b1563af02d25bb364fe9d98 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Wed, 27 Jan 2021 21:10:03 +0100 Subject: [PATCH 182/280] Revert slogan to make music Reference: https://github.com/corrados/jamulus/issues/861#issuecomment-762696814 --- 1-index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/1-index.html b/1-index.html index b570e3395..a13ad5485 100644 --- a/1-index.html +++ b/1-index.html @@ -1,5 +1,5 @@ --- -title: "Jamulus ‒ Jam online. With friends. For free." +title: "Jamulus ‒ Make music online. With friends. For free." lang: "en" permalink: / layout: mainhomepage From af7bd7490d4380cb0a9b4a43af5dd776cc34f9d8 Mon Sep 17 00:00:00 2001 From: Jonathan <4561747+gilgongo@users.noreply.github.com> Date: Sat, 30 Jan 2021 09:55:40 +0000 Subject: [PATCH 183/280] Update hosts list and explanation --- wiki/en/en-Central-Servers.md | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/wiki/en/en-Central-Servers.md b/wiki/en/en-Central-Servers.md index 9510c5a0a..4f7bb797c 100644 --- a/wiki/en/en-Central-Servers.md +++ b/wiki/en/en-Central-Servers.md @@ -7,9 +7,10 @@ permalink: "/wiki/Central-Servers" # Public Server Registration -As of May 2020, in order to minimise the problem of exceeding the server limit, we have created genre-based Central Servers (each with a current limit of 150 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 you leave your server running, it will re-try its attempts to register until a free slot becomes available. ## Headless servers @@ -18,10 +19,10 @@ Set central (genre) server using the `--centralserver` (`-e`) option as follows: | Genre | Server address | |-----------|------------------| -|**Any Genre 1** |`jamulus.fischvolk.de:22124`| -|**Any Genre 2** |`jamulusallgenres.fischvolk.de:22224`| -|**Any Genre 3** |`jamulusanygenre3.fischvolk.de:22624`| -|**Genre Rock** |`jamulusrock.fischvolk.de:22424`| -|**Genre Jazz** |`jamulusjazz.fischvolk.de:22324`| -|**Genre Classical/Folk** |`jamulusclassical.fischvolk.de:22524`| -|**Genre Choral/Barbershop** |`jamuluschoral.fischvolk.de:22724`| +|**Any Genre 1** |`anygenre1.jamulus.io:22124`| +|**Any Genre 2** |`anygenre2.jamulus.io:22224`| +|**Any Genre 3** |`anygenre3.jamulus.io:22624`| +|**Genre Rock** |`rock.jamulus.io:22424`| +|**Genre Jazz** |`jazz.jamulus.io:22324`| +|**Genre Classical/Folk** |`classical.jamulus.io:22524`| +|**Genre Choral/Barbershop** |`choral.jamulus.io:22724`| From 15661332893728187289c4cb116c183a5fb0f00a Mon Sep 17 00:00:00 2001 From: Jonathan <4561747+gilgongo@users.noreply.github.com> Date: Sat, 30 Jan 2021 11:22:59 +0000 Subject: [PATCH 184/280] Add note about ProtectHome As per forum discussion on saving recordings. --- wiki/en/en-Server-Linux.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/wiki/en/en-Server-Linux.md b/wiki/en/en-Server-Linux.md index b848fdcda..1e059dc6e 100644 --- a/wiki/en/en-Server-Linux.md +++ b/wiki/en/en-Server-Linux.md @@ -157,6 +157,8 @@ When using the [recording function](Server-Win-Mac#recording) with the `-R` [com To send these signals using systemd, create the following two `.service` files in `/etc/systemd/system`, calling them something appropriate (e.g. `newRecording-Jamulus-server.service`). +**Note:** You will need to save recordings to a path _outside_ of the jamulus home directory, or remove `ProtectHome=true` from your systemd unit file (be aware that doing so is however a potential security risk). + For turning recording on or off (depending on the current state): ~~~ From 19632445e0d154c3b5c6d89ea0f0c262eb4ec368 Mon Sep 17 00:00:00 2001 From: Jonathan <4561747+gilgongo@users.noreply.github.com> Date: Sun, 31 Jan 2021 08:16:03 +0000 Subject: [PATCH 185/280] Correct typos, spelling --- wiki/en/en-Network-Requirements.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/wiki/en/en-Network-Requirements.md b/wiki/en/en-Network-Requirements.md index f5d799c08..d46f40fde 100644 --- a/wiki/en/en-Network-Requirements.md +++ b/wiki/en/en-Network-Requirements.md @@ -9,15 +9,15 @@ permalink: "/wiki/Network-Requirements" ## Audio bandwidth -The audio settings have an impact on the required network bandwidth. The below table summarizes the 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 +The audio settings have an impact on the required network bandwidth. The below table 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 With the following units * ms : milliseconds -* Kbit/s : Kilo-bits per seconds (Reminder : 1 Mbit/s = 1024 Kbit/s, 1 KByte/s = 8 Kbit/s) -* Mbit/s : Mega-bits per seconds +* 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) | | --------- | ------ | -------- | -------- | -------- | -------- | From dac63c64c97711fc0450eefb03d31ae46cbc9711 Mon Sep 17 00:00:00 2001 From: Jonathan <4561747+gilgongo@users.noreply.github.com> Date: Mon, 1 Feb 2021 07:53:02 +0000 Subject: [PATCH 186/280] Make Gemfile.lock writable --- .github/workflows/jekyll.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/jekyll.yml b/.github/workflows/jekyll.yml index 497a3857d..0bf94cc14 100644 --- a/.github/workflows/jekyll.yml +++ b/.github/workflows/jekyll.yml @@ -17,4 +17,4 @@ jobs: run: | docker run \ -v ${{ github.workspace }}:/srv/jekyll -v ${{ github.workspace }}/_site:/srv/jekyll/_site \ - jekyll/builder:latest /bin/bash -c "chmod 777 /srv/jekyll && jekyll build --future" + jekyll/builder:latest /bin/bash -c "chmod a+w /srv/jekyll/Gemfile.lock && chmod 777 /srv/jekyll && jekyll build --future" From d1951db0cff95441a70448eb9f6f0905a6a4b073 Mon Sep 17 00:00:00 2001 From: Jonathan <4561747+gilgongo@users.noreply.github.com> Date: Mon, 1 Feb 2021 08:11:23 +0000 Subject: [PATCH 187/280] Pull request test (#277) Does the build script only work with pull requests? --- wiki/en/en-Network-Requirements.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/en/en-Network-Requirements.md b/wiki/en/en-Network-Requirements.md index d46f40fde..de2153217 100644 --- a/wiki/en/en-Network-Requirements.md +++ b/wiki/en/en-Network-Requirements.md @@ -1,6 +1,6 @@ --- layout: wiki -title: "Quality, Delay and Network Bandwidth" +title: "Quality, Delay and Bandwidth" lang: "en" permalink: "/wiki/Network-Requirements" --- From 7a051a79db754d24016651bdf5d61f3427627ef5 Mon Sep 17 00:00:00 2001 From: Jonathan <4561747+gilgongo@users.noreply.github.com> Date: Mon, 1 Feb 2021 08:17:44 +0000 Subject: [PATCH 188/280] Pull request previously non-building version (#278) --- 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 4f7bb797c..55756bd32 100644 --- a/wiki/en/en-Central-Servers.md +++ b/wiki/en/en-Central-Servers.md @@ -7,7 +7,7 @@ permalink: "/wiki/Central-Servers" # Public Server Registration -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). +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. From f528b309a25fe2ff36dd6326cf66f85713d13da9 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Tue, 2 Feb 2021 13:35:47 +0100 Subject: [PATCH 189/280] Add GUI instructions --- wiki/en/en-Compiling.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wiki/en/en-Compiling.md b/wiki/en/en-Compiling.md index a0c29411e..56e2b6615 100644 --- a/wiki/en/en-Compiling.md +++ b/wiki/en/en-Compiling.md @@ -80,9 +80,9 @@ Most users will probably want to use this method: 1. Open PowerShell 1. Navigate to the `jamulus` directory -1. To allow unsigned scripts, run `Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser`. You can also revert this after having run this script. For more information see the [Microsoft PowerShell documentation page](https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.security/set-executionpolicy). +1. To allow unsigned scripts, right-click on the `windows\deploy_windows.ps1` script, select properties and allow the execution of this script. You can also run `Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser`. (You can revert this after having run this script. For more information see the [Microsoft PowerShell documentation page](https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.security/set-executionpolicy)). 1. Edit the $QtCompile32 and $QtCompile64 variables. -1. Run the Jamulus compilation and installer script: `.\windows\deploy_windows.ps1 C:\Qt\QtVersion`. +1. Run the Jamulus compilation and installer script in PowerShell: `.\windows\deploy_windows.ps1 C:\Qt\QtVersion`. 1. You can now find the Jamulus installer in the `.\deploy` directory. ### Compiling only From 3d22b413ff0d80da6477d7e7c466187f85f5f339 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Tue, 2 Feb 2021 20:39:38 +0100 Subject: [PATCH 190/280] Add more prominent ASIO4ALL link and changes --- wiki/en/en-Installation-for-Windows.md | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/wiki/en/en-Installation-for-Windows.md b/wiki/en/en-Installation-for-Windows.md index 2acc1a6ef..4a02a1e2f 100644 --- a/wiki/en/en-Installation-for-Windows.md +++ b/wiki/en/en-Installation-for-Windows.md @@ -9,14 +9,19 @@ permalink: "/wiki/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 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. **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. (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). *** ## ASIO -To provide the lowest latency, Jamulus uses [ASIO](https://en.wikipedia.org/wiki/Audio_Stream_Input/Output). If you don't have an external sound card, you will probably also not have an ASIO driver. Therefore, you will need to install a generic one like ASIO4ALL which you can [download from the official ASIO4ALL website](https://www.asio4all.org/). If you own an external sound card/audio interface, you should check for an official ASIO driver and use it since they usually provide better quality. +To provide the lowest latency, Jamulus uses [ASIO](https://en.wikipedia.org/wiki/Audio_Stream_Input/Output). +* If you own an external sound card/audio interface, check for an official ASIO driver and use it (they usually provide the best quality). +* If you don't have an external sound card, you will probably also not have an ASIO driver. Therefore, you will need to install a generic one like ASIO4ALL: + +[ASIO4ALL website](https://www.asio4all.org/){: .button target="_blank" rel="noopener noreferrer"} + ### Setting up ASIO4ALL *ASIO4ALL is not recommended if your sound card/audio interface provides its own ASIO driver, since that might have better latency.* @@ -45,12 +50,12 @@ Concerning the inputs/outputs: Headphones and speakers are often labelled as out ### Having trouble with ASIO4ALL 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, ... +If nothing works, first of all try to **restart Jamulus and/or your PC** to close background processes which want to access your sound card. +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, ... or reboot. Have a look at [this video](https://youtu.be/_GzOsitVgLI) from [trombonepizza](https://github.com/trombonepizza) which gives more detailed setup information on ASIO4ALL. -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 here](https://www.asio4all.org/ASIO4ALL%20v2%20Instruction%20Manual.pdf). +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\`)). ## All installed? From fd1bcdc80f660dee81456a39767f5c5660b48b3c Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Tue, 2 Feb 2021 21:00:30 +0100 Subject: [PATCH 191/280] Make --> Play --- 1-index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/1-index.html b/1-index.html index a13ad5485..47ce624c9 100644 --- a/1-index.html +++ b/1-index.html @@ -1,5 +1,5 @@ --- -title: "Jamulus ‒ Make music online. With friends. For free." +title: "Jamulus ‒ Play music online. With friends. For free." lang: "en" permalink: / layout: mainhomepage From 426503c60c9a9a3154b0f570ead924e59bad8ec5 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Wed, 3 Feb 2021 08:13:14 +0100 Subject: [PATCH 192/280] Apply suggestions from @mulyaj --- wiki/en/en-Installation-for-Windows.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/wiki/en/en-Installation-for-Windows.md b/wiki/en/en-Installation-for-Windows.md index 4a02a1e2f..7a41f0868 100644 --- a/wiki/en/en-Installation-for-Windows.md +++ b/wiki/en/en-Installation-for-Windows.md @@ -9,16 +9,16 @@ permalink: "/wiki/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 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. (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. **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). *** ## ASIO -To provide the lowest latency, Jamulus uses [ASIO](https://en.wikipedia.org/wiki/Audio_Stream_Input/Output). -* If you own an external sound card/audio interface, check for an official ASIO driver and use it (they usually provide the best quality). -* If you don't have an external sound card, you will probably also not have an ASIO driver. Therefore, you will need to install a generic one like ASIO4ALL: +Jamulus uses [ASIO](https://en.wikipedia.org/wiki/Audio_Stream_Input/Output) to provide the lowest latency. +* If you own an external sound card/audio interface, use its official ASIO driver (they usually provide the best quality). +* If you don't have an external sound card, you will probably not have an ASIO driver. Therefore, you will need to install a generic one like ASIO4ALL: [ASIO4ALL website](https://www.asio4all.org/){: .button target="_blank" rel="noopener noreferrer"} @@ -50,8 +50,9 @@ Concerning the inputs/outputs: Headphones and speakers are often labelled as out ### Having trouble with ASIO4ALL setup? -If nothing works, first of all try to **restart Jamulus and/or your PC** to close background processes which want to access your sound card. -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, ... or reboot. +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 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. From 7bc06f5ae421fdfd0968a137559db61420348b1b Mon Sep 17 00:00:00 2001 From: mulyaj <63881221+mulyaj@users.noreply.github.com> Date: Thu, 4 Feb 2021 12:25:49 -0500 Subject: [PATCH 193/280] fixed typo --- 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 7a41f0868..eb3789b22 100644 --- a/wiki/en/en-Installation-for-Windows.md +++ b/wiki/en/en-Installation-for-Windows.md @@ -52,7 +52,7 @@ Concerning the inputs/outputs: Headphones and speakers are often labelled as out 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 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. From 721a04e0173ba3b713613ee695f0d5ef73409dbd Mon Sep 17 00:00:00 2001 From: Christian Hoffmann Date: Sat, 6 Feb 2021 23:58:49 +0100 Subject: [PATCH 194/280] wiki/Command-Line-Options: document --serverpublicip jamulussoftware/jamulus#954 Signed-off-by: Christian Hoffmann --- wiki/de/de-Command-Line-Options.md | 1 + wiki/en/en-Command-Line-Options.md | 1 + 2 files changed, 2 insertions(+) diff --git a/wiki/de/de-Command-Line-Options.md b/wiki/de/de-Command-Line-Options.md index 32f650200..07187d126 100644 --- a/wiki/de/de-Command-Line-Options.md +++ b/wiki/de/de-Command-Line-Options.md @@ -52,3 +52,4 @@ Du kannst dir alle verfügbaren Optionen der aktuellen Jamulus Version über den | `-z` |`--startminimized` | Starte minimiert | (nur Server) | | |`--ctrlmidich` | MIDI Controller Kanal und Offset, Format `channel[;offset]` | (nur Client) Siehe [Tipps & Tricks](Tips-Tricks-More#Using-ctrlmidich-for-MIDI-controllers) | | |`--clientname` | Fenster Titel und Jack Client Name | (nur Client) | +| |`--serverpublicip` | Bei Nutzung eines eigenen Zentralservers mit eigenen Slave-Servern in einem privaten Netzwerk kann mit dieser Option die öffentliche IP-Adresse angegeben werden, um Clients aus dem Internet den Zugriff zu ermöglichen. Darüberhinaus sind weiterhin entsprechende Port-Weiterleitungen in Router bzw. Firewall nötig.| (nur Server) | diff --git a/wiki/en/en-Command-Line-Options.md b/wiki/en/en-Command-Line-Options.md index 355baab9e..468524285 100644 --- a/wiki/en/en-Command-Line-Options.md +++ b/wiki/en/en-Command-Line-Options.md @@ -52,3 +52,4 @@ You can see all possible options your version supports by starting Jamulus with | `-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) | | |`--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 f86f6190bf627126cd64b6ca8e26bc403ce77071 Mon Sep 17 00:00:00 2001 From: mulyaj <63881221+mulyaj@users.noreply.github.com> Date: Mon, 8 Feb 2021 13:01:43 -0500 Subject: [PATCH 195/280] Changed body text colour - 000 to 333 --- assets/css/fw.css | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/css/fw.css b/assets/css/fw.css index 522641187..7c49436b3 100644 --- a/assets/css/fw.css +++ b/assets/css/fw.css @@ -4,6 +4,7 @@ button-container:root { body { line-height: 150%; + color: #333; } h1, h2, h3, h4, h5, h6 { From 9ebbe983742a3ba1ba269615118aa55b972b289b Mon Sep 17 00:00:00 2001 From: ignotus Date: Wed, 10 Feb 2021 09:53:59 +0100 Subject: [PATCH 196/280] 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 197/280] 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 198/280] 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 199/280] 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 200/280] 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 201/280] 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 202/280] 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 203/280] 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 204/280] 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 205/280] 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 206/280] 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 207/280] 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 208/280] 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 209/280] 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 210/280] 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 211/280] 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 212/280] 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 213/280] 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 214/280] 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 215/280] 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 216/280] 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 217/280] 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 218/280] 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 59f78d8a208606acdbd2f283102f87672dcb1b62 Mon Sep 17 00:00:00 2001 From: Jonathan <4561747+gilgongo@users.noreply.github.com> Date: Sat, 13 Feb 2021 10:13:16 +0000 Subject: [PATCH 219/280] Add --listfilter documentation Will also create link to this from Configuration page. --- wiki/en/en-Choosing-a-Server-Type.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/wiki/en/en-Choosing-a-Server-Type.md b/wiki/en/en-Choosing-a-Server-Type.md index 5887094da..313566915 100644 --- a/wiki/en/en-Choosing-a-Server-Type.md +++ b/wiki/en/en-Choosing-a-Server-Type.md @@ -53,4 +53,8 @@ Normal server operators can also register with your custom central server so the To run a server as a central server, it should be configured with `--centralserver localhost` (that is, specify itself as the central server to query). -If you want to control which servers can register with your central server, you can enable a whitelist with the `--listfilter` command line option. See the [command line options page](Command-Line-Options) for further information about this feature and other parameters you can set. +#### Configuration points to note + +If you want to control which servers can register with your Central Server, you can enable a whitelist with the `--listfilter` command line option. See the [command line options page](Command-Line-Options) for further information about this feature and other parameters you can set. + +When running a public Central Server behind a NAT firewall on a private network, use the `--serverpublicip` option to specify the public IP address of the server(s) being listed by your Central Server. This is necessary to allow clients on the public Internet to connect to them via NAT. Note that for the servers using this option, you will still need proper port forwarding in your router/firewall. From 5d76d9177f64919c37f771312c6193e6aec13a48 Mon Sep 17 00:00:00 2001 From: Jonathan <4561747+gilgongo@users.noreply.github.com> Date: Sat, 13 Feb 2021 10:26:03 +0000 Subject: [PATCH 220/280] Remove premature change Sorry! Non-English changes directly on the changes branch cause chaos. --- wiki/de/de-Command-Line-Options.md | 1 - 1 file changed, 1 deletion(-) diff --git a/wiki/de/de-Command-Line-Options.md b/wiki/de/de-Command-Line-Options.md index 07187d126..32f650200 100644 --- a/wiki/de/de-Command-Line-Options.md +++ b/wiki/de/de-Command-Line-Options.md @@ -52,4 +52,3 @@ Du kannst dir alle verfügbaren Optionen der aktuellen Jamulus Version über den | `-z` |`--startminimized` | Starte minimiert | (nur Server) | | |`--ctrlmidich` | MIDI Controller Kanal und Offset, Format `channel[;offset]` | (nur Client) Siehe [Tipps & Tricks](Tips-Tricks-More#Using-ctrlmidich-for-MIDI-controllers) | | |`--clientname` | Fenster Titel und Jack Client Name | (nur Client) | -| |`--serverpublicip` | Bei Nutzung eines eigenen Zentralservers mit eigenen Slave-Servern in einem privaten Netzwerk kann mit dieser Option die öffentliche IP-Adresse angegeben werden, um Clients aus dem Internet den Zugriff zu ermöglichen. Darüberhinaus sind weiterhin entsprechende Port-Weiterleitungen in Router bzw. Firewall nötig.| (nur Server) | From 803927c08a30695559f0efc27821f339a37e6e30 Mon Sep 17 00:00:00 2001 From: Jonathan <4561747+gilgongo@users.noreply.github.com> Date: Sat, 13 Feb 2021 11:13:46 +0000 Subject: [PATCH 221/280] Use "involved" As per https://github.com/jamulussoftware/jamuluswebsite/issues/279#issuecomment-776917014 Also added FOSS as per https://github.com/jamulussoftware/jamuluswebsite/issues/163 --- 1-index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/1-index.html b/1-index.html index 47ce624c9..e82f278b2 100644 --- a/1-index.html +++ b/1-index.html @@ -40,9 +40,9 @@

    Help needed?

    -

    Contribute!

    +

    Want to get involved?

    - Ideas? Found a bug? Want to contribute? Since Jamulus is free and open source software licensed under the GPL, you can help us!
    + Ideas? Found a bug? Want to contribute some code or help translating into your language? Since Jamulus is free and open source software (FOSS) licensed under the GPL, you can help us!
    Take a look at our contribution guidelines to find out how. Everybody is welcome!

    From d2d4dfb727da9204e9a8a73be0ddd33e32ea112b Mon Sep 17 00:00:00 2001 From: Gilgongo Date: Sat, 13 Feb 2021 15:49:24 +0000 Subject: [PATCH 222/280] Create image library --- _includes/screenshot.html | 4 ++++ assets/img/screenshots/asio-setup-button.png | Bin 0 -> 7053 bytes assets/img/screenshots/audio-channels.png | Bin 0 -> 7342 bytes assets/img/screenshots/audio-quality.png | Bin 0 -> 6951 bytes assets/img/screenshots/buffer-delay-2.png | Bin 0 -> 25445 bytes assets/img/screenshots/buffer-delay.png | Bin 0 -> 12370 bytes assets/img/screenshots/chat-window.png | Bin 0 -> 67859 bytes .../screenshots/connection-setup-window.png | Bin 0 -> 128084 bytes assets/img/screenshots/connection-status.png | Bin 0 -> 11725 bytes assets/img/screenshots/device-select-mac.png | Bin 0 -> 10691 bytes .../img/screenshots/device-select-windows.png | Bin 0 -> 5256 bytes assets/img/screenshots/diagram-overview.png | Bin 0 -> 10373555 bytes .../screenshots/diagram-private-server.png | Bin 0 -> 10453170 bytes .../img/screenshots/diagram-public-server.png | Bin 0 -> 9853905 bytes assets/img/screenshots/directory-custom.png | Bin 0 -> 1620 bytes assets/img/screenshots/fancy-skin.png | Bin 0 -> 5219 bytes assets/img/screenshots/input-level.png | Bin 0 -> 8245 bytes assets/img/screenshots/jitter-buffer.png | Bin 0 -> 12908 bytes .../img/screenshots/main-screen-default.png | Bin 0 -> 153850 bytes assets/img/screenshots/main-screen-large.png | Bin 0 -> 2351855 bytes assets/img/screenshots/main-screen-medium.png | Bin 0 -> 323009 bytes assets/img/screenshots/main-screen-small.png | Bin 0 -> 202699 bytes assets/img/screenshots/mixer-channles.png | Bin 0 -> 44871 bytes assets/img/screenshots/new-client-level.png | Bin 0 -> 6514 bytes assets/img/screenshots/pan-slider.png | Bin 0 -> 7218 bytes assets/img/screenshots/profile-tooltip.png | Bin 0 -> 51716 bytes assets/img/screenshots/profile-window.png | Bin 0 -> 22152 bytes assets/img/screenshots/reverb.png | Bin 0 -> 8501 bytes .../img/screenshots/server-window-options.png | Bin 0 -> 95044 bytes .../img/screenshots/server-window-setup.png | Bin 0 -> 237556 bytes assets/img/screenshots/settings-window.png | Bin 0 -> 59118 bytes assets/img/screenshots/verification-mac.png | Bin 0 -> 132804 bytes 32 files changed, 4 insertions(+) create mode 100644 _includes/screenshot.html create mode 100644 assets/img/screenshots/asio-setup-button.png create mode 100644 assets/img/screenshots/audio-channels.png create mode 100644 assets/img/screenshots/audio-quality.png create mode 100644 assets/img/screenshots/buffer-delay-2.png create mode 100644 assets/img/screenshots/buffer-delay.png create mode 100644 assets/img/screenshots/chat-window.png create mode 100644 assets/img/screenshots/connection-setup-window.png create mode 100644 assets/img/screenshots/connection-status.png create mode 100644 assets/img/screenshots/device-select-mac.png create mode 100644 assets/img/screenshots/device-select-windows.png create mode 100644 assets/img/screenshots/diagram-overview.png create mode 100644 assets/img/screenshots/diagram-private-server.png create mode 100644 assets/img/screenshots/diagram-public-server.png create mode 100644 assets/img/screenshots/directory-custom.png create mode 100644 assets/img/screenshots/fancy-skin.png create mode 100644 assets/img/screenshots/input-level.png create mode 100644 assets/img/screenshots/jitter-buffer.png create mode 100644 assets/img/screenshots/main-screen-default.png create mode 100644 assets/img/screenshots/main-screen-large.png create mode 100644 assets/img/screenshots/main-screen-medium.png create mode 100644 assets/img/screenshots/main-screen-small.png create mode 100644 assets/img/screenshots/mixer-channles.png create mode 100644 assets/img/screenshots/new-client-level.png create mode 100644 assets/img/screenshots/pan-slider.png create mode 100644 assets/img/screenshots/profile-tooltip.png create mode 100644 assets/img/screenshots/profile-window.png create mode 100644 assets/img/screenshots/reverb.png create mode 100644 assets/img/screenshots/server-window-options.png create mode 100644 assets/img/screenshots/server-window-setup.png create mode 100644 assets/img/screenshots/settings-window.png create mode 100644 assets/img/screenshots/verification-mac.png diff --git a/_includes/screenshot.html b/_includes/screenshot.html new file mode 100644 index 000000000..3c773ef26 --- /dev/null +++ b/_includes/screenshot.html @@ -0,0 +1,4 @@ +

    + {{ include.alt | default: +
    {{ include.caption }}
    +
    diff --git a/assets/img/screenshots/asio-setup-button.png b/assets/img/screenshots/asio-setup-button.png new file mode 100644 index 0000000000000000000000000000000000000000..95e8834230fb18b5802a264758aa0d3cff3b34fb GIT binary patch literal 7053 zcmbW6byQT*-|i2Mgd#{I-J;~s-3$U!0z*nkBOu)&NJ)o7cgRSCG$<)u1A=rrbf?_o z@4fe~_m8{QUH9&_Cf1&F*4}5Ivp?VGc_#9ex)LEC6&?TpgeuDNS^$9N4St`)MF-!9 zvWv38j|cCR4cq{LjOE`8O+}0O5CEv9RODrJyfXK)q-;(Wefn~4_uIzu%wnGxUW5?a z!4bvVjqV(-;amgsqA-hF+0ayiYnMKJs+x3yO8!4WWRK1h86F!qx8;A!U|@M{M78bl zY*NdIqjmqCrNO|cwB5zKBkQCo2~`8GO5PuOo=(aQi)+>O0N^d4Y)?VH zWzL1W$}PIqZchBmM}r76@4jW}16kYCOc$xmByUKC(9uqWupb{YAKh&@^E3_f>c?un zk#BU*KT$jqmZd6$APcg$9!CC{iToobR@rgqXyd|8EV34$!Pa1&AMVFzc(5>$glhgO zwtCvseS*(;vlq%2Pdg+y0wqIpnQNkA>1~WU&~zuJ(JYEO9qZRRd+QFcJ3hL#BKrJ9s!iM+vD+ z*yzmnD@ttg@>EW()X}2t_2irXEPWAK;JTGck^Gap3I3vs^k#=20w>AH{!tZWsQMmrf5E(0dRxcX_pyV=oM? zhsnLM8c?KF)6wS5LG0CUt_`!+kaiJNBrQIjL&%;Pt$+D7f!V`6klrFk_Fjw3Arzc* z+fFn;&BSF_a*Vf)kY51?4MvK+8Y0u3B|jQ-aNDBgI`aannkeyyX6>0nv54L3Mr@&m zX{IWCZeo~37P5S4^U5LpY&Q$Ls^%XCJR;<%`fpny%=ciL2q`;9lI2 z8lKI(uA^Hx_`{OjN}hdb0^))*1=2$qgmlqbxClRTStT0zwv@5>gw6ve*Y4-u%;n-? zwu?z|!}}l3mT2$Hr0xH7`AjiDmPxi|GhQP{!jbm|G#sr``{Ss z#1JPb5CfP~t*r|$8)|f3VnpQ$19e&0w&3Qq;5<1)=>=}2ahu}8Fr;s6japgR1sukC zV$@4&E6;byRY@>q#wz^x9!c8@DA=cKl02qTESbEzz5Olgq_1=`aNrXB^m@%b#FRlj zaIm#ap<1Aa*`0W({qt0RSdzYTg3|u)_?K9A80YHRb;anJ7av4jBsRk>ISpJbY(sM6 zO&3))I3AiV5V^^fBktC4lBQH%*(6d^&atK58qq9%!K_E~-3qE#q-l4$<`^t?lq@+F zR@ELVMN0@f;j33^t7OvndR980=t8aq&s2oLG}xFDl`@sv`3q0AadK%N>f1B^d*XV0 z6ED_c=!V`ksxvI!W6TT4Y{wyDC#UJe(CE0<4=~$WoBLXfi1rXatA&pE;?=RQl9HuzFZ*6Vu>~Op_KheodD^q*#l5Lsb*ZS+d4EJ5; z-_cAsS3xf_rO|iB-Pkif5pfY_=yPnuJ>i>8y%rg=g`@UjQIgm$N<~eb>9Y#IMy>Zq zGx4uT9Q0gPcs?X1C*XSL4j+OJ*wFP_UN(^0oYHupIUNvX)FXMW>O)*c|TM|-{ zlY4b;__R-g{3qxU4EYTvD2m%of=^j1N0$ZS#@I5k(K8I4DncyBv;=6&Zc6Yj*nRoIS=&Imb&M z(4`v)Kj5AB@?&XC_$~2gI@-jSa`jM>BKOUtyT2{RuTqy@ z|0PHBN%ur_(oreO`=aq7*#k_r~6g|AQjDn@g=^Adh=z9yRtE}hp5O8VNiz0 z!c}Y)W4*j;JFcG@AdSJ{97|k|;JIT}3O{&6 zvqswIYE8Ki(#_4*-_;o)Dn2ZIsJN`qZypf}+I8WSkoK|6|Fo*5EcLCE6F2;(H<1S4 znWYW`0zZ=foYfKG;#NH^SO=@Aqhet~!e7$nhiB&!+>_r>%}#qwN9ze_k|0 z0Pm58S;;6lIg7--u0-;wx7RB?wJG>qf|AUnOgq0IB`d$6ZVX6@6#}mzNzEaBO_$4N z+d|=1y~v@r$c~DwSF{pWBk{M6)3x_cydXI|{kf5_S{Q;+Y7U4d(Wee9lJY>`SM8_5 zyB6oLPCRo^2AVwZ8&A~qeFbV*dFuNkPNLeHi$T#LDh8mK|T_J|`@ zt%yG%>gxR(X~WC!IN@3xO7-7)68Z77(f`u1?5{kcst&^hVS(M|cO#VR#wZ3qi0u8R?cCp~VH#}g; zlD3>wK0n?};5EImy{nd6J#^2nxy`iSf|TjIe(;Mh+gdN0J6Y)NH^_8Paw`sngEQg* z*;6t)I=T$+H)jwRqbIT(Akg&+g!npNR9C6@787N}G=YQEC9oXbeiwp#|MWo|I=rwx zpdh0!-uEc63U>$Qnxfzua56P%K>i7ivm(Cp@_TDi$^n6GlBf7wU7h(+H_9)fU!$J9 z_1r8DeBi!TR%-mGNr5|rcOd;MO2P>$M%atA!Hr`9 zz)%~yG0vk%#Wio4ACXfXN#}BDsf^-LEDIgulC9zW`aSRrtms?wRwyGE$;I8=T26NB z)eoCo4TB8Qp|+_=o>a8+iJ%y%l_KGLdwyFd<>VK}3Xd#oB^FrSiQg-jW5^t*G+R}r zf1G%U0Eg#q3aZs-Y}v(!%aGI;Q-OD9n9^yOqWro0lbPCg#6AHl6yQDwf#xPe`|aaQ z$MA!H*m@q){cFw`oz3>fb?Wo9>nkRl3P>v1p+@Er!YRq;;Euzx%Y@tYjcpe%=jKN* z7Jfm;X#V}1VQ8FSzaHnke0Kd<_x)Jy4hz)my@(h3E@z>b3w6q|;_?J`m41cC8eGKU z`8d|bv)9{1|DF>f{%E}qv-iw&((@9YD z%zdrcu zj++hCp7JSn7WIVEv;X}>DH$#7m!;jY)hNxk`C~7dR5T1^>v~SE=;zYnn%Uh=g^FdT zy&RGm_bb&=>)I}}PD(`%9g6OEy?5CGkNv63*RMI$WVsN_fH%K^Mtj*GMq2ERb5tEV z&aPa2R=Mfsl~=9j8BT`!-*xI&bRbWEgwHF}yI8gfMp#$uQl|{H zW4-t(9Rnw*D|Vu1nMUKa;~Rq?2g3zYcMUOE%AeQ_tJ4Hk=qz->-bWH=;GuEi+YoZc z{^5WA2e5*;o6gXo>yVAXEziGjc_pu{n=|BB$&Y#z0o4P=!(wMx_r8QR{^?uSYes_Tp@CS4P7TQ9B5oYN44ESN>`Y_Yeheh24hfk+A?VU%{%f%8wTcA7H+Nv22h({ntK6Zs$7 zXqFx~yfibUNcFQqU>}RKQ7cm`|{Z*u`MnKlDd|=!zgbo-;2}O8WX!JMS#G1hBcNg5keI$s zz4@7z1OgL>pcU;})a(6uE@6^CC2VsmXU;%KWL~&5c#rmg zHG1T4UtW|+8Zr7YowMLLmWIlfzl^1Z?S3=kWBilT>nCbB12OOtF4WtkmwN4514a}Y z_K)^&Lkt*d`gai-^=&M1TH2qw!}xxa%~=KzM^t{z=|fIn7O}Oe{Z1Hiv+F7jmROZK zxy|~J;xM&6y|@dPMQ`<`2vn6^bikW?c5Fio)zy&C)=aXpedmTu=|?*AFOY5dKR&+y z{!fJ3l`DA*XwFpAWNV9|kYxMV;!pN)WBJ_9b0Jvj0rlnbrk5?RS}nyX%q9L zznxcppHYR<#8$ZcPVld8`lzC__Zd?I_Gr_gH8j9&eyu5g$wLGOC+~FQb_F%#5 z8`p<*lDPFYqFD_|Lh>)CfH7itnXqoGoIB>5c)em*e-{vgPPI!u8e_JTbQ=j`<6+sk zB#$*+rL6jyJY_=|(@}~0JPuPYq5O8;gBc2=9am*8n!j&f>OkZgWzr9(y}5;Qmq_Q@2yZXTyD3#wlEVz zLa^o@=mJ;|)zY!|aw|T4{ulE6Jk4`etGSCYq@$niKs@nY!>gmqUeqho)BS{eSN@Wt z4_$uIA$?XXmF11CtVUy=0M5_$CvRuG2y5W`_}=TyWhYV8h7cRP3JdGgrHQw+2bMFI z_`{>cDqp5woM8Z*ANqPZQ2K^;Y7Hq^aSwvX5**2rH?&AE^3>Hucc>Y70dOrV?L5=U z(~bFGP1mVaSpmX8jo9%EY;`omfCs$62@S}#wLIM>2xX!+q2pAu$>jrRmM?=j9?&uq{9tcX*T6KF(|jt^@9yc+n;AoqXA=fd;-jG0|;ZloQ%qF zWFzzf6JUoLu}qkxL+k(RVBz}jlT`9{08o@5z?khY(^-lJ9R4VvINLbE259*Ild#=N z<09*5{uy@Vp(j1ANjPH_+dmJTOpIw!g_~u}$ee|V-=bY_i1bo0Td=#}uir>y$je(w zDqS}fJ&?$XX=<@{QjYeF=wA7PQrAiC6pNRgnZQid^&DQ8J+QKogWW9)4@?tYzIxsV zMofGJ5Kh67%P!^tFRG}&oGzEwRQfSf1stp&COrq4{^L}~^*LZt!ali>yh(P}(`&mNk#r8`~(J7<rSR>5@hChNT3;YetCX33J8m6m(HxioZrODRR zmi=9Q8Cf%*Z0zj=&_qq5>`6^vYNeYvMrp-be`tTtf&Bfe4xT1z<6 z%ppoDkmY)al0re{gR9+U+!y$;OZ^P65SXyZ*PzgRx-;&^q`*7-@F05XFDE#C=*M#X zxaMIFNXB)~NpuY%<(8G*NnClbVqyj4T>;gjBzP4b<^sDazS7(O5}G;Iru_wx&|>1> zePEymMt7_6ny>G;X#7wu_9Ob#V%=OhL1ftESuUo$Ka^(E%|%UCRH5@^^H z(K=D8Xps<8gH{Tim&7^hK>6Id{ZiXl(1#&z7C2)a0VA}s5e=U^dFF?vTiA}REw*Wd zC4&W#e?Yt{lJCVf_u-!_ z!xG70!olTM%x=tJyCA)uKo?%fjeS(FK#UD^CXnbw=BV*kTdF%yxMBdx1@V$$ex*ey zStDtTc%{Ro`GE;{4wen;sjtCoSio|g%_iyBgBfWj0FY@=KI#@rdjy_!s0>YtS3OSm zG+!=e!o>hH)COS!U>P`+r^g<>O`p1gl)0=XC2fm;OiV8dO9lWn`r)RP%#Ug1kmMIa zx-U;|jyF`BNYMePrBYs=10s)Vqn9U!*d7B&?%$V{Yl5xmrBSqV`0xPIE$j+b6s>Eo zY;`>`(d2Z%M9{!kY-jqX5uRTMtK0y+5I{prDIvP&USbsG|LoZs56`>*Nju)8TQ9Zb zX}cz);(BZu8UO}uKvembEFM$ms?H31l$osoV`SLna9&d3mfDlr$&2t>!+3vmAgC?L zo-BF0;K@ba_rlnZH=SS5bA#7?Xp1g>8P|uSfqB65sY<>W*SheoGGWYdv|JA_+0qn` zA-?+XgfGIF{5U~WD^#Thh}1!=qTy0b@`VX^x2@Z%Z%-5}fKv34zde(>s(F4bthizk z!R6NE7HI|9B-qQ#1A8t6m3`A^&(rYgt(OCJqwo5u?-z}75sMAL^6W~Ec@6Bb=CEno zmsj@r`%9vtNe2Q5Zc21fVEsGYhuQa~QF8o|Iw(1o?}E&Y{BbSKRah4FCExKF&EGf=4nk8dp@lhUm%iQ_|4J#ujcm& zg_S)r*_RgIe#3&1SlU~#xm2Dn3XU;Cz45nz?CDh7*wGig>T{oP-igVOu%k#jFnsCf z%ONt*@vO^s9FGzi_vFjJhiFpn5xEeVpA%W#3y&^EfZOE1Rv}E@UmvR3hsZmv?8hma z6Dl3&(y)>GAFd1Md?sn^w;lcCbJvP3ywtMv(2uUbec5~YEf0mIpZ+s7mMB}bl1Yx= zUmIS%{fXlzV8OjimZlVrEG(1fMTpRz-_&=m)m3|9Hdd@i+k4qgHA3SK2YSz(#m3-S zHaa-7pUPX*=D8nR7IEc5HYU#(-Rq=Zb8f`3U02;fvMIDnY5Px9HfW`><*vKvfHcwnC9o2{ifC!^Z$zU( zdj>o6HGy$cDr!oP0MH~lO9EdTzB>25m5yM;~nmhS#I?*7*0 zyfN@zD3DhFYU%!5WAq*x=zr!JcvbSjuz9dO<>Y?*D!CXRtp@zV4FFUW)aAd*nuYui DO;>m< literal 0 HcmV?d00001 diff --git a/assets/img/screenshots/audio-channels.png b/assets/img/screenshots/audio-channels.png new file mode 100644 index 0000000000000000000000000000000000000000..1981e01d358f65fcd86bbebcb71a27ba40a19710 GIT binary patch literal 7342 zcmZX2byO7GxAx2+E!{l~jdV%Z0D{yANFyDCba!_P(%ndRi55HPqq61K(~YDcFHPmi*UJ!oZ@r@#5gv1ei2BEv{sL*vq&z zZCpH{Ip7UE$Q0NgrdY~b40XCl<%RQ#i9!T^Yr5I5WgkOv4U6oMa_g{VR%dUr4KHwy{H{3$dE^g66&?~OP z@?#K^0WL8xfT=+{NDv@zDxZ_n69@GfGz*FKq~yR^H%D7+*wmp6amM|Sn3cuT*MxQ` z_nf4#*D{VK&T+>6#j$9(L>H2vo?zw7Tql;`jmllJJJ|l>>={sndeAz0GW| z?mnU?2U9F0`eD7lwLS8p6W38pVp->CNEJhSPhtp~r8;;^LagO3K?9~O$ihM7Qa@ODt!ID zua%_ECotQ7Dgh`pfdEDJElpgYmCWpCTm3;e#9J1+GMcW@3`^ing^u|c1MuWQe+ha5lgb3l1Ym7Q@!$q1B_Ig|`@qoL0>9?H)CeMnVa5e*<`HEf zlk~iIAh-;ASmVYGG(IDb363|y2m({e1ePU$iZI|(CB57F|nFjKV)HmtU{OEDlG8`{7Ea}2=kv+_qpdl_S&9J8RVlE`Nps(vj9z>L= zrM>eG)SXBip%v?Lt;k(yt0AX-kXwGyKoB$jTkPU69vN;J2eZEhJu5MTq^%@T-dosA z8KZ_sIi@QKgLG`ZcwwCtYet-a%wmDq1g({TFws}wS1Nq^n9dx zRD2|qiprC%rM)E(3~36<4uOWa_1gAw8AmZIPtz{o1xKRykM^sX5FjuR=m@b$88s%I zq?DxABIP2rN$yGhN$@_ePFSU?8*L3e=8(wXn?b6r@U0s{4B5;L`N*OobvM`nb1L%~ zb1r=uz8t<1dR)I;q*EkuqzJw}J$j;UqDo=~Lj!{%y{i053S|;R9fJxqP5m-qZMRgfmT zNX*aP-e9HXSJzqS6XO%;)9~nf$BE&B{5n)7bQz-xLzQSE>ON|Oh?fY5^}{<#JtaMx zjMhL|B_|HZRzQvNou5bC@F25xhW*w#;_Syb3oceh{V@rebJ-$ZN`(G6?2FDKD3oG{;4xuo}E`NQL@udFbtu3V;BJXifszse{Rk>DdYFsg?5Oa&>)wS~)i!s@; zYo4eaJ*sL8^o+Tax|z|-ln!yj(Re+rh^t77L2~wBjvbBpbHmp`snNh~ z*zwuYyS`7G9={RANjd64>V;DjmZp}07c9F9BowJv98}fJS~zo{IqKJBEx0W_EtV$- zCypmrC!5s7)Q6(NqTD$vIUQoCX~Rka4RJyz=G#pxhxM=LMFu;5KD5Pm#dnu3lU!e& zFK<5dtB%C)&K=-9rayT<=A!JqC_>57i8G+C?ew{emQ3o->aGS`k7wlF=f(H@>JbU1 z3EvAtg9<|#pju(Gp(vE;Ijs{O;kSvm+|`&ZF%JSgy!kxFJQETK`3)B}Z8c{eaUs?_ zKGm?)!H%qg#Kh#uf!Axh7qVXjzIdw-Ag=`V!C?#Kjm<9PJX7O=sStB*ldO>&PVq-li!e4vZ zlrJkSWwqXERy*3gI|*ku)?2vvd?B!n^=AzMg?7nwf&Gmtj%SByCM2BvkLE3!ZJ(P@ zk+Xs*LVtuZgc`Oqw5;9^ZIw>umbmwy?9Id5F4j1XI995kma#iNMi)ibM~7YCp1@g3 zNJt3%e|K1%Ug2LP4*T}|_WBm67VuY~2r3nh zz*Iq&avNp2(P(IXc)OqRqnf)m!eM>g{*A{QnWn&|)Wgby zgM;J)cY$uK-mr-u$+2JG7{oX8lL@@%AK@pVMj8ki`0$7P>f^KH>1H+)DN}}ub#|qo ztl0Z;P*bHXnSHE1QIl-rRra;;^1R)m-$BeoI-TXruaw**v6c%_gwM*|KIS|Lqwp=2 zDaj@Wwrlmij}Ob^l?VT0#X}=^q5Ye=1Qv!*nat_p?ZJ@W_;fOG;OjkpiMYYkFgsmm2$*mo4~3^Ed$gv&_sP z%OYP)fND{Wnx9=f;IZNfv?Bv(aEIuV{e8k_!8Np9w3U^FP3>(tjLqy#%sD)49sa&( z0RT}C;lHM>xr;H_!`8;mS=d7i@^6LkU;CdhCj|U&iOWYZh_*5e47GPM2lI3Aad1Jz zF~DH3sFRt6u$qkA|G@uxVh}4A7YAWZPIq^A4tHJ-dnZdyZXqEdPA(o!9v=3;73|KQ zb}q&q>~_v{|4s7$cx23-O`YHlE^vE0@ISo9Cibo_Vi3qbLjQaIyH9fu`2Q){IseaC ze+T6JC&S6j!NvK%+<&2>|3rmha1V1EZ5g<&xt;T04RIbJF42GM|G&)tDgFmi=l_tr z-2VyukHr4~MLGZJ|3BvW?`8cP{ktu33{lSi-Ml!4L5#f=0Dw!OAS0#W0X){n($JV| zdJ0%qJtOfIfECOlxD}9-tZW|@rU`>SS@-co#hMz>Hk#lg!kgWs@rB_pX>A`XI8{FE z^HrH@uI(o=$x27k%1Px!v#AZp$kzsGXfdWhlJUas4#js@M1FRkaRO6rDqT;-EOULY z=Pg&gzjfSnx&J85&+kER8zfF(2kRM;vagB6IFG20{ObnjNuogRr2ozQW(Olp)aHV8 zfb*bwWHWGL&A&$2GAPP;PEvENS*Ls7rPsQt*G6D-wo1>+-X67ZNVd8AxW4Rg6-~yw&P&D@^V}cniJZG8!qSZeYRU&Cw`SN1lLjTr>gw>Go}SY9KN2%4XYdJ= zKt76@u%GS9VRlQ({YHrS&nk4&Q7vm4xiiD2in>=b9~1I;On0`bjp&g+W%kHJw^cP-BJp=2rDIR;Ign%U*OvxF35#T$;)EO*j z+#smo`-&`HI+q6~7dR>+g0vH?6J!%;$7V#AS4TiPzfaseVZj78aqS4UYDD;HlI+L4 zSs?V2yh?rgz;J^mL!5+n=gH9ecICIx+a_9M1ur_1cbPYA8pBM+d^oUz?;+}8V&hhP z<5oA|)6aMu?^3LbWaWBc#|1AP5*I~&`u=IrsxNJ9ZWd6=5uH!kYclUEo_ce3eyved zVmENu4$?okPdFD=V_cahUR$FJ!n=qQ9OMFQ1Z>iCnRNHXz5Gln$ejQpCL#R>q)j2&m*m8zPLJp==DkLB9E zkTu|*Ry!M&ToZN63;ZZl-8L<@5fAtFnJ~_vqoaxGaJ4#rtj{<#QaenN+Gi5A&KIoA z10}u8L7yC-dHOq_9BJr>*xWOaNz1gCJ1MaRr!6iYAb)D@mBA++i}6TF0O^8K`Zz}y z=SVjknJt4Y>aumWUqTwQ>#mpc=WZwU+-~lcHU~cZ*Om-)K}(HKM3`?s=mC)m@?KTR zsc16RJ5j*Oy|D#Tuzksb!F9Ko%yR<|YUKO}@xETr*?aE#mYq$6FHMh5d0(|yxWnOw zvF?N3ZOu(}j2FcqCaEswZ=0?CapxS{BhN7bw_I8ODH2sq*xCp&Q;r|3XR%Us&C=B8 z#fJ*_Kkdi`KZYTcP>72cJ1i^iZPE*Ki>=b{(t6sbiB{F4P_rW9851-uy#lDsmWxs@ zbtHWiaAvDIBywrzK(xPPt1Y0a>t_HxMk(Yj<;9;b*lpG5+TYKGoUkM}D1_;mq51~H zAsS}vFT}q-5|zdl`$F%GsSE1v=+x_tZBkt9JtQgP_9G?Wk8uU z7-tetj`v!zmC6@DC(j1XD%TitWY|kS{DdP*5snH+&|ZjsDp9cP5bsr&ZDPwmMV$D?fx=_b9iY2V##5Hd)lz z`T7W~MIhR_x@ID#(=;B}v*$v)(*9T#g^_Qe$7`ZbpmyY@pZ2rUPY zh3_0TL{g1lFCoto_%kvS7W>^GH$NG-cD`(&e#@ZsH8ebNlHk@D25dg!7|riW}J!cWO=?VFOrFv61W9W4+VCj@~pmJkt3-k zjT!Gos(q&PMKT`XL0sskEY|ld!La){u+9oM1=YPM$q?Uv*Keqb5{7)GuKB4Kie$>; z&{#w`a78w#U>JIQmn}6D^E{#-i!@%)cuw${Jc84i$_X`#Yg6%LmE)3wjZXbop9_8Q zhDItBfuEtfkKX)B! z)z|CGwIjcP;YkiMf+lB+F+Ll(t;Jg&ZC%}-ZKi({sx?Q)oX~!fzbx3ZYPm*@Ab;h! zMw);iY$H#LDysA#{1_FIsnYm)YrT~st~lR%#UC|dSX$E>#86y_xK$Bre0O=EV&W1# zCGPudYh+C9r`$P=#;~F0ANzVEu-7@;-U#j>TB5QiRMH_^DH7KeIj~!i7ZcYvrL<@VULm-o3t+g=Wcbg#e_qkB2w zE^BPph@l=7SZ->cc={EGv$)?x_f|~%VT$BT5TR*c(iIP@e}%LDWgBNA?Tq?PkAv8R zvj8#ie9}ud!OMN~NuyKiQna=Ox2YAleDV`gvc+ zGb9l|85i0}UL=RQ^ zS;q-2SMhhQ1irc4-s=~{JgoT|tcW$?^ZPP+RTBY$?io-Jv=qseonyF{Ws_8d({=;Q zsKq)I{XR{_sq{^Gf(^L*ODIy_v}(pWs<(@LCk?!?7ANc;-t*&)GFJf9z zILlqv@uI?ukZLLH@h87_1@HNOy8q(4j59dPM64d36wTW>vQ3<4g^L8$m&Na;RU$*Z zq!NOjS8nG$v(WK3SqWG|ESUD?#!6?ub83Z+fdqs{eF_hAcf++$!Y9huuXL&|XJd9l z1_?HN?Svp>(IZW`ocTI*QP|@KMYFwm%K^!+v^L0sv8~C^SCMnkkSO+X*W4I%81^@X z_CAvsx?H?qbD^CBD`AZ4t9x%YZT6CZ#9Zm64Sb{-9DX3_haYvui(K*1sV2R!^=qOq zkU^Jo`~sI-ubCFS&R#93Z;liFgyQ4$Srl?Uv((eCjCN`|KJELhe{_~6w2*|nRiCjV zznXZ)|DIMV-V!}prTgiI0;c5)Bw}*mqLLqo>jMEioUoNEu7!e3KP#3~%zfiaA5$LAiS}s;)zINP5Zv#aSbdmUp4`7kl z)aBdGg+AtlleTd~*tgpcj6DoHU;N{NoksgBCD@C4X>feGpA@;?XxH<=_ zrX-%YIuvuJLj?>G(b0X04CsU#^oga3is<{eKO>NaSATtP^CD2X+C3YNQc4s{8NvA$ z?pk7MzaqpZkO{N6W#HRZQQ?y}Md@3om z&&6Pn;3j--0mkJ7A=&WE8gONSKlwCD~Z-b zN*YN4R6F5)^0>z{q}8B1t0Q3dOy_iZ{py8kBoZMK2MBVW(3#AE^Dsh~f=38enZe_# z3miUWnBeuN8kTq_nyujlBLc`PNOm34SwyA@+t7^{rx_L<_zqDtOV!l`vfDS^B{T8A z6O3l19~XoyOv_3Xw`k`r;VQ0SY`3lENG?2b)opvis+NN{Bf44dn`nE-Nz)W z3Ni;b#_W#(ZY^yj;)ZB`XYD|Loys5eCIW&OBCRWIybwYZg&fmJe8wdzVD{Ntyq|jz zZhG>Ew^zU0*~ms-l5?;{i4OBF5+mA2Sm?Nx;o~NS!bCTbm><&4Q5x%}1Xt(k)I&H2 zW*WRI4HIHK?QPwZ+u(+HeiubiErry+#ENw&IImWv-L@qV7u&jTrI9XX)f06n>y-V8 zStiVo&MO&l*}F%f*r$;+&W>fxXqn0Jv_EQ-6{A;NaId^`0L6t{JiY8jryzQ9k1ySE zTAC9SJfQrnZ-NQuWi*;ghruLqQ%s^S#Hm94sHH!AZrR{H`xezSRny6WT!|(X!DNAc z@teIi0Y9p{yLv_0Qh5*h0y9`q77XfWmCjE8V#{6FRvhc}8bb+&&WZK#{T`RlJyJgkYayB-VB45JWv6SaB$KR67wnnPs zE|3t`HWd_)Vt>nny>RdKsv)@QU0qmsn=5!bwd9Mpt7>5UvF{Jb`pDP%*OUsvmu4cWJG9m;T#mzp!+@(o z<{-R<+_NtvPit#kd4>{~Njl+6prc)iBduz-Dd@a3o>`WlH?_wEeAnm_;wk@ZPpE;{ zDsrIm*2Mc&FaTn|VYc9)8{lihOfnCG!htCCiSB)3RP9??mm)lF``N|rI*#w%K3Mu= z^;)UXOhrymE{9kcB+fwF&~&cHb-@X}Yc*YotCCn%$)`5^*uzMlHlhB=5Fdj6m7qES zk#pff^_1@lKGovZ7k>9j3~V83UkS+~I!VnN6Sd2H?#{O-%DXCWm}>)qJ!Q6l+ZC4B3MK literal 0 HcmV?d00001 diff --git a/assets/img/screenshots/audio-quality.png b/assets/img/screenshots/audio-quality.png new file mode 100644 index 0000000000000000000000000000000000000000..db11b9ee07ee9f53517f4354a5a2e394d9e968d0 GIT binary patch literal 6951 zcmZX2WmFX2_V&a?cXy|BNGYI%bPXvWAl)$_((u>c zz3;tut@nI5>)Crh&)#S6Pv@LS&6i39xYW1+0DwRlBCiDipn(2h5H{wY{dQ;u6#&33 zgM-1E%3v^1)7i-iZf^+yKq6Dqu%Oy-@_{dxQ#70?D9;OpWyMfR<|j*oV-qyxa2SbY z`oi$ze(DpGpjZNw;6dgnePR0bz#xo6QVUJZ{_dcPicz$*`X(Ru%R}j%?fdaDzsHlV zlP&QbRGDK-xspm*79ohW*@kiWa%_j5O9rZpWVFM#Ca8L(z zp=q)2sT1#c(f!>{=168u{+4H<^`J!4v=L}0v)B0|&)N(YF)h)Aj(6!io!NcP0l|5C zd!BUX+xNh$#ye2bjxpxKF`p|sv4HG0JJ0DRxX9l5*atibrKWiI28jRklJ>=03Tboa zML8$?xgNtkWOp8(WJvVwT3_3z$ny^3caqY}28Tl$xca-&L*N{Z5$q?c*>QK>+oFM6 zWc5Eufh!Ee0N(%_9xQxQ)P&S2^TsLbEH~w~I(hHL2jP*0{9g9OEUwz-q^ba` z@s%G{e*Qkc)nv~QcC6qh5A^R4{NFVqJhrF_6_0KvK}A8~+M0-8{;uO_y8U}ph7G>BRg zFD_`KfGh`tqFd)J>93&MpS;9@W~bCK!SSZJK|oshz={Oa5?r_}X2SEnfI~*%K`h)5 zPyrho;kv9G8`dH!nVfd&=3!SZdmhLDG!=^ zQ0JPdCmAhPdC$UI`VKU%(5f}XHjFOp)sT~3(3PM>AS&Av6~fXmK6zeEE;fHCGdnqp zjDrkWfr{pA1uIm%63>l-MJ~2bs<^?1Ju6N~eyKi6w~H8|_jRg=w;(gdo1t?hLj zp#LglE?)2Vo$(NzFkJg9)z8DX4?yR{W zS+2bAyzc1kRPUb3MinU3GhUI3gfxfbhJZuddmMUr%%a%TXBZbrf+KPI#`?5iq)1#O z4pK5wUhA1ba$0g*iF%3F6z`Pa6mXB?EuC$GEuXpKiQ*GAoVY&4NaslMNbx65%s5GgNiUPCSejT=nKd9QX|%~82wb%t z(oiA;S%q|%eVBgOck6yQJ!Js838mF}0*%rc zuZpSE(mB#;ul!a?0X0Eb?!ElQ?EUv{Q51surJBqNM^es`CgxP$vJDT2~%9@!&5KgaDE>}txG1c|X49&qOy^2&3 zZjHFKTi;j`wuEc?a`l<4$R;Qn)LAj}Tm}$hQ ztSE&j38{yut|_;uo2feuD%%B|_l`@ARlm@@rhG=l!1vxBWWH{hWH;q_HV$1)aWHiB zo``{MJGLOI#|~@S1HEFdWzVt5p?D_IHRQSEs~j~P7-{Nh#kyI#uXM?D(eSC60vdAP zjZvE)*>@stsxPc*RI^>PH-!8bsTWxn=a%9)rVYrO4ksHK#offyj8k(5^Bfs0ADcP{ zWyb=yG>=Yyyy{Kd@cfP}P0rH}(k`B+u{O63Jb%8UOhJ==!9`cgrbjf7I!`Z5)k@sT z*J^#dfBf#4;CO?coc=&UOoBIWCGWE&R>rWJP*a@fvE^3t%0Z*>g81O)(cAX;uK2Iz z%M`ya&XzZB`!q)4cjotr?lK>I?(#8r(MvFM4C0LG>pOg}qh*r6=6tOM+D>K_+!Vxj zk9Ug)GlcJkVS~lMEMUE`xzLwk?O|l0kv-{QbwppN3Mso|ZKC@W!W8M_a`e|)U?)*) zspK!t^?uh)8KgGv-`IYeRj!(-Ni^y;bOGU#l9B5$T%>MIR9dOa^B2D;8d%^u^gEoV zReH&5Ezr+Z#%ki2dcE$z0)l!@S#e#g_dzmC?z^E?cyZjNafK#n@Oc zns8w+`^sgtA31H;y0z~dUmb^Yn!R2;PdOLbBDnvF1cSTeyMX?tRY!Bf3#`}t3$r4pdIDPGrprA1`u$i!CoWF1_E6L1Z#n&yJ_%Crh@TOCWt$uJ`a3 zC|Jd==*%fLxCq^9_k4Yy-%WLnjBsBXA-kN9DsN|1jb9p5)Gio{`z&wY?9s%~)ChAr zwYa`^&HrTi?f@EZsWIYEwdBw_*LmbOax=dAuFVBmd$3$}nQ`g3a`}06o?+_I)O0Ig z7iFh=u(u@KiNR7L%e!L_XIr^j`$IX)L`t5{W7*~Fra>)N$4R&PTd&FU0q|kr{Fn0k z2RD%uj4g#B)!B46rZOgLrDY`_lNwLKyR1iVTaHJfJ!$rp-7eAV@{RoEjkS$lCk&_Z zRR{mN(}zK55M_0T;|j3xw*^vzN~kpy`R3Fdsx1`P2Stw zgG;G?&7#B5gnVsi0Cb3>0$5N1w%h>u$o2(K-N_#k(yBkDkw5MvURXGP*pn%vK=%_u z(Tocr@8N?uS_#PYlYSpnqkYsgtj^rap)eq!QWq;LUsXp7h(`VSdg9kF=-#hitxrl8 zhyX^X+1W$ZC4P7SjgmaA_m1&^yQ&A&ZFxYG2gr!(&lNTY4%K(nS634=cXHq|vv7i0 za(Ozu{d1!Q03Eh++YUau5=)&}`B>yjuyrqk|GyJV9+{qF6H?JAY$<0*~1o~U(KkHxTwDg4k zx00jFzuWrLAot%0H!l|t_kVK#kxKmaifO_$RW{>jR1 z=c><%@apCAz`2c$&29h$6(ul0rhtg#^su-6+sr>!0243*@&o%1mdXDED<-%DHD!Q6 zVq$sbGvZ~6<-|Z_tuEMx28!55_*{RT zqi{9f{5&<_CwZk^&VNu$nMg9G=<-bA#@ei47p@dfg1AC%9Fa*5Hn$2CmSWv2=v~Se zyJQke3xT^UHPfX`1XR_})U@TTjDl#^m_>;$jq{ zSjmIm43Ch^NomVKDGMHcJblC_<(hUQ%;?dr`Qz#5ROjXL{T%(#A+edxf&|J_?6+qP zNhD2iB11f=>mk#!7JU)nbX3oIong!vJO;R2-IJS#5pJsTIw!SqXIbc*x_Nsf0c9iz4R0<=!QgG~3_t}&vkT5u>WR#o^FPqDF3j6_a(3Hn>NA&77?6M1$(`O zK}j3#!os$XDS;XTRl|J|PD+?+;Ac}nvEtiDQP}GJ4weKNw0&-Ht8et9Xndw5WT*lx z>rPNNw5%Jq!$cqYrLl9VBU4R?+cQzLOrXDid=g}**qUpMo$=~75kaF}P{Ud>s)QIz zz=*`9JPx^CQh}Eselr#CsT<v)A%9!yyTds+nJ4y#99|D|; z7reuDG5H?WK6g_ku1OrA<>Mm`t$c``p3RLA$bTwdQs+ z^=iX)aAml=ObOl8uS(IEZc^r2h}ZiVfv@xVRfzuPW+|G_T!9L=wgJC;sXSw6$%>Gc zivuGn+7NrgCrERtXap|4oTesled@fB2`pDcP+*`JQPC$ih^gl1CAB`dh`srm_H6iY zW0BRAY6Hi91fz(*(Sf30!euE^Rsrl9veNsQPnwh8zwzI~I zC3>3~{VeG-<5y$;rtmR#K5Z$Bj%RsUr9Bj@2B%tyk#SaU@&s0*H+NH?9Q5C~Cv=#9 zLM5SU_yQ!2Fpi*9$A9u+r)7$?Kk%;qRAe(HOkp;|k+G5Y6clSaAm3#wYYX%?5d#|kTp4Up;a{(k39KYP1zeUFr6 z*$%5B?Ii~n7)cB+t<+e?AiCszB72L4?bHU8v>3+ZUdAD3h4B0CRe_nM;Va@@|C5uU85b|Cu8=`UYcTzwa$hq^AESwG6h1^b~%${COpmErG8bN ze)(iB;&;aEDn{qv8zThYBiqYYa_)u zLjL4Aa+4o@)?ec*a&oz%rbceX1yjQBu}Q>L5QWuCLgVkN)v=d{9WK_W%$+Wl|Xra_Jlo|1_=MfWU{(h4W#i z)nr@?J+F!eFsrY9#fftQV@fEGheJCu!d*%kbL88q*Tb)}Csr}6tbP(CSx(f6?Ge~l zu=k_|U+4>}=0#qDU}hd}0{wA7lL_8y0&s$P?nomy{qlQUBCYJG1o)RNDG72si`Mpf z3J32SIXbCiD@;_dT%oQi;eN2L8h(hf%!crHIaX~&IHiK#jsF=7n$Z++X7LK0o86zr=;8AM8DoW%d9E zBu1uWOtZAZktZ3u7)rO9-d{|Q%jj0CQR*xw7{6+QfExJr#?h^CP|k`(%R$cF3Fpv#^zPN#qs66Z$(rLNhsFj zCaZkwDf4-IX1$;Q{U}T&g1Babi460E#%g0zE|(i_1;5 z@+}-yCtM?$vm#ZTCw^f?W7o}2h8VqmI<{r>MWz(VT>ntza(ARpu9wu};+YInqR82n zjz5Wt42PYpF*6Gi$?o=Q+oRZ8QL1N>jw(mA617t$zTAkw^^ggW#Puy!3X~+YY7E$w zG#pxQXvtK2iU+&+sN6UTf>|cDQX^D2J^?{!?$$eKi>{mH1LkWzp`NVLScd!UrB@L% z`4~FBhw;K{XS=c!)6>@Ba8hx-f(}+N?(TY}Frlg#})vyMc%aeOh-%zhb z-K{yU*C>>>_tx`Lw{jZfTcn0gCQ<{e4kINi;f@qwP%_kF{g|!#uCfq?fS~!iTG{w> zcwg-$`cD?y3#2Z`1xCnu*GZ~xR8o+yypz676ZvQQ3jdF%Ri$mdNxCbhT-h$vkv>nD z8n|1H8dCh}u{@wmGALMmm6`mmj{3c6o7Y;BlB7pR91q}4IT|MFHxoa2lGZLhCe115 zZE^@j4->|zg81f62E_Qn`SSF`A`D0-Z3H4BBD&8A8Z16M)s$IeAQh1L_8CJ&UjvbG z6YS|GOC2kg5-)N5a;^x0;RS?+KEbd(!a>+E%2?NFa^tj?!?CbBF8BCw z-Sb03PSBKKrfNc41G+WTwvPpqNxP~W)c767pC&hU4|0;yd$pD>0)9L$crgM-McO7f z=&l!+MYqX((n;?KwOE(5%$6I?yI=@@%T9LkKr}8e{PZCD_Mx7f46Y1W;wRM@*IwFM z=J2@1KQpP)gE3-!ctLcer0a{Ws~a3zp+Iec{e3Wugm5V$0XGlXf7YHS4~YrMNJVEJ zMap+iv#)SnBv!LV&$es!Y$rwR4|1Y;@axa?=gpk2vjL4lqE4tuT9_Fc1l#o`#PQ9V zD0-cm)6kvPd(4^gddKlO8|OI`cQ<)B7KAbPPtQ6H1PIAJ|+u_5(CL##kb|TQPY92q4 z#^H8&6IcXQZpAohcAFX-g4FNh#3))Qg4p@squ)-Je)I=WoqGWp8seEon}?HL-rG;a zfb}B3#cc|xB{ERu1-U3m%bzB;zIFP3FCul|cKC)NGFkUUMHOZPACS{>cVJzE*z#ZbDSaJ{Tu1af1fVA9Ler~<+05Hr*9%r z%z|zm9M~_5*vhr!Ccdf~rs&cmJt}RW;TCuWSRw*LS2vo6@Dj2!!nNVlw?@p&;i1TP{why2n*AF>NV=1Y-p5&ZnT*xX)>wUJHA80q;?`XY#QeX>dBUV2WG3AB=Hr zRk53M_hlYbrByHvR!S9Sl-Hv$xUZ(c$4Mdj(%hibDn>>w)sy;!L!HC~x5G6Q6m0C% z@RQT$5OX9w3yy(h#(OTWBSTkn^LEIm9w_<~oLTg`ZyWakAx0J7?R3Cl2s^_U>1#qK z`qlRb?4wA^Z^ljO6za##qJ1)GXebXSG!k>YFfg6Ob}vlcgbw3Dj$9LHFm+ynR+Ib~K^snEwAH`ZDHW^N(^}oFxgqS9l6n6T~_6C zg5FUme>a|g-{wsXnwg)y2y=t!ZfQv0hwz&B|GJ?C_p5jJl+KA5)x~pR(z0Revr&$9 z^1|pJxD{doBh17sSYcy1p&1#?vAML#<(BsVf4)RoEh1z7aD;rr1c_;_jj^$D{sH6D zw9$(F3O&-L9+R0FR!w5F= zBRRRb!{40TIq^BVHLhFSV4^tJeIHKWz*K}lC*scLx?>m=6*tE`i~#+wxi-4?&JMWU zFGB6C26{N14-aBC`eQea4J<8L3=IuU*IGWl&dC#rl#&a$FK)^iUF{z-xJ?|4^fG%n zWGD@5BT1fBZ}V5AInEkn7k@@leH;_Ml#&rY-lg6LferVm-`TC>Z${EC_l;ox`!|YJbmw3^QOHZ#z6i{rQ1bHU#JdxJUTgakdP=*j#FWf` wFf}uUVNRJ$f%M;Jp0o*FVYZBE0`SydoaKXHc$eV%-`@gdg_rWRa;8E52mOW?WdHyG literal 0 HcmV?d00001 diff --git a/assets/img/screenshots/buffer-delay-2.png b/assets/img/screenshots/buffer-delay-2.png new file mode 100644 index 0000000000000000000000000000000000000000..3cee1074a45fb9e8bac55d784afd490ea0d1f94c GIT binary patch literal 25445 zcmaI7byOTp^ex&r1b3HU!CiwB+}+*XB?O1y?g2t@cXtT{cXxLWE`!|3ckl1M_x^cj z)yP^i)6;#r>d4-^B9s&)kv|Z800014T1rd>03gZ0@1x)$!Ox4;jf&tG1SctNR{+4F z`uBj4R-yb00Azr)n26d}gR^x{VN6Rx;P0UZ&UcnREHvof5aBfNbWCe`_LZwP>+R~N zR*gE1Rc(WZ73~-Hm6)3Ah|0ofXz0t{pIX-*-*_+*!y~ayj$Yp$yV@UoF->wF);f2+ z67<_W?#`AmH^{iS7W(@7YLW-bebLd;As`@R3RRj}*w|(k7d0z2PH{B8I5=EP<$jsW z7Mf&15?2nL=ln=bZSi!y54t~BrNIhypHECoBu^SHP$_jVR#Quki&JEL#r)dQ{PpG0 z`Q~6;oi4>VWFUb;(y5P)M8KX!qiFb=PUCyx8phu zR>oSlOm`>q<(k#MjA`Q@ctw#Bzw(pB4VEML1Z-b@Lq!s??mZmZIcuV&f~rCh#4--c%erMvm%sO&5_n;kJip}NJP0|9 zqS8dzeeD!X_JT_&F#utuN$#A$zEgI-`ewx+k*L}?^6cz=1mHj3^@ZmIL4Og?T5o!o zaZQkde!42ht%_zeL)Iw}{{>>7b?o>Q`=Lg4;F8BLreE(l?mVzis1>8CK{8uV zrume;BL7~we`USdbkGBsYPvfYF~#AssVP*~PinXH*oai+v{|q8RYhN{AUhw92u{0( zh?XO~dumeulU{%CN4&l#QIPaICp*Oqcb~j*H@~KF#XWrQa(hJH_fObq-T2wObZ)sqTACoTN*obQU9R^k)*Y|+iVqE5Rb$0}D{Lt-GgBw9u z@`RzKr61eNoS02^v873=S54g0qV^hW#aM9J0`7cSKfM}DenpwjlDw{PNT3HVrhZ{rTamlx z5qRsZ9Q}D~oOx1|NS`^+DXgfW*_z!NDL!mRDSPB@GSwY64JIQ&ZE>fCcbE)meLJ zQbrzL)%Z7x;Rj*fOQPhM(sZ@8kFiQ1avWykMS^u83UD7tJ@1wC6zuntweb_S5B(nn z5hQ=lFvkmTB;d!ZCq*2aJJ`!*WA6`Eyli(N0ek1-WpV)U^_$=LUcYj=qCL8S?$xfo z(_a(^dW3eT*O~d^Ce=`HasWQ^#NT2gEIEDnb;Bm4@jo*@)|IBjV6OH=`JhoEF@xKx zSJlb5dnM@jPSeu?lb)6(PwwYZt{3!?Rz_V#?K%{xh1y-9Lm=|-^**W*T}PuxDo)UD zNffs-5>W_*WdAJhs=138%k`0++OrI51Or>SjSv82*j+05?*6jmW@Dv70`L_&&6PKO zBbAJB3Z)ba-k<)h<@vGu=`W{AJ9tGz^F=c8GwH za#Km`N^Q{9D5Dwm6BV+M^xjWL1z=FR)#w2R`uAgVhKi-#6om}=6AoZuArXH6#0)xnG$8t8$qm1FM& zsQ#p;uAnf8>Q+&q5$Z<9Aj?8fQXi}|<76gZ-hWIe`|rDvlYU5{51ZKk?~JlPE4-0cQ}g#= zJaer!^FQiCrJ~pb%S-j1Hm?@<7vc;m}ohDZ)Ers z#5-M0Vr>_b`5!lOhlbsRl-xmcgSe>rv58ABzt$Ji=M~j+4l*1Jj3>Qm({+U?!hLVN`j&vdrkXMqGm1XR1UUpUbwL=j@enBI^ z%U`s+%NGE8np{oWDVj+i?vQsR?5x;8N5_8+*l{?^Ro@KTr)D&45PH~HKV@?tEwmf- zE3onoauelH4b8)`9w3W8f2H*x=`x#}&~N>IGopsS=3*xlZ~ z+8f67^z^(?D^x*;zB(AhB~GR*uEA;?Xw-Dd7-1Ni5bQR75>b~9jyL|&#<2s5I*PUN zEd!t9w>n5AAW=8$!Tiz9;nbw-W(lRBAgj3e=2aGse5I*ww8ihqxyz7!^QGa|2arb^ zj*A+;J3Ea2n4?mdhPC%ouk~wj+gSVQ4+!ElgrU!_*Ma`U&V`5MqnVi04hjo!y9O%6 zSx@D?gOe-&S|O2r(A}_au+kgh_oL{$jMx1G{h7aP_d_k?uX*ns3%ld*vA+PflYV>F zx(OkUhI!xCskPe8@XIz%nqh?Zjjr{aKtCito7=3zR{h!h%(M>@(uLve=tP1Q_*=v7 zapPr#?z-_1Cv)x8%^0w9_U9%U-5z^AEte8fn3MSQ9bvd)`Z99jRaqa|DuJBo(Y#NS zvAY`D-`^;Z=F6~cP4hMXfMdnGu{-fzBeoF(0|N`v7iBCFGyn}A+NN=(CgGz-`jgrC zNFSpFljD9t3^M?4b9iLr=s->PrOS$10LKIKjw5vD)|5}t@9qxvCR&pQxPPoQI@JL7 zzYjsrUcwPbmuyd8^&SVu6r3&A*2=AIeRh-B9TI!2-_hsogxK1a0^)%Rh=Ao;zz79+ zVS@q)`mlMB1R%D)@honj8&Lz_&-WA>j|O72U0s7kp&}b?Au2m;V;bvB#9w+);s!xJ zdwXV!8UYYMMp60Pr=na9O2${?R_#&8Psk1-02vHSuY4u|(0}FP`MhEBL=JXhyP(e! z_FE965YRITI8~+m&YXh_=pY2PAOT)(h#qu+&GDGC3`VPD*005NLsZ#Jc8C2Ao8B86H`=hgahvnl7BE%fP-d1 zL0NNNKAG<+loFo4hWh6{_&Jk+-;+N@W@jM)DV3MqxX^iZVQzaF(Bn}mO)5j_J?9+Z z)*TaFdnoZYowIBZsFk;`Jsp49?P6iJ1}3tV(;fndfA=|lzvm=mtxN>>B;*Ngo{oK@ z#Ezx?nQ71(&0l{WABrLI1tTq9Rn`cFE0sC&xCFckBaJ64*q z&fT{Fv7&nt^<^A=vx8mj>1K`ck#17tHfhYeG(#K3={+-hPa@|NERVz3CK*I|`H(p^ zfCc5lj*QywKy7Mj8LjH=%6}z6sYQUu?rzM*x@ogLyR;M#T6!xTk|I@tLfm3X$D{Rn zx47ccQ~u=Y1@!QIE*ps1jU6`b6RvNQ;;=+XOoIcYoLT+$Bbx*yTa2M{N}TR&05Zww z9ABRjF8d|VO11Zb{ey#py*;Nv1qFpXIyq=fx)f$k#jw=WR2&?f=ey9vq$KPQFn|%B zM!$GkTlUEGv@(OA?*M$-SPfttvlD(V$l7=1e1A~Nf_0-gBWcp#~Mi+$7!VWg?ZUgyTrK6LwOrIm-v-5N0sExw^+Ay(BiXOcEgAX1T zSXKH_)YJrOw1k|HwOXClm_Q8Bgje*OWgkkNQ;z4TywzSCRPekB=q{{XVj@$#`WPe8z0QPE|J3_z>W z4HNX1AQGAwkD;FUMK$rO(AQ_={$k$*1H9DKgN*}3K70^UE!yICw8=-*ZLYF;baHQY zXdA983#XK33a(?_+`mRwmH!D3oEY~(>o#qrF@0QK1_H#zq`IDE){En8cK$RoI8fbR z;-0Pa6DMu@$#UE4D2MGv*Sq!~!-eFPNKu+-r}8z{)@nC95R0HOjAB4T01TrS>+Q|f zvqcl6Kgh6sAgh*5d!#22$MvA3oTdB5o!PJ}Iy&0tf2v_Hs#7|` zue=c^`t+=l$z>cziV1p1E5?tB=|7l+gI1RRWw)gBh0QvVYZAGtn>>t@ja)KjhA~%E z)Q!FDH4_aw*IK7gS{oXen3yR1T&_KDHFaB>z8j35^Uy?Ty07pKaS9< z&Ww%8m0@G6sH!Ud;>X9pz#t%yQJ%~F5(b_;Lf{TK1D)_n=J@>F^ySilyl6<)?=Md% zr>p(3K5FH?-F#wnJ3`@|eL{N#Rpl!|1aecUmw!Vu_j=98(=$0D9j zzJfSw!-avL9qlnhEB(m;U^Hj$ohsjzCP5bc+3N44@5^~TNtRCIgD8GP_!<8|4AF&& z`fH($o%ThQx{x_%#@RkH5D(h9eSOgUl1@R#r>%-e+;`FnAo)5-on64%jLhMSRiV=x0rP#Loc) z9FC>870a!+tzg+8e?UZVb#=MW)39u$sJemg1vg9R&W8H0mwJaTs+P>{pwh;82p2lczYw-95Ucooyh^7tfoYax-3|M_J_z^sBF4{jM=A zHqP1H5`FHd!$e0}g_vDgv9t8~ECxoM^fNWG zFx@g)@Bk}LRnO}kCAgqQd4(ADnXW~X}mj1VN%o}24UpDjEhS{*P7yo?QFIj zd+5j1-@N-lU+3ZV?G*NtU;4vLuCK$JM&73)z0j?-vZy~M zNqVHwuyIxE;#|ov(kQ5~2LeXZC7J=R!{w+L>p}WRLK^P1;Jo{THAp@)z&yfqkPex} zQ3Qp!%(F@*0rS%d4jSm8yswuML;8snw$CZc#Ss&qcFO+<-EO(}#I2n*Hg<&v_kZIP zJbd*B2bDUFbqx)3T;55&y}j%i$=@9QGjIZT*zC&6&PD~GMZSOkj;EnX{qf^R1x!yU zC@A?S7_*K^tXR{~`XL~oG6E#x@Ba=i&6%02Zw@Ex88VZSC{kqH!?X-7*9&APgNBxL zjSn5feXiE)Al}+A&9KuvtM~}2kJ#=9jXZ4u8Y!;^)6oq*%s5i&+lBO;B84c$1|@IJFGA3%6%DQFYYp5p=4RCc{ytmWl^;=NJ+6dO$JiC@-$Vu3}48s z92~BrD7_Y`5Ml8V*)4qRe<1_6K`_d`py$WOWY3>v^FizF zjg7Rlv*Pd6 z8OziEQ_}DTi9XOXSNPgHAJGRft+@O!>F z^Ikvd1ELZf;Zr8uL+K0%luBapjTqF1P*SJx`s8-~vVSnCP`%Rr?xNN%A`%;V4q;X` z-f{LvSjQ{#K)@?k)HzU7Rmk+?hf>80^JE_WE3=SGZet5MmP4J7$U#pGf zxgj>Z_7Q-CIH8*+@b$FPl` zjdy)>8e2puQ0a_x&f?(&j(2LgDbIM{uG8Dj;1bX4@U|>_vXy9Mn-&THuyW_|#ru(l z=sGi$64LG~H&VK;wG;aizyM%uU0}sH6A6V-`2Iel-+aN-1)^*mKtM8LjWVG=g;K2CB zM$t~02n?Jm@#la29u{uYV5~SMW~=$eJ9Hn*O6IsHt*;ODNN#y|1?BEk#7*FO^AC}$ z5UBQqP(wJ~0z)az)0r{lyK955A3v|je7iYmZ1aQgkoeO{XiSYPT9(Me!hThoU>jw? z71Yh_NHgt6ZW`9+GC%uWlactRK~&*MOL=>mo#M|rTWwcwRRB=+R$iD`O4j>?O35mI zG&_v1ru`{a&&_IieX?}NCCN|^5`bZ*a4;j7bj4Dq9B;mNpc{lg{q}pDcxE?WOAnKO zKjy^_rbK*wi>x^Mkp`AId#+g0Zh@=E)*IrSaE@d$T$a1Z=E%lx*F&ttvhVxfVkGr9 zSs#MCKa@G;Z}jB|-EPu<2TA{2?XH!&y!pI7$HADI_8mD&OTxgN{>o!E!~i`&343_l zH`%WOMnJ%Z1z*Z^(Il-D!*uUfaY+{_cEA4O=40U?@I$kv=%-%BpD*18VIh#Qh$ou8Tz`nqHyePP57sy6*L zkc}8T30R#^MhwH=-#`^YDN{MSkLX$a_4#qzO6*Y8{VuKYm05MiE@8D_2`xdi_?qq>mmQ^$4H2 z;^CD5mL@lwtpRySv?t`u?7!V!v)z0lc(t^Tm;a*$sC(v~p`=}^{o?eO42Q(PKosp{A`6?4d%?hEzoeuj zQpE5768J^T=m0=YLE+v$RL027?RhkndpMbGi8ruSY`VRDbaRM(XwxXhod7XvRLt1Y)#&CKeMWJIzzo=694WWs#tUQc zsbnk>>zS72+IkeJ0C_A)N;Cl&pWU0I-Bm3v$sq%yCo>Qb*~<$TqKFUKpHNp{A0ns~ zzSwP^(v8$KC?{>4XB-Qzr7wLAg?^v4HRQw^*z5{w$`DxU{x%IG?yDK&}W1VG+m>$JQio9U^rQ)N7F*3l+MwH?2c}w&4m3EoDce*%BaQoiPnf$Z1XU+d=r`DZ ze@M)XvarB_L)lua&PPB1pGi|>scsq(zt(F%F7~m!_CkrL<3Ichn$Odv+jIVGIl7V& zU{O%0P)26Fd^xIBDK+W;u#UmOh&((74Fr){Wmw=z@LMM~fip{d2R{cz{tiqEy4_}# zCll5TA=eR33FsEx>nqy80N#T-ML5^}%~#S&ZVC96!D73?*tOYWVkX0dx4V2=+W16r z5?&18M|GEp8JkwC%B6Wn90@ob7%eiLU75Zd$oG9F(wxXvyuTRlYI+HYVgf?}5-xBU z^4EColfU#d{N2IDRvND6g@&=}<;<9;I-G

    z(4LgRF9*UebSWaC+-K7iow~SK>M{6GfV-r zvXpkZ10y|->c@|Aug_%>nA(__>t!zRD&PL*7+o5i9jiK^gfs2zNnZ%pn8Kk!?{4+P zlm|-{ESxRBi0u78D4P0kW0@MAVVBP^v96Ae&QXC#xtfa$8#fGTUrngvkw6h4H+aAX ztj*1V7Y#A!e*Es?@Lt8m%?&H6e<|rx5TmY}VbEqr#GZznb2W4yJhvSHoab3>H`!Ob zB|Gfz^jAy-Ae%Z?H>X3!X@bCrI{-NSY^M}RS}T@4%1a^OmB0zkXQcI8?`0Q3|kbQYJ$o`Sbpk$tPjh#UT|}9rXd;Xy0Xjtrh55 zS(=-x;XmK+U&o~|Hy_ci2ZOO@2+t?jfKhF2+w2Ta@1`FVurQY_+k1I>7#58O!7-kZ zF+=k1hCb;Z_8i4LXXpa~Fz4ru`S{SJ$Z)z8I6&>p(b~Hmf-%QV-#FLpHutvT3Ni8- zL!s3c}OlrJ^Yrzs5*dHzn3(+aqEp4g4_`-?` zoG3V~R1%$@T!KTTj6bSq4G~8b$xSDd@AU+(a8)Frd#aAH2Y_+&8Acs3-j0jmTt2P6?nd`MT-CaC9t&K-WCIP8qnpx84GHJYlBcZRQ)QVh7VQMx0-4|87R?@?w4a`5u*6Y_N{F-G zaB*}rbk)@6I=vqnijR+vjg5`_z&P@214cxFp-|@>s=8)5A|n`Lu7N{!lNED4u&U=( zOHwNFhC={OnDk4^>}{0Xt!&EFJP{Jo)4?}784>q-*xN?e9Y<#&$4#gkEDfNhrZ&Nl zZVyAPtgJ)`>gnwZ$&j90>hvzL7*Hsz2}7+7Lv@#h_I^0|Wi!380jm#Po$u?5d~t1) zs3P4#U)y0eQ!oOe!INmO^u?ZL)Uk5B8P%wyLv5qcQJuz(3THW4#)O9K&l6WmW8!Q~ z%yw9ac342t(g2N;has`Dvl?sT2>B9BPlnsvY(emU4S<06xIBQ(9%k-}Z*Mmp9){(f zAdQfSA>f=rIALXFjfjW7c zA<=Jh%e8*KJ)Q;oyNQLXNVkDz)-E@&f53%)jwfh5v(c6T0BFiyAfy%v^Qb&7e~BF) z)T%^h>M}a`N+q`V`IY&9Cqr`KDf=H*Fc|hMGn@FG7d+FdWL4Q*DAzk$ZT6(fd_e@6 znBinAM8nSYmag1ekLRnxiI4N;e-bEq?k24ck5#a^n<#mldWZpd$XOrkNcYp0pPSKH z#6nPIp~rd;5IKpZ4ydFjf;-@T0NmrcpFj)`v$j}Iz0oyNKC7FTZ+AC%C8R))Jiwm_!M<)>+F6Z7?!3@{;)n?c2pNJb^Jbb3@^!#8fNu1g z)BRsX-3d9}_21(%B?F^=>IiGG29C_&ury!D+vk6a$6oXjE1l5p@Fx0{mh{Z!dSF1G zAxKP150#T>V*0)5qKT~&+Y$)C!hKKLx>W#|NVX0r(I@6|4MWR|ZFRIddWrgdV4<%O zBjYk11Jui+()lW`&^OA*&G+zn%jrL2Ko5z~0ErNe-I^2(Y~t=9;o8^&&%o@>{#0%g z1VmY{=zN7X5KvT%h|9!4OUvr}gkeCKGqW*(!RG;pO!@h(g^pLGr~hWz@K=&}d0oPo zT@bvRYG#I|lY8@8nW>W1SSb+fJ6k6n-+X}^W|LOD{A5lK2wUtQY*R}|4_7Tt$%mhI zcIzaa<`Rh~JlA)G_k}e+fECIN<(@kD9IVPMW)a4;01$3D0nTKTI@+`g)wuGR0|NZH zw6qce-YVy-^cocf3w9ijc4{Oq6RhO4T85xjM5r-&3j%;p9ixwY*5g=m8rIx{ZogNE;pPa6X zQ%|z;L?eR_Dio6>omtFZ-RbGH*IT8Pl$VKKWgm38P@xbZdkT zZM}+8TMwgiWp($1-h=(%&QXay_#-Kbsb#TVOFR+(4<2XH1{>@Lj$kYt49iK3G^Wxo zUsCEV+1*d(JO;7ovFcDzz#K4-(kBHmaS1L}8Y?FHm5t8FN?kCLRG38?VqpOZWF(6I zqx)2l}lXt|IrZ~efZUal#K+mzM;F&~;)K}I5+3>t{ zW^*X8bfmIqrJ&0_jtbvCX=J~SDIY+Re;vu`XPj7 zcnLPj|H*c_imHj)@wI%=Iru3s6dY|NENRuJ3mI2K8dL{MSd8!!^ALUtqXCI?#P~BI zd;1@~yub~{0;(yvGIidAPfYrPLRxjP@oEpEsT)gTCxlg8Za$i+RKi67N?ei_#)*BU z=WpWVRqez8hD?{ko`Bpa2|FRarj&b7?sdIuO0vh-l#$U1Dtd+Y*^Oto2h;|~&9~vC zPgPY_Yq6=Vt*sIg5{~JP0PtNptE#hojaR9wEdOkueP&EYcne-86aGUs6*eR{MB+z^ zOG&e$1I8y>242p-cF@u#Tq76-&i`ER7-zle7nlJSG=v;aD!gAkI7-IC2x+ZYE(H6g z8G4L;zFN<-de{!uBnIX0c8;M~gfQ3DNpW*uh$gy#9>Qunsc$bTiCrz{%q5vCkuODX$IU5$I z(R=$fjfI4yES+7Q-6Guo5rURs4^}FGGJ--foI(;@6eI=1b+aQ1kLLvk&5dV51%Ra& zRo{7BVY}TBfSMz#vkBt$0VxfQCrj8Z>iW8Yff278IT=~=>bSoUSlHO>^J66*?(V*a zd81*dq&Qeu03d>9U*43=14gz*k{kv%Hw`sHR!{u%c%BC^^ABEMcVhJ>f8m=TD!GBq z1O|JIywmAkb{JJRxtMSu#clSwTpw~6J_$Ag!V7n++XFH7K+fO(PKq=N1k;5uD@~%a_=7*@AkRbdMtt~`te8MytD!`l1V!bR;Ogr_ee-FI_F&%F**#o;T-=X%1(dsCE4K zXlSt7PCxIir)UVkUkLg3M`F`2yl?RA&iy`}oMBhlANL+JtTowvVP)>)T9?X$5I#9F zsbcV%lr|<6fL5;1Qf~6|9ZsQ7?(XI?#CP5c-&=Kz`Svi7m%r&ru7|ARd0wVfD_UzJ ze*8;-O0z0iuT>QEIE73&gG|^ZScyVQi>{bu!)rOw_8r=IG<9d8GNfG7bb4CLjUyxB zW76BRX|{W;dlzNAJ>EOlZwcf6{myU_gj&yvxMwVTZBiULf{i zbvXmPSpncn+Ryb?>b}~+qY1qQnfKfw{6mWYHlSIkT}?)Ba2emgW}<+4AcK$wi=933zyu!F$nMYzs_>YX%81#|$A$YC z^Tf1x`1;lZV|AOo=u*(t^tizM{xy~Hi3|P<0N}|e=aoE`;44nP@|;#5cRSv?FL>$Z zj`jUMyBrG&Rl$T5X9XhGCX`DQCK#YCUCH44uCgaXrNp?cRldFPJ74@XdT@9d!v}<~ zum9Gt?AEZj457I^{zc`>7}3$5*3bZyT<+*J$(QQGWK*b@Y9QvNZNbV70F49%$ouQ` zxQ`3ubas~JkO4|eT1u<>{_iNMwE~kRvhD3w$aW9IW*gDN;WvH`z78ufdUhf}*o50;phCcsgkXa|X@(`9QFD&c8fb!1BrPVemVWxl61){|gx}Z67~t zIjeB+eQ+BLw^#D&-`X65umgDvwFi_-`I$F2z(}gUl(C!ojTQsLqTVm##EcFi+hW__ zUeHD0O53H)RnWoKI!{LKi>WC@fU~JYx0~?+g(E;RD094uh5Z%wqvv ze8gY)yc~Fc#p9@BF+Lyk79paBt_Dl4`WZIaqJ$LT#*Vk8FL5vxRz#%e>t0faUfwL1 zRswywG$+2KdJWP0zucDl_g?CrcPhe;ho(Xo%qDJZSzE_5o;e(k{m;(QZ%L4$5m?hz zs;R4}3z;3>E_X(2>HXQcI*cocDrtsr=7_ngwBs91?8Pwpp`8~o(|xnfcBkncRp8y8 zXI<+Lf08yh+b<3@(E!5EK4M)-aTI%ldU5o~Cl|-+I1R3ot(w8X1;Ypt;UFVLc0dZb zTiZqP%L)G)5!eJ35Dh8X$P~oTGIO7HS*@`&PXK3hLFwDPRh`76B@>qu&NW|ar zVl;&2@Kd738WRT_T%2rkI~;M&%b5YdZ&H6Jsu38(7Fmq>HqP>KrKe-EsNHHwvuEyZ zch)$Z{Q)7Vuk(+MfNEm4Egh$vFDwv}9)dwA3kHx(__UoZs1Y-w>gSgI*LeIR)sm?~ z+zFdEmJ6#d5P4zJk5QR~GU9zxa;1|71gb87bUu9;)8o3?|Fw*ZysCjhB}NSAvk1}2 zVR4@2w;L0{#M`nJMqhB*aOwY8ujMbK1l;b+Zf7)-JjYE(XA+(tOQR4;HCz2A!0+5I z3M{g!t=zlL;MJTrM8Lkv|fyRC_;!b2T%A&&67o^ELXGw58SyFNz7D54k9zd;)Li&-fcmShfTq?Yu11M{05~d$T!x6 z2B}PTskVJv9bKvp8(_$0bqsvKvKYrWTh70jm*sS!OmjLj%^B}30(WwNOk&dF{iTrqZ^)q`w6QEi zpr+cV9SiugVpjxM$dQVyXd!NJX<}|mEU*Y*8j~GqKGTzQJvS@aF$oc)?uQ|- zEgi$?SHhA+(^&=Yh~!(mL4nt5eAFefO0-aT`_?Pq){z!7O<#2V@mYo}T#Eee? ziya>zEWHw!U)+Glnim#TFvtx6c5_|v`}mvp7j_gUNZ@@GxpAhKYT*=&EZQKkl!4m9w zk^RFZe^|X)q^nZh$IbUyZR|7!8mZmS47@ur99CYRRZ16P%493(dOq`cZ8h3p5f&C;4Jy-rgB=8N+7lQ&f%@XQj*5Zd*7aUe|ll1!fjh;&v&| z%D?5|QEBWa)d+PZmARF1sMr{yA>X$&tKjd?rWGJWO-(~&Q{mqpgyxfJ_iBvQ(@CD0 zRq^rHxwtJqdx8m-;q&kcwa8Q^7~o~5aIsl1aSq}gPhD&`28d`aI&B7J>;vznC zpPh|+^l^tY)jx)~Nb_-w8 zZ902W@hz{L)U4r>9+_Z?D)-@XC6uFwEkgh3ar?f$=%nM#FbIFu_kFfmb#N?%*LPF} z^TENudy$fvdeY%p>GG^QwzI|GVZQ8fEKQloFs3Zi%k*j@tf(mH5C0&uPKWo;%Os7c z)*(UlvK@8TP+d3uYx%$49@l1)?+qS?!jr7IexGNd-`L~p*eC^v-$9PQV~N{vtp=tO zh`8j433RNBmvvRF#l^&+p`mH+JO!R`T@t_&(=|+_t3|`d<$55%!py0COD%}3g;8BA zLhMQRi4hSS4S>hM#H{yuy7mR#&#RUFc$g3$Q1MFFhIHj~cuZ7IGq=D^*IvyrGnUXn zv0%Vtv8iostVL7DDk$DhMSvdQnfNhMnY_H*lHRBmUMB03#Ez(>N7mfPy^|UU05yeP z`1nue;Jz`zl-L$BuX43D`Ms(PjUbl=`cb?Dvw^ z_sD_)C7oUZ?Q|J6Dz6YaQHPJ}^dDTKvX2PmNhnN2%V> z61L)V%ONu8#wSJK=??u_x%ld?pi`BQq9@0~OM9IB2alFfnLRo(Pp;yuQto@R=lEL6 zl-0_Vuo_uYV=cPzNp$k93MV56TXQYftRdem?NiUc+b4RwSGdNr>0M{jV)a|JulF5^ zDUHP@!V1yYQPkMRx*dzUGHQ7h`3z`4OOMFo zk_0e{BSC077BCCeiLp^ZA#^|PC60%J1tNFUe|*Ai9?r@YI)wt2fsRD|jCb`Mfx>HX<%obs z5HcZj7>Y4EIuJlj37^J{3ob6ay})9=M8j@P=3zLA_V!u5pbC*-EP4&Frgwv%X`R#g z?d8;~8U}O^5kLyw#e()>ddui;(GUvQ-MeMBs~-RjkuiocR5n1pcL$)dbgYPiIpn*u z2*WN0y?WSr2F5?X_|fBtW$jjrehOqh<+x_NBQO~g0P)k)`?ERCcH5s}6Dk;lvObDqyQGw9#%E0|3|V3~U&*G-y@Yrc-#s)q)o_u-YG7kFd+yx>2jwwxb`v1EP+pZzZ(cYFl{(9_pTg?4aS6HxWfG9 zYnz+XY}x3e%IYLl!J&Y)8)ktOH&q~Cf0eMOHlLjy=B5%7u zwmaag{*M9pl?VtE@$?YGH#r`%6(m5xDg_2sh>6~0S$8Osg17U(V>oO}E#IFny@J4# znk<$`L`GJmRLs;Q`uV<4R8(zua25iB^M`r{S$G*Vf<8^845gmJ8l9KvS}#jux^}M8 z&}W`xYY%GbiJ#k$(N-6Fl%L?FFs8>6W*uml^y(#AERb!@{@9Zti{_f_%T$3keDBR^ z1fVb6uG3u3Vq;?N=CMnrJ1odeSESpVsQoUI2h*0Vdo7RsQQ+Zbl+)(zS*A|k=DZuZ z=+88#-=0ePzgjvApg5vs4bK9>3GVI$T?p8u?ws!azyDnBLI7~Ipq>Z-TV)b|M2Z%0-mp#C{wh?Q{vzOB z+1Dk-g!elDsY-qK7*s#=>m>^`nHdpX$K8!Jy+ndy-YWCa$eERTEP&|!`>jlAP6!0H zGeRBDK}$>w_%1aBEj4t{&VuUq@miY<7hb*x*%&)246trp1Z#!^F1yjzLh(T$r+d$q zpub{zsCVnSDMP3B)6IeTH(-OK<|Xst4fm)%pe2|v$(%#GslL~t=#fy z?5}6eRt7bDXxgv(f?QfD)^H!z;oOGDA(7Y4Yc40V2%D+L3gaBr1_^i|os?VI^#Bp* zGVpQ0)-3nni>FW|B%s6uW+(DG*mRp9M2w70?~nk){b}_*yP%E@FLBfy)cEf!|9%W@ zJn4eXH+;n;Chuo$uCL6$(|(2oL4cSzW8K<>!^ID;i6yTO%Vc98wCdV0a~L_@?_JjYEzqouaX$C*(k{nI~nuF}*1L$fUAVp-!8!J}LoQUy{d+hO~8bGtSOnnD#N&arERk zc?2VqA|mpYzwB~Rcx{H$t9u6xe&yFXwykiHCcxuBz~oNOl;O zXY1=utI(h(k2T2i-JOMW2dAMY7kMWKTO(w!y1CmhY&L6CAW*8$fVn8(W!jCBaC$ZY z^)>rz%u)TSo~?cLddFA5zf0$KKX_1b|L6Xumz4L@ONfv^_^^8VQGn2_On{1+d4P{K zJUN14vGP^_;DpT~@+vZ@gFu@w+#=FK$)iA>7abyi*}Uk za?|rH?4zXDdX!J`45Yi^x7;Zc1zBl^0+LO#L~_P3d?l;%znW|KMOc_#r{%TEVoBy(p< z!Zo#7^gnMfn^9jgU{bJ(xG1>FZwo%$pluID@mflOV2?)a&Y2I^MJMKeE4k)ziw){z z_+UuCruHpcxu28ut%bsc`F!fR2@yn87!f7onj^M zl`#+0p=6%a!)JX-+G@xHPWfzmA6~AHh1o+JFo4^)JE`S^j%=)hUVYRd?rZwnQMq3% zgX`Sm65~vhzL+KD=ISSLTouM%e>1t7Un_FYHp?_-roqZ=t89Zq8+1H8J{%co@?oVa zX3EyeY(41}GxK@dxC(6?9XWAJWk`C|Ko~2Ryf}8a(k3BCnJ8aBT**~1#bFec(L|oH z!%{{#CDS^-B;-F{N7IOdp#D3j;FW*@Sj=r zV^AH8(|%zouyvuzv9Kt-xs%$oBA-mqY+bTT%})|mUbNk(J^Pz?&u{(v&)VH_&L&bhkvAg_n~ry5t#ZJ9gln zDhylm3mK8T2oEYyLwvm|W4&~BJV66kDbD>&V_hi1z6-q_7mN6;F~lNJX*#j9gZNRe zX?IwK#_Raz1y*xX$SU4LWJ!k$OPJvssiW@uL9AE;BKbg0ZnPTv%8rSHSTE5?J$0@U|BqlEuQp0s)cyUNU)F z-QV%?uAqv(*QL&OY4fJop7nKC6ZLk>Y_+tURR%CMPKK?1Mg zyXR4rWGXT$&wX5Q!5UimF&PnPGQT)`&|tkE9~ykW0@ILLTb;=wjhKV{X?0wRzg

    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! diff --git a/wiki/en/en-Installation-for-Android.md b/wiki/en/en-Installation-for-Android.md new file mode 100644 index 000000000..620c6bdbf --- /dev/null +++ b/wiki/en/en-Installation-for-Android.md @@ -0,0 +1,33 @@ +--- +layout: wiki +title: "Installation for Android" +lang: "en" +permalink: "/wiki/Installation-for-Android" +--- + +# Installation for Android + +Make sure you've already read the [Getting Started](Getting-Started) page. + +## Things to note about Android + +Although you **can** install Jamulus on Android devices (and hear sound), we strongly recommend **not** doing so. Sound quality - especially over WiFi - is usually bad and latency is high. If you have don't own a PC, we suggest you to buy a [Raspberry Pi](https://www.raspberrypi.org/){: target="_blank" rel="noopener noreferrer" } which is an inexpensive and small device that performs very well with Jamulus. + +## Install the Android beta + +If you do want to try Jamulus on Android: + +1. Allow the installation of apps from unknown sources (look in Settings>Security). +1. Download the APK from the [GitHub release page](https://github.com/corrados/jamulus/releases/tag/latest) +1. You should now be able to run Jamulus on your Android device + +## Beta feedback + +We are very happy to hear beta feedback from Android users and developers. Just head over to the [Jamulus GitHub repo](https://github.com/jamulussoftware/jamulus/). + +*** + +## All installed? +Jamulus has been installed and can be used now. You can now take a look at the + +[Jamulus Onboarding page](Onboarding){: .button} From ac3c20a5a24c70135e6090b667e8858aa050c47d Mon Sep 17 00:00:00 2001 From: dzpex <65598812+dzpex@users.noreply.github.com> Date: Sun, 14 Feb 2021 20:00:05 +0100 Subject: [PATCH 230/280] Update general.yml --- _data/it/general.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/_data/it/general.yml b/_data/it/general.yml index b47673975..78d90a047 100644 --- a/_data/it/general.yml +++ b/_data/it/general.yml @@ -11,3 +11,15 @@ nav: altJamulusIcon: "Icona di Jamulus. Links alla pagina di Wiki" wiki: titleAdd: "– Jamulus Wiki" +kb: + titleAdd: "– Le Basi di Jamulus" + by: "a cura della" + kbintro: "Community knowledge base
    Sentiti libero di aggiungere il tuo articolo!" + mainpage: "panuramica su KB" + newpage: "Aggiungi una nuova pagina tramite GitHub" + readmore: "Per saperne di più..." + navpages: "Più pagine" + discuss: + title: "Commenti" + linktitle: "Discuti questo contenuto" + From 02dde2cace6f304a42952f28f43e35ab9f958f76 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Sun, 14 Feb 2021 22:33:12 +0100 Subject: [PATCH 231/280] Change beta to PoC --- wiki/en/en-Getting-Started.md | 2 +- wiki/en/en-Installation-for-Android.md | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/wiki/en/en-Getting-Started.md b/wiki/en/en-Getting-Started.md index a61f4ca47..f8e2c7352 100644 --- a/wiki/en/en-Getting-Started.md +++ b/wiki/en/en-Getting-Started.md @@ -33,7 +33,7 @@ Now that you have the basics down, let's go: Install on Windows Install on macOS For Linux users - Install on Android (early beta) + Install on Android (PoC)
    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! diff --git a/wiki/en/en-Installation-for-Android.md b/wiki/en/en-Installation-for-Android.md index 620c6bdbf..cccd3246e 100644 --- a/wiki/en/en-Installation-for-Android.md +++ b/wiki/en/en-Installation-for-Android.md @@ -11,9 +11,9 @@ Make sure you've already read the [Getting Started](Getting-Started) page. ## Things to note about Android -Although you **can** install Jamulus on Android devices (and hear sound), we strongly recommend **not** doing so. Sound quality - especially over WiFi - is usually bad and latency is high. If you have don't own a PC, we suggest you to buy a [Raspberry Pi](https://www.raspberrypi.org/){: target="_blank" rel="noopener noreferrer" } which is an inexpensive and small device that performs very well with Jamulus. +Although you **can** install Jamulus on Android devices (and hear sound), we strongly recommend **not** doing so. Sound quality - especially over WiFi - is usually bad and latency is high. If you have don't own a PC, we suggest you to buy a [Raspberry Pi](https://www.raspberrypi.org/){: target="_blank" rel="noopener noreferrer" } which is an inexpensive and small device that performs very well with Jamulus. Android support is just a proof of concept. -## Install the Android beta +## Install the Android PoC If you do want to try Jamulus on Android: @@ -21,9 +21,9 @@ If you do want to try Jamulus on Android: 1. Download the APK from the [GitHub release page](https://github.com/corrados/jamulus/releases/tag/latest) 1. You should now be able to run Jamulus on your Android device -## Beta feedback +## Feedback and development -We are very happy to hear beta feedback from Android users and developers. Just head over to the [Jamulus GitHub repo](https://github.com/jamulussoftware/jamulus/). +We are very happy to get feedback from Android users and developers. Just head over to the [Jamulus GitHub repo](https://github.com/jamulussoftware/jamulus/). *** From 28e5e951f363c66e779f33be01db57f2581f9c7d Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Sun, 14 Feb 2021 22:35:19 +0100 Subject: [PATCH 232/280] Revert "Update" --- _data/it/general.yml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/_data/it/general.yml b/_data/it/general.yml index 78d90a047..b47673975 100644 --- a/_data/it/general.yml +++ b/_data/it/general.yml @@ -11,15 +11,3 @@ nav: altJamulusIcon: "Icona di Jamulus. Links alla pagina di Wiki" wiki: titleAdd: "– Jamulus Wiki" -kb: - titleAdd: "– Le Basi di Jamulus" - by: "a cura della" - kbintro: "Community knowledge base
    Sentiti libero di aggiungere il tuo articolo!" - mainpage: "panuramica su KB" - newpage: "Aggiungi una nuova pagina tramite GitHub" - readmore: "Per saperne di più..." - navpages: "Più pagine" - discuss: - title: "Commenti" - linktitle: "Discuti questo contenuto" - From 3ef957727ffaf639116dfcd85f69488a7d19d5ae Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Mon, 15 Feb 2021 08:03:46 +0100 Subject: [PATCH 233/280] Apply changes from review --- wiki/en/en-Installation-for-Android.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wiki/en/en-Installation-for-Android.md b/wiki/en/en-Installation-for-Android.md index cccd3246e..262238104 100644 --- a/wiki/en/en-Installation-for-Android.md +++ b/wiki/en/en-Installation-for-Android.md @@ -17,8 +17,8 @@ Although you **can** install Jamulus on Android devices (and hear sound), we str If you do want to try Jamulus on Android: -1. Allow the installation of apps from unknown sources (look in Settings>Security). -1. Download the APK from the [GitHub release page](https://github.com/corrados/jamulus/releases/tag/latest) +1. Allow the installation of apps from unknown sources (look in Settings>Security. Note: this can vary for device and OS-version) +1. Download and install the APK from the [GitHub release page](https://github.com/corrados/jamulus/releases/tag/latest) 1. You should now be able to run Jamulus on your Android device ## Feedback and development From 339d2d6456d6e8f7d68288fd4debb0d7a5f9b9b6 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Mon, 15 Feb 2021 08:06:24 +0100 Subject: [PATCH 234/280] Apply clarification --- wiki/en/en-Installation-for-Android.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/en/en-Installation-for-Android.md b/wiki/en/en-Installation-for-Android.md index 262238104..9b3a91c65 100644 --- a/wiki/en/en-Installation-for-Android.md +++ b/wiki/en/en-Installation-for-Android.md @@ -17,7 +17,7 @@ Although you **can** install Jamulus on Android devices (and hear sound), we str If you do want to try Jamulus on Android: -1. Allow the installation of apps from unknown sources (look in Settings>Security. Note: this can vary for device and OS-version) +1. Allow the installation of apps from unknown sources (look in Settings>Security. Note: The exact way to do this depends on your device and OS-version) 1. Download and install the APK from the [GitHub release page](https://github.com/corrados/jamulus/releases/tag/latest) 1. You should now be able to run Jamulus on your Android device From 57b5e5e98f2a647599f1971d984bd691dfd52613 Mon Sep 17 00:00:00 2001 From: ignotus Date: Mon, 15 Feb 2021 10:04:27 +0100 Subject: [PATCH 235/280] 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 236/280] 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 237/280] 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 238/280] 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 239/280] 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 240/280] 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 241/280] 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 242/280] 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 9b15fcc7acc65fdfcf7cf11a50fcd09e6527c8b8 Mon Sep 17 00:00:00 2001 From: Jonathan <4561747+gilgongo@users.noreply.github.com> Date: Mon, 15 Feb 2021 11:48:39 +0000 Subject: [PATCH 243/280] Better local monitoring test From [Chris Rimple](https://sourceforge.net/p/llcon/discussion/software/thread/166288d63e/#e047) --- wiki/en/en-Client-Troubleshooting.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/wiki/en/en-Client-Troubleshooting.md b/wiki/en/en-Client-Troubleshooting.md index 2ea5c8a17..aa2c03c04 100644 --- a/wiki/en/en-Client-Troubleshooting.md +++ b/wiki/en/en-Client-Troubleshooting.md @@ -18,13 +18,14 @@ 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. 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. Run Jamulus and connect to a server with a long ping time (greater than 200ms) +2. Clap your hands once (or play one short note on an instrument). You should hear the sound from the Jamulus server come back, but significantly delayed. +3. Click the "Mute" button under your Jamulus name/slider in the main Jamulus mixer window (**NOT** the "Mute Myself" button on the left). +4. Clap your hands again. -**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. +If you hear two claps after step 2, or any claps after step 4, then you are **not** obeying Rule Number One - you have your local audio enabled and should disable it. + +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. **If you are still having problems**, try asking on the [hardware forum](https://sourceforge.net/p/llcon/discussion/hardware/). Be aware that while listening to the server's signal will ensure you will be in sync with other musicians, you may also experience problems if your overall latency (indicated by the "Delay" light in Jamulus) is not green or at least yellow most of the time. Consult the [software manual](/wiki/Software-Manual) to understand how to adjust your setup to help with this. From bc788c5008e17c8e2aec90d16b7bf90a20259be4 Mon Sep 17 00:00:00 2001 From: ignotus Date: Mon, 15 Feb 2021 14:16:45 +0100 Subject: [PATCH 244/280] 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 245/280] 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 246/280] 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 247/280] 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 065bea72f4a3e4795eb14a0a7ec06ae069c4911e Mon Sep 17 00:00:00 2001 From: Jonathan <4561747+gilgongo@users.noreply.github.com> Date: Mon, 15 Feb 2021 17:06:22 +0000 Subject: [PATCH 248/280] Update en-Installation-for-Linux.md --- wiki/en/en-Installation-for-Linux.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/wiki/en/en-Installation-for-Linux.md b/wiki/en/en-Installation-for-Linux.md index 3463765c1..b71b65651 100644 --- a/wiki/en/en-Installation-for-Linux.md +++ b/wiki/en/en-Installation-for-Linux.md @@ -27,11 +27,11 @@ If you're on amd64 **Debian**/**Ubuntu**, you may try the compiled .deb packages 1. Install the package: `sudo dpkg -i /path/to/jamulus_latest_ubuntu_amd64.deb` and fix the dependencies with `sudo apt-get install -f`. 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` -**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 version you compiled from git which would use the upper case *J*! - Afterwards you should look at the "Set up your sound card" step on this page. -If you can't use one of these options, you need to compile Jamulus from source. That's quite easy: +--- + +If you can't use one of above options, you need to compile Jamulus from source: ## Get Jamulus sources @@ -88,6 +88,8 @@ sudo make install You can now delete the sources directory you compiled from. +--- + ## Set up your sound card ### Configure JACK with QjackCtl @@ -104,9 +106,9 @@ Restart JACK to take any new settings ### Start Jamulus -Open Jamulus e.g. via your command shell. If you use the shell and compiled Jamulus yourself, execute the command `Jamulus` (with a capital 'J') or if you used the .deb package with a lowercase j. This will start the Jamulus Client. +From the command line, execute the command `jamulus`, or if you compiled from source `Jamulus` with a (with a capital 'J'). This will start the Jamulus Client. -If you get problems with sound breaking up (in particular XRUN errors reported by JACK/QjackCtl) try setting bigger values (e.g. 256 frames or 3 periods) in step 3 above. Lower ones (e.g. 64 frames) could bring better performance but maybe more sound problems. See the [troubleshooting page](Client-Troubleshooting) otherwise. +If you get problems with sound breaking up (in particular XRUN errors reported by JACK/QjackCtl) try setting bigger values (e.g. 256 frames or 3 periods). Lower ones (e.g. 64 frames) could bring better performance but maybe more sound problems. See the [troubleshooting page](Client-Troubleshooting) otherwise. ## All installed? From a08203060d9af332d7d710691228136a3f89d2cd Mon Sep 17 00:00:00 2001 From: ignotus Date: Mon, 15 Feb 2021 22:09:30 +0100 Subject: [PATCH 249/280] 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 ebad275405b0236c926dab136a51461f2cdd4add Mon Sep 17 00:00:00 2001 From: Jonathan <4561747+gilgongo@users.noreply.github.com> Date: Mon, 15 Feb 2021 21:09:46 +0000 Subject: [PATCH 250/280] Link --serverpublicip desc. to docs (#290) * Link --serverpublicip desc. to docs As per https://github.com/jamulussoftware/jamulus/pull/954#issuecomment-775757311 * 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 468524285..a65cedad5 100644 --- a/wiki/en/en-Command-Line-Options.md +++ b/wiki/en/en-Command-Line-Options.md @@ -52,4 +52,4 @@ You can see all possible options your version supports by starting Jamulus with | `-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) | | |`--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) | +| |`--serverpublicip` | Supply the server's public IP address | (server only) [See note](Choosing-a-Server-Type) | From 9b29c60b1edad6244e7b5c054552f7e86ab7a837 Mon Sep 17 00:00:00 2001 From: ignotus Date: Mon, 15 Feb 2021 22:10:17 +0100 Subject: [PATCH 251/280] 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 252/280] 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 253/280] 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 254/280] 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 255/280] 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 256/280] 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 8564c184853dc0c4b6d98e7ed4cb8fe17adf6238 Mon Sep 17 00:00:00 2001 From: Jonathan <4561747+gilgongo@users.noreply.github.com> Date: Tue, 16 Feb 2021 17:28:38 +0000 Subject: [PATCH 257/280] Remove donation implication Also BE spelling for licence --- _includes/wiki/en/footertext.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/wiki/en/footertext.md b/_includes/wiki/en/footertext.md index 676bfa742..f33023a1c 100644 --- a/_includes/wiki/en/footertext.md +++ b/_includes/wiki/en/footertext.md @@ -3,4 +3,4 @@ **Tell us about Jamulus - [take our anonymous survey!](https://forms.gle/hSSjsxjWj2Pnp5kr7)** -_This documentation is licensed under a [Creative Commons License](https://creativecommons.org/licenses/by-sa/4.0/deed.en){: target="_blank" rel="noreferrer" }. Want to [contribute](Contribution)?_ +_This documentation is licensed under a [Creative Commons Licence](https://creativecommons.org/licenses/by-sa/4.0/deed.en){: target="_blank" rel="noreferrer" }. Want to [get involved](Contribution)?_ From f124d666d8f7a0bdb48f5ea7cbad4b0e55dc87ed Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Tue, 16 Feb 2021 19:13:55 +0100 Subject: [PATCH 258/280] Install deb via apt --- 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 b71b65651..37860d106 100644 --- a/wiki/en/en-Installation-for-Linux.md +++ b/wiki/en/en-Installation-for-Linux.md @@ -24,7 +24,7 @@ If you're on amd64 **Debian**/**Ubuntu**, you may try the compiled .deb packages 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` and fix the dependencies with `sudo apt-get install -f`. +1. Install the package: `sudo apt install /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` Afterwards you should look at the "Set up your sound card" step on this page. From 3b950df84031812a80f8aa4cd1cf4c59992bc33a Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Tue, 16 Feb 2021 19:38:21 +0100 Subject: [PATCH 259/280] Add flatpak and other instructions --- wiki/en/en-Installation-for-Linux.md | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/wiki/en/en-Installation-for-Linux.md b/wiki/en/en-Installation-for-Linux.md index 37860d106..915870de9 100644 --- a/wiki/en/en-Installation-for-Linux.md +++ b/wiki/en/en-Installation-for-Linux.md @@ -16,11 +16,15 @@ Although we don't provide official packages for every Linux distribution, you mi There is also list of unofficial [packages for different distributions here](https://github.com/jamulussoftware/jamulus/discussions/914). +### Flatpak + +Jamulus is available as a [Flatpak](https://flatpak.org/) from [Flathub here](https://flathub.org/apps/details/io.jamulus.Jamulus). You will need to setup pipewire in order to use the Jamulus flatpak. + ### Debian and Ubuntu Jamulus (with GUI) is will be [included in Debian Bullseye (testing)](https://packages.debian.org/bullseye/jamulus) thanks to [mirabilos](https://github.com/mirabilos). If you already use Bullseye, just install Jamulus via `sudo apt-get install jamulus`. -If you're on amd64 **Debian**/**Ubuntu**, you may try the compiled .deb packages from GitHub Actions. +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/jamulussoftware/jamulus/releases/tag/latest) page 1. Update apt: `sudo apt-get update` @@ -33,17 +37,19 @@ Afterwards you should look at the "Set up your sound card" step on this page. If you can't use one of above options, you need to compile Jamulus from source: -## Get Jamulus sources +## Compile from source + +### Get Jamulus sources 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/jamulussoftware/jamulus/archive/latest.tar.gz tar -xvf latest.tar.gz ``` -## Install dependencies +### Install dependencies First, update your package list (e.g. on Debian based distributions with `sudo apt-get update`). @@ -69,7 +75,7 @@ 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`). -## Compile this bad boy +### Compile this bad boy Now `cd` into the jamulus sources directory you downloaded: From 7cc660d5befe3ec0c623cc10c105a79b6e2e5d2c Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Tue, 16 Feb 2021 19:40:14 +0100 Subject: [PATCH 260/280] Move debian testing down --- 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 915870de9..db712b8da 100644 --- a/wiki/en/en-Installation-for-Linux.md +++ b/wiki/en/en-Installation-for-Linux.md @@ -22,8 +22,6 @@ Jamulus is available as a [Flatpak](https://flatpak.org/) from [Flathub here](ht ### Debian and Ubuntu -Jamulus (with GUI) is will be [included in Debian Bullseye (testing)](https://packages.debian.org/bullseye/jamulus) thanks to [mirabilos](https://github.com/mirabilos). If you already use Bullseye, just install Jamulus via `sudo apt-get install jamulus`. - 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/jamulussoftware/jamulus/releases/tag/latest) page @@ -33,6 +31,8 @@ If you're on amd64 **Debian**/**Ubuntu**, you may try the compiled .deb packages Afterwards you should look at the "Set up your sound card" step on this page. +**Note:** Jamulus (with GUI) is will be [included in Debian Bullseye (testing)](https://packages.debian.org/bullseye/jamulus) thanks to [mirabilos](https://github.com/mirabilos). If you already use Bullseye, just install Jamulus via `sudo apt-get install jamulus`. + --- If you can't use one of above options, you need to compile Jamulus from source: From aa77595f520c56e5331ff772c64d892a4c793002 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Tue, 16 Feb 2021 19:41:17 +0100 Subject: [PATCH 261/280] Add jump marker --- 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 db712b8da..19dd13c72 100644 --- a/wiki/en/en-Installation-for-Linux.md +++ b/wiki/en/en-Installation-for-Linux.md @@ -29,7 +29,7 @@ If you're on amd64 **Debian**/**Ubuntu**, you may try the compiled .deb packages 1. Install the package: `sudo apt install /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` -Afterwards you should look at the "Set up your sound card" step on this page. +Afterwards you should look at the "[Set up your sound card](#set-up-your-sound-card)" step on this page. **Note:** Jamulus (with GUI) is will be [included in Debian Bullseye (testing)](https://packages.debian.org/bullseye/jamulus) thanks to [mirabilos](https://github.com/mirabilos). If you already use Bullseye, just install Jamulus via `sudo apt-get install jamulus`. From 4eb53b21fa8e066a8790dd72655432af9edef80a Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Tue, 16 Feb 2021 19:55:23 +0100 Subject: [PATCH 262/280] Add headless server .deb instruction --- wiki/en/en-Server-Linux.md | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/wiki/en/en-Server-Linux.md b/wiki/en/en-Server-Linux.md index 1e059dc6e..7c700b921 100644 --- a/wiki/en/en-Server-Linux.md +++ b/wiki/en/en-Server-Linux.md @@ -30,6 +30,18 @@ The following guide is for running Jamulus as a "pure" server on **hardware with * _Jamulus user [Grigory](https://sourceforge.net/u/cidnurg/profile/) maintains a **[Docker image for Jamulus](https://hub.docker.com/r/grundic/jamulus)** which you can use._ +### Use the official Debian/Ubuntu headless .deb files + +If you're on amd64 Debian/Ubuntu, you may try the compiled .deb packages from GitHub Actions: + +1. Download the `jamulus_headless_latest_ubuntu_amd64.deb` file from the Jamulus [GitHub release page](https://github.com/jamulussoftware/jamulus/releases/tag/latest) +1. Update apt: `sudo apt update` +1. Install the package: `sudo apt install /path/to/jamulus_headless_latest_ubuntu_amd64.deb` +1. Enable the headless server via systemd: `sudo systemctl enable jamulus-headless` + +You should now be running a private server! + +**Note:** To configure the server, you can add command line flags to the file `/lib/systemd/system/jamulus-headless.service` e.g. make this a public server. Have a look at the [CLI page](Command-Line-Options). ### Compile sources, create a user @@ -143,7 +155,7 @@ Note: Press `q` to exit the service status. ### To update your installation to a new release -Download the new sources as per the [instructions above](Server-Linux#compile-sources-create-a-user) and repeat the compilation in step 2 as if for a new installation. Shut down the server, copy the Jamulus binary over the old one and start it back up. +Download the new sources as per the [instructions above](Server-Linux#compile-sources-create-a-user) and repeat the compilation in step 2 as if for a new installation or just install the new headless .deb files. If you compiled Jamulus from source, shut down the server, copy the Jamulus binary over the old one and start it back up. *** From 45cc757267482c05efe70e635998b4f06406beb4 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Tue, 16 Feb 2021 20:00:46 +0100 Subject: [PATCH 263/280] Add link to deb file --- 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 19dd13c72..c1e59975f 100644 --- a/wiki/en/en-Installation-for-Linux.md +++ b/wiki/en/en-Installation-for-Linux.md @@ -24,7 +24,7 @@ Jamulus is available as a [Flatpak](https://flatpak.org/) from [Flathub here](ht 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/jamulussoftware/jamulus/releases/tag/latest) page +1. Download the [jamulus_latest_ubuntu_amd64.deb](https://github.com/jamulussoftware/jamulus/releases/download/latest/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 apt install /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` From 68cb945ae64fa04b85dee570bda609d14108c122 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Tue, 16 Feb 2021 20:02:39 +0100 Subject: [PATCH 264/280] Add direct link to deb file --- 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 7c700b921..5300be2cd 100644 --- a/wiki/en/en-Server-Linux.md +++ b/wiki/en/en-Server-Linux.md @@ -34,7 +34,7 @@ The following guide is for running Jamulus as a "pure" server on **hardware with If you're on amd64 Debian/Ubuntu, you may try the compiled .deb packages from GitHub Actions: -1. Download the `jamulus_headless_latest_ubuntu_amd64.deb` file from the Jamulus [GitHub release page](https://github.com/jamulussoftware/jamulus/releases/tag/latest) +1. Download the [jamulus_headless_latest_ubuntu_amd64.deb](https://github.com/jamulussoftware/jamulus/releases/download/latest/jamulus_headless_latest_ubuntu_amd64.deb) file from the Jamulus [GitHub release page](https://github.com/jamulussoftware/jamulus/releases/tag/latest) 1. Update apt: `sudo apt update` 1. Install the package: `sudo apt install /path/to/jamulus_headless_latest_ubuntu_amd64.deb` 1. Enable the headless server via systemd: `sudo systemctl enable jamulus-headless` From e6ffbc008a756491f155321eb4319110b6f51daa Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Tue, 16 Feb 2021 20:05:57 +0100 Subject: [PATCH 265/280] Add configuration of headless server --- wiki/en/en-Server-Linux.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/wiki/en/en-Server-Linux.md b/wiki/en/en-Server-Linux.md index 5300be2cd..ed0aa28b5 100644 --- a/wiki/en/en-Server-Linux.md +++ b/wiki/en/en-Server-Linux.md @@ -38,10 +38,12 @@ If you're on amd64 Debian/Ubuntu, you may try the compiled .deb packages from Gi 1. Update apt: `sudo apt update` 1. Install the package: `sudo apt install /path/to/jamulus_headless_latest_ubuntu_amd64.deb` 1. Enable the headless server via systemd: `sudo systemctl enable jamulus-headless` +1. Add the required [command line options](Command-Line-Options) to the systemd service file in `/lib/systemd/system/jamulus-headless.service`. +1. Restart the headless server: `sudo systemctl restart jamulus-headless` You should now be running a private server! -**Note:** To configure the server, you can add command line flags to the file `/lib/systemd/system/jamulus-headless.service` e.g. make this a public server. Have a look at the [CLI page](Command-Line-Options). +**Note:** To configure the server, you can add command line flags to the file `/lib/systemd/system/jamulus-headless.service` e.g. make this a public server. Have a look at the [Command Line Options](Command-Line-Options) page. ### Compile sources, create a user From 429fed6aa910793f893d6785c8cfcafbf0ba2126 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Tue, 16 Feb 2021 20:08:29 +0100 Subject: [PATCH 266/280] Add daemon-reload --- 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 ed0aa28b5..53331e473 100644 --- a/wiki/en/en-Server-Linux.md +++ b/wiki/en/en-Server-Linux.md @@ -39,7 +39,7 @@ If you're on amd64 Debian/Ubuntu, you may try the compiled .deb packages from Gi 1. Install the package: `sudo apt install /path/to/jamulus_headless_latest_ubuntu_amd64.deb` 1. Enable the headless server via systemd: `sudo systemctl enable jamulus-headless` 1. Add the required [command line options](Command-Line-Options) to the systemd service file in `/lib/systemd/system/jamulus-headless.service`. -1. Restart the headless server: `sudo systemctl restart jamulus-headless` +1. Reload systemd files `sudo systemctl daemon-reload` and restart the headless server: `sudo systemctl restart jamulus-headless` You should now be running a private server! From 6da4947bb42ea4556a59b25b1442c9ccb05e4988 Mon Sep 17 00:00:00 2001 From: Jonathan <4561747+gilgongo@users.noreply.github.com> Date: Tue, 16 Feb 2021 20:00:30 +0000 Subject: [PATCH 267/280] Breadcrumb (#306) * Add breadcrumb style * Create breadcrumb.html * Update breadcrumb.html * Update en-Central-Servers.md * Update en-Choosing-a-Server-Type.md * Update en-Installation-for-Windows.md * Update en-Installation-for-Macintosh.md * Update en-Installation-for-Linux.md * Update en-Hardware-Setup.md * Update en-Running-a-Private-Server.md * Update en-Server-Linux.md * Update en-Server-Troubleshooting.md * Update en-Server-Win-Mac.md --- _includes/breadcrumb.html | 14 ++++++++++++++ assets/css/wiki.css | 5 +++++ wiki/en/en-Central-Servers.md | 2 ++ wiki/en/en-Choosing-a-Server-Type.md | 2 ++ wiki/en/en-Hardware-Setup.md | 2 ++ wiki/en/en-Installation-for-Linux.md | 2 ++ wiki/en/en-Installation-for-Macintosh.md | 2 ++ wiki/en/en-Installation-for-Windows.md | 2 ++ wiki/en/en-Running-a-Private-Server.md | 2 ++ wiki/en/en-Server-Linux.md | 2 ++ wiki/en/en-Server-Troubleshooting.md | 2 ++ wiki/en/en-Server-Win-Mac.md | 2 ++ 12 files changed, 39 insertions(+) create mode 100644 _includes/breadcrumb.html diff --git a/_includes/breadcrumb.html b/_includes/breadcrumb.html new file mode 100644 index 000000000..fd0bc6c81 --- /dev/null +++ b/_includes/breadcrumb.html @@ -0,0 +1,14 @@ + diff --git a/assets/css/wiki.css b/assets/css/wiki.css index 625f5b76b..9c0079a41 100644 --- a/assets/css/wiki.css +++ b/assets/css/wiki.css @@ -29,6 +29,11 @@ padding: 20px; } +.wikisite #breadcrumb { + line-height: 90%; + font-size: 0.90em; +} + .wikisite .button-container { margin: .25em 0; } diff --git a/wiki/en/en-Central-Servers.md b/wiki/en/en-Central-Servers.md index 55756bd32..e398b1c6c 100644 --- a/wiki/en/en-Central-Servers.md +++ b/wiki/en/en-Central-Servers.md @@ -5,6 +5,8 @@ lang: "en" permalink: "/wiki/Central-Servers" --- +{% include breadcrumb.html root="More" branch1="Running a Server" branch1-url="Running-a-Server" %} + # Public Server Registration 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). diff --git a/wiki/en/en-Choosing-a-Server-Type.md b/wiki/en/en-Choosing-a-Server-Type.md index 313566915..be890de0f 100644 --- a/wiki/en/en-Choosing-a-Server-Type.md +++ b/wiki/en/en-Choosing-a-Server-Type.md @@ -5,6 +5,8 @@ lang: "en" permalink: "/wiki/Choosing-a-Server-Type" --- +{% include breadcrumb.html root="More" branch1="Running a Server" branch1-url="Running-a-Server" %} + # Server Types You can run your server in one of three "modes" (either at home or on a 3rd party host): diff --git a/wiki/en/en-Hardware-Setup.md b/wiki/en/en-Hardware-Setup.md index b3484d188..ffaf8ca6b 100644 --- a/wiki/en/en-Hardware-Setup.md +++ b/wiki/en/en-Hardware-Setup.md @@ -5,6 +5,8 @@ lang: "en" permalink: "/wiki/Hardware-Setup" --- +{% include breadcrumb.html root="Using Jamulus" branch1="Getting Started" branch1-url="Getting-Started" %} + # Hardware Setup ## General info diff --git a/wiki/en/en-Installation-for-Linux.md b/wiki/en/en-Installation-for-Linux.md index 95600047d..272977f6b 100644 --- a/wiki/en/en-Installation-for-Linux.md +++ b/wiki/en/en-Installation-for-Linux.md @@ -5,6 +5,8 @@ lang: "en" permalink: "/wiki/Installation-for-Linux" --- +{% include breadcrumb.html root="Using Jamulus" branch1="Getting Started" branch1-url="Getting-Started" %} + # Installation for Linux Make sure you read the [Getting Started](Getting-Started) page. diff --git a/wiki/en/en-Installation-for-Macintosh.md b/wiki/en/en-Installation-for-Macintosh.md index 104d7e925..591b3bf81 100644 --- a/wiki/en/en-Installation-for-Macintosh.md +++ b/wiki/en/en-Installation-for-Macintosh.md @@ -5,6 +5,8 @@ lang: "en" permalink: "/wiki/Installation-for-Macintosh" --- +{% include breadcrumb.html root="Using Jamulus" branch1="Getting Started" branch1-url="Getting-Started" %} + # Installation for macOS Make sure you've already read the [Getting Started](Getting-Started) page. diff --git a/wiki/en/en-Installation-for-Windows.md b/wiki/en/en-Installation-for-Windows.md index eb3789b22..a66bf3a17 100644 --- a/wiki/en/en-Installation-for-Windows.md +++ b/wiki/en/en-Installation-for-Windows.md @@ -5,6 +5,8 @@ lang: "en" permalink: "/wiki/Installation-for-Windows" --- +{% include breadcrumb.html root="Using Jamulus" branch1="Getting Started" branch1-url="Getting-Started" %} + # 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 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. diff --git a/wiki/en/en-Running-a-Private-Server.md b/wiki/en/en-Running-a-Private-Server.md index f189ad78e..814dbb7e4 100644 --- a/wiki/en/en-Running-a-Private-Server.md +++ b/wiki/en/en-Running-a-Private-Server.md @@ -5,6 +5,8 @@ lang: "en" permalink: "/wiki/Running-a-Private-Server" --- +{% include breadcrumb.html root="Using Jamulus" branch1="Running a Server" branch1-url="Running-a-Server" %} + # Running a Private Server **_Please ensure you have read the [server overview](Running-a-Server)_** diff --git a/wiki/en/en-Server-Linux.md b/wiki/en/en-Server-Linux.md index 1e059dc6e..0bb791547 100644 --- a/wiki/en/en-Server-Linux.md +++ b/wiki/en/en-Server-Linux.md @@ -5,6 +5,8 @@ lang: "en" permalink: "/wiki/Server-Linux" --- +{% include breadcrumb.html root="Using Jamulus" branch1="Running a Server" branch1-url="Running-a-Server" %} + # Server Installation - Linux diff --git a/wiki/en/en-Server-Troubleshooting.md b/wiki/en/en-Server-Troubleshooting.md index a36e11564..94b6814f6 100644 --- a/wiki/en/en-Server-Troubleshooting.md +++ b/wiki/en/en-Server-Troubleshooting.md @@ -5,6 +5,8 @@ lang: "en" permalink: "/wiki/Server-Troubleshooting" --- +{% include breadcrumb.html root="Using Jamulus" branch1="Running a Server" branch1-url="Running-a-Server" %} + # Troubleshooting ## Servers - Public diff --git a/wiki/en/en-Server-Win-Mac.md b/wiki/en/en-Server-Win-Mac.md index a90358afe..a7344b330 100644 --- a/wiki/en/en-Server-Win-Mac.md +++ b/wiki/en/en-Server-Win-Mac.md @@ -5,6 +5,8 @@ lang: "en" permalink: "/wiki/Server-Win-Mac" --- +{% include breadcrumb.html root="Using Jamulus" branch1="Running a Server" branch1-url="Running-a-Server" %} + # Installation for Windows and macOS From 6bdc707bff30d2cb86dbb9a33e504d3d161e07c6 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Wed, 17 Feb 2021 13:15:59 +0100 Subject: [PATCH 268/280] is will be -> is --- 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 c1e59975f..e2d5b4c7b 100644 --- a/wiki/en/en-Installation-for-Linux.md +++ b/wiki/en/en-Installation-for-Linux.md @@ -31,7 +31,7 @@ If you're on amd64 **Debian**/**Ubuntu**, you may try the compiled .deb packages Afterwards you should look at the "[Set up your sound card](#set-up-your-sound-card)" step on this page. -**Note:** Jamulus (with GUI) is will be [included in Debian Bullseye (testing)](https://packages.debian.org/bullseye/jamulus) thanks to [mirabilos](https://github.com/mirabilos). If you already use Bullseye, just install Jamulus via `sudo apt-get install jamulus`. +**Note:** Jamulus (with GUI) is [included in Debian Bullseye (testing)](https://packages.debian.org/bullseye/jamulus) thanks to [mirabilos](https://github.com/mirabilos). If you already use Bullseye, just install Jamulus via `sudo apt-get install jamulus`. --- From eb92cc27ea55ee4b2189bcf9a29c158f092f87f7 Mon Sep 17 00:00:00 2001 From: ignotus Date: Wed, 17 Feb 2021 14:02:35 +0100 Subject: [PATCH 269/280] 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'` From 7b2e7582597adac812251151c14edf567746f5c3 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Wed, 17 Feb 2021 17:29:18 +0100 Subject: [PATCH 270/280] Fix grammar mistake --- 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 e2d5b4c7b..14ed3e018 100644 --- a/wiki/en/en-Installation-for-Linux.md +++ b/wiki/en/en-Installation-for-Linux.md @@ -35,7 +35,7 @@ Afterwards you should look at the "[Set up your sound card](#set-up-your-sound-c --- -If you can't use one of above options, you need to compile Jamulus from source: +If you can't use one of the above options, you need to compile Jamulus from source: ## Compile from source From 42d01b0390fa2836301829e52a80b2dd87325dd3 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Wed, 17 Feb 2021 17:38:19 +0100 Subject: [PATCH 271/280] Change quoting @gilgongo could you please verify if this works as expected? --- _includes/screenshot.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/screenshot.html b/_includes/screenshot.html index 0bf580717..1ad914221 100644 --- a/_includes/screenshot.html +++ b/_includes/screenshot.html @@ -1,4 +1,4 @@
    - {{ include.alt | default: + {{ include.alt | default: 'Screenshot' }}
    {{ include.caption }}
    From 7a028400cb2fb5bb0da74d2459058dce8983667c Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Wed, 17 Feb 2021 17:40:50 +0100 Subject: [PATCH 272/280] Update link --- _config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index 95662eba3..7f5f69380 100644 --- a/_config.yml +++ b/_config.yml @@ -7,7 +7,7 @@ default_lang: "en" exclude_from_localization: ["assets", "images", "css", "README.md", "manifest.json", "humans.txt", "sitemap.xml"] parallel_localization: true a_rootpage: "https://jamulus.io" -githubrepoeditbase: "https://github.com/jamulussoftware/jamulussoftware.github.io/edit/changes" +githubrepoeditbase: "https://github.com/jamulussoftware/jamuluswebsite/edit/changes" kbnewpage: 'https://github.com/jamulussoftware/jamuluswebsite/new/changes/_posts/?value=---%0Alayout%3A%20post%0Atitle%3A%20%22Your%20Title%22%0Alang%3A%20%22en%22%0Aauthor%3A%20%22YourName%22%0Aheading%3A%20%22Heading%22%0A---%0AName%20This%20File%20and%20edit%20the%20parameters%20above%21&message=New%20post' exclude: ["README.md", "Gemfile.lock", "Gemfile", "CONTRIBUTING.md"] jekyll-minifier: From cd9cea2c9b633ed7472d5d967b49e585b39e3c1f Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Wed, 17 Feb 2021 18:07:53 +0100 Subject: [PATCH 273/280] Add binary links via config.yml file --- _config.yml | 10 ++++++++++ wiki/en/en-Installation-for-Android.md | 2 +- wiki/en/en-Installation-for-Linux.md | 6 +++--- wiki/en/en-Installation-for-Macintosh.md | 3 ++- wiki/en/en-Installation-for-Windows.md | 3 ++- 5 files changed, 18 insertions(+), 6 deletions(-) diff --git a/_config.yml b/_config.yml index 95662eba3..a14850c2a 100644 --- a/_config.yml +++ b/_config.yml @@ -7,6 +7,16 @@ default_lang: "en" exclude_from_localization: ["assets", "images", "css", "README.md", "manifest.json", "humans.txt", "sitemap.xml"] parallel_localization: true a_rootpage: "https://jamulus.io" + +# Jamulus release binary links +download_root_link: "https://github.com/jamulussoftware/jamulus/releases/download/r3_7_0/" +download_file_names: + deb-gui: "jamulus_3.7.0_ubuntu_amd64.deb" + deb-headless: "jamulus_headless_3.7.0_ubuntu_amd64.deb" + windows: "jamulus_3.7.0_win.exe" + mac: "jamulus_3.7.0_mac.dmg" + android: "jamulus_3.7.0_android.apk" + githubrepoeditbase: "https://github.com/jamulussoftware/jamulussoftware.github.io/edit/changes" kbnewpage: 'https://github.com/jamulussoftware/jamuluswebsite/new/changes/_posts/?value=---%0Alayout%3A%20post%0Atitle%3A%20%22Your%20Title%22%0Alang%3A%20%22en%22%0Aauthor%3A%20%22YourName%22%0Aheading%3A%20%22Heading%22%0A---%0AName%20This%20File%20and%20edit%20the%20parameters%20above%21&message=New%20post' exclude: ["README.md", "Gemfile.lock", "Gemfile", "CONTRIBUTING.md"] diff --git a/wiki/en/en-Installation-for-Android.md b/wiki/en/en-Installation-for-Android.md index 9b3a91c65..fc1ec247b 100644 --- a/wiki/en/en-Installation-for-Android.md +++ b/wiki/en/en-Installation-for-Android.md @@ -18,7 +18,7 @@ Although you **can** install Jamulus on Android devices (and hear sound), we str If you do want to try Jamulus on Android: 1. Allow the installation of apps from unknown sources (look in Settings>Security. Note: The exact way to do this depends on your device and OS-version) -1. Download and install the APK from the [GitHub release page](https://github.com/corrados/jamulus/releases/tag/latest) +1. [Download and install Jamulus]({{ site.download_root_link }}{{ site.download_file_names.android }}){: .button} 1. You should now be able to run Jamulus on your Android device ## Feedback and development diff --git a/wiki/en/en-Installation-for-Linux.md b/wiki/en/en-Installation-for-Linux.md index b320cae45..516e815c4 100644 --- a/wiki/en/en-Installation-for-Linux.md +++ b/wiki/en/en-Installation-for-Linux.md @@ -26,9 +26,9 @@ Jamulus is available as a [Flatpak](https://flatpak.org/) from [Flathub here](ht 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](https://github.com/jamulussoftware/jamulus/releases/download/latest/jamulus_latest_ubuntu_amd64.deb) file from the [Jamulus GitHub release](https://github.com/jamulussoftware/jamulus/releases/tag/latest) page +1. Download the [latest .deb file]({{ site.download_root_link }}{{ site.download_file_names.deb-gui }}) 1. Update apt: `sudo apt-get update` -1. Install the package: `sudo apt install /path/to/jamulus_latest_ubuntu_amd64.deb`. +1. Install the package: `sudo apt install /path/to/{{ site.download_file_names.deb-gui }}`. 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` Afterwards you should look at the "[Set up your sound card](#set-up-your-sound-card)" step on this page. @@ -92,7 +92,7 @@ make clean make sudo make install ``` -**Note:** The compiled version of Jamulus puts itself into `/usr/local/bin`. +**Note:** The compiled version of Jamulus puts itself into `/usr/local/bin`. You can now delete the sources directory you compiled from. diff --git a/wiki/en/en-Installation-for-Macintosh.md b/wiki/en/en-Installation-for-Macintosh.md index 591b3bf81..9af21741c 100644 --- a/wiki/en/en-Installation-for-Macintosh.md +++ b/wiki/en/en-Installation-for-Macintosh.md @@ -11,7 +11,8 @@ 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. [Download Jamulus]({{ site.download_root_link }}{{ site.download_file_names.mac }}){: .button}\\ +**Mirror 2:** [SourceForge](https://sourceforge.net/projects/llcon/files/latest/download) 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. diff --git a/wiki/en/en-Installation-for-Windows.md b/wiki/en/en-Installation-for-Windows.md index a66bf3a17..601687824 100644 --- a/wiki/en/en-Installation-for-Windows.md +++ b/wiki/en/en-Installation-for-Windows.md @@ -10,7 +10,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 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. [Download Jamulus]({{ site.download_root_link }}{{ site.download_file_names.windows }}){: .button}\\ +**Mirror 2:** [SourceForge](https://sourceforge.net/projects/llcon/files/latest/download) 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). From 8a99129eb318a7c4547e682a7795f9b8792e261f Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Wed, 17 Feb 2021 18:09:46 +0100 Subject: [PATCH 274/280] Add link to headless deb on server page --- wiki/en/en-Server-Linux.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wiki/en/en-Server-Linux.md b/wiki/en/en-Server-Linux.md index 928d87837..f4db4c9ab 100644 --- a/wiki/en/en-Server-Linux.md +++ b/wiki/en/en-Server-Linux.md @@ -36,9 +36,9 @@ The following guide is for running Jamulus as a "pure" server on **hardware with If you're on amd64 Debian/Ubuntu, you may try the compiled .deb packages from GitHub Actions: -1. Download the [jamulus_headless_latest_ubuntu_amd64.deb](https://github.com/jamulussoftware/jamulus/releases/download/latest/jamulus_headless_latest_ubuntu_amd64.deb) file from the Jamulus [GitHub release page](https://github.com/jamulussoftware/jamulus/releases/tag/latest) +1. Download the [latest headless .deb file]({{ site.download_root_link }}{{ site.download_file_names.deb-headless }}) 1. Update apt: `sudo apt update` -1. Install the package: `sudo apt install /path/to/jamulus_headless_latest_ubuntu_amd64.deb` +1. Install the package: `sudo apt install /path/to/{{ site.download_file_names.deb-gui }}` 1. Enable the headless server via systemd: `sudo systemctl enable jamulus-headless` 1. Add the required [command line options](Command-Line-Options) to the systemd service file in `/lib/systemd/system/jamulus-headless.service`. 1. Reload systemd files `sudo systemctl daemon-reload` and restart the headless server: `sudo systemctl restart jamulus-headless` From e722462504c55d1c08a7211d549081ee3cd7aa0d Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Wed, 17 Feb 2021 18:52:42 +0100 Subject: [PATCH 275/280] Move corrados to jamulussoftware --- _data/en/general.yml | 2 +- _includes/footer.html | 2 +- _posts/2020-03-28-Server-Rpi.md | 2 +- _posts/2020-09-20-Linux-Install-Script.md | 2 +- wiki/en/en-Compiling.md | 2 +- wiki/en/en-Contribution.md | 4 ++-- wiki/en/en-Onboarding.md | 2 +- wiki/en/en-Privacy-Statement.md | 2 +- wiki/en/en-Running-a-Server.md | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/_data/en/general.yml b/_data/en/general.yml index c53fba624..d87fb0c5c 100644 --- a/_data/en/general.yml +++ b/_data/en/general.yml @@ -1,5 +1,5 @@ footer: - copyright: Software by Volker Fischer and contributors + copyright: Software by Volker Fischer and contributors alt: github: "Jamulus GitHub Repo" facebook: "Jamulus Facebook Group" diff --git a/_includes/footer.html b/_includes/footer.html index f0ca899a3..c37376d35 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -1,6 +1,6 @@