diff --git a/404.html b/404.html index 0b7e6afd5..b179691b6 100644 --- a/404.html +++ b/404.html @@ -9,7 +9,7 @@ - 404 Not found - Jamulus + 404 Not found – Jamulus {% include headtags.html %} diff --git a/_posts/2020-10-19-Software-Synth.md b/_posts/2020-10-19-Software-Synth.md index 21dab87fb..2e348e103 100644 --- a/_posts/2020-10-19-Software-Synth.md +++ b/_posts/2020-10-19-Software-Synth.md @@ -66,7 +66,7 @@ Let's have a look at the workflow. ![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. +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. diff --git a/_posts/2021-01-05-Jamulus-Sound-Devices.md b/_posts/2021-01-05-Jamulus-Sound-Devices.md index 4d2567569..ca7b83c82 100644 --- a/_posts/2021-01-05-Jamulus-Sound-Devices.md +++ b/_posts/2021-01-05-Jamulus-Sound-Devices.md @@ -19,11 +19,11 @@ Just [edit this page and wait for an approval](https://github.com/jamulussoftwar ## Audio devices known to work with Jamulus -**NOTE** the device must have a sample rate of *48 kHz (DVD quality)* - which many devices do. +**NOTE** the device must have a sample rate of *48 kHz (DVD quality)* — which many devices do. Additionally, it should _allow you to listen to the computer’s audio signal_. [See this explanation](https://jamulus.io/wiki/FAQ#why-should-i-not-listen-to-my-own-signal). This may or may not be significant depending on the instrument you play. -On Windows, it’s recommended to choose a device with a *native ASIO driver* - not ASIO4ALL (or other generic ASIO drivers). +On Windows, it’s recommended to choose a device with a *native ASIO driver* — not ASIO4ALL (or other generic ASIO drivers). --- @@ -199,7 +199,7 @@ The ART USBMIX4 appears to be a re-branded [Ammoon AGM04](https://www.ammoon.com **[Behringer XENYX series](https://www.behringer.com/series.html?category=R-BEHRINGER-XENYXSERIES)**, USB digital audio interfaces -**Windows**: 😐 Doesn't work 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. +**Windows**: 😐 Doesn't work 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. @@ -294,7 +294,7 @@ _More testing required._ **[Roland TD-27](https://www.roland.com/uk/products/td-27/)** USB drum sound module -**Windows**: ✅ Works. The local master signal is always routed to the Headphones. Using JACK is neccessary to change the signal-routing so that you hear your signal on the headphones - not the local signal of the drum module: +**Windows**: ✅ Works. The local master signal is always routed to the Headphones. Using JACK is neccessary to change the signal-routing so that you hear your signal on the headphones — not the local signal of the drum module: Configuration Changes: On the TD27 open: SYSTEM -> USB-AUDIO: Driver Mode VENDOR SYSTEM -> OUTPUT -> PAD MAS: remove any pad signal from MASTER(L+R); PAD DIR: add desired(all) pad signals to DIRECT(1/2) @@ -447,7 +447,7 @@ Sounds great, can achieve 32 frame buffer and works on *Windows* and *Linux*. **Windows**: ❓ Should work. -**macOS**: ✅ Works well. 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. +**macOS**: ✅ Works well. 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. This device may (or may not) work, see [this post](https://forums.presonus.com/viewtopic.php?f=67&t=2717). diff --git a/_posts/2022-01-26-Routing-JACK-Windows.md b/_posts/2022-01-26-Routing-JACK-Windows.md index a9b037138..50e308d74 100644 --- a/_posts/2022-01-26-Routing-JACK-Windows.md +++ b/_posts/2022-01-26-Routing-JACK-Windows.md @@ -50,7 +50,7 @@ Ensure the Sample Rate is set to 48000, the driver is portaudio, Frames/Period i Now connect to any server. -Afterwards - if needed click on the "ASIO OFF" button to turn ASIO on in ASIO Bridge. Unfortunately the button is labelled in a confusing way. +Afterwards — if needed click on the "ASIO OFF" button to turn ASIO on in ASIO Bridge. Unfortunately the button is labelled in a confusing way. Next, you can minimise ASIO Bridge to the taskbar and open the Graph in Qjackctl. This button is at the bottom right: diff --git a/_posts/2022-08-04-Translating-po-files.md b/_posts/2022-08-04-Translating-po-files.md index 5af081e96..a8de3bf8b 100644 --- a/_posts/2022-08-04-Translating-po-files.md +++ b/_posts/2022-08-04-Translating-po-files.md @@ -45,6 +45,6 @@ The simplest to use is **Poedit**. Once downloaded and installed, to get up and #### Note on translation memories -A translation memory (TM) is a file that stores source text strings with their translations - a database that grows in size as translations of different files are added to it. They enable you to retrieve previously-translated strings in different documents. For example, you've translated a string in document A, and the same string appears in a new document you're working on, document B. A TM enables you to retrieve that translated string, avoiding the need to re-translate it. +A translation memory (TM) is a file that stores source text strings with their translations — a database that grows in size as translations of different files are added to it. They enable you to retrieve previously-translated strings in different documents. For example, you've translated a string in document A, and the same string appears in a new document you're working on, document B. A TM enables you to retrieve that translated string, avoiding the need to re-translate it. OmegaT uses TMs by default and there is no need to create one. Whenever you add a new document to a project, it will scan that project's TM for any 100% or fuzzy (partial) matches and will display them for you. In Poedit, to make sure the TM is enabled, go to Edit > Preferences > TM tab. Check "Use translation memory" if it is not already. If there are any previously-translated .po files, to ensure the TM is up to date, click on "Manage..." > "Import translation Files...". Navigate to where the previously-translated .po files are (`_translator-files/po/LANG/`), select them all, and click on "Open". It will extract all the source/translation pairs and add them to the TM. From now on, when translating new documents, any matches will be displayed on the right. diff --git a/contribute/en/Release-Process.md b/contribute/en/Release-Process.md index 5be62104f..21078ad72 100644 --- a/contribute/en/Release-Process.md +++ b/contribute/en/Release-Process.md @@ -217,7 +217,7 @@ $ git status Make sure there are no pending changes shown by `git status`. -Make sure `ChangeLog` contains the right version for the planned release - this is "the release version number will be" number. If not, update it and commit the change. +Make sure `ChangeLog` contains the right version for the planned release — this is "the release version number will be" number. If not, update it and commit the change. - Run `./tools/changelog-helper.sh add-missing-entries` to scan Git history and Github milestone for PRs and to auto-add them to the changelog. - Run `./tools/changelog-helper.sh group-entries` to group all entries for the current release @@ -242,7 +242,7 @@ mkdir 3.7.0 cd 3.7.0 ``` -Upload all the files. Then in the SourceForge web UI, for each of the files uploaded, click the ℹ️ icon next to the file (in Files in the admin tools) and set it as "Default for (appropriate) platform)" Note that unsetting the default to "none" automatically picks the newest, so don't do that -- explicitly set the default when the release announcement is posted. Also note that legacy Mac, Headless and WinJACK users will need to just find those links on their own. +Upload all the files. Then in the SourceForge web UI, for each of the files uploaded, click the ℹ️ icon next to the file (in Files in the admin tools) and set it as "Default for (appropriate) platform)" Note that unsetting the default to "none" automatically picks the newest, so don't do that — explicitly set the default when the release announcement is posted. Also note that legacy Mac, Headless and WinJACK users will need to just find those links on their own. ## Website: check links @@ -320,7 +320,7 @@ Current state: - [ ] Update the version number in `Jamulus.pro` and add the release date to the Changelog header and commit. - [ ] Wait for the release build to complete. - [ ] Push the release to [ann0see/jamulussign](https://github.com/ann0see/jamulussign/) for macOS signing and upload signed binary [from the signing repo](https://github.com/ann0see/jamulussign/releases) repo [to the official one](https://github.com/jamulussoftware/jamulus/releases). - - [ ] Do a smoke test for Windows/Mac/Linux -- Do the binaries start/connect properly? Can earlier Jamulus versions properly connect to a server based on the new release? + - [ ] Do a smoke test for Windows/Mac/Linux — Do the binaries start/connect properly? Can earlier Jamulus versions properly connect to a server based on the new release? - [ ] Do a smoke test of the upgrade notification (do this _very quickly_) - [ ] Install the release build on _one_ of the update notification Servers - [ ] Run the _previous release_ (not an intermediate) build of GUI Client and Server @@ -389,6 +389,6 @@ Thanks to everyone who did their part to make this release happen: This Discussion thread will be locked in order to keep things organized. -Feedback, questions or suspected bug reports are appreciated nevertheless -- please start a new [Discussion on Github](https://github.com/jamulussoftware/jamulus/discussions/new) for them. +Feedback, questions or suspected bug reports are appreciated nevertheless — please start a new [Discussion on Github](https://github.com/jamulussoftware/jamulus/discussions/new) for them. ~~~ diff --git a/contribute/en/Style-and-Tone.md b/contribute/en/Style-and-Tone.md index 197d2d6b6..33aa90bf9 100644 --- a/contribute/en/Style-and-Tone.md +++ b/contribute/en/Style-and-Tone.md @@ -65,7 +65,7 @@ Try not to sound like a robot. Write conversationally, as if you were talking to ## Capitalisation and references -Headings use sentence case "This is a heading" unless delineated (e.g. "Look - This is a heading"). +Headings use sentence case "This is a heading" unless delineated (e.g. "Look — This is a heading"). Nouns use lower case unless they have a formal definition in this style guide (e.g. "Directory", "Fader") or refer to specific Jamulus features (e.g. "Audio Alerts", "Jitter Buffer"). The only exception to this is the word "person" or "people" which can remain in lower case. diff --git a/contribute/en/po4a-Setup-Explained.md b/contribute/en/po4a-Setup-Explained.md index 3e82160a3..94918b061 100644 --- a/contribute/en/po4a-Setup-Explained.md +++ b/contribute/en/po4a-Setup-Explained.md @@ -32,7 +32,7 @@ In order to make these automated processes happen, there are a series of scripts These are contained in the `_po4a-tools/` folder and there are 5 of them: **po4a-update-templates.sh**: -When a source .md file in English is edited, this script will update its .po file counterparts in every language, adding/removing/changing the relevant strings as applicable. If a new file has been added, it will create the corresponding new .po file. Similarly, if a new language is added (also automated - more on this later), it will populate the new language folder with all the appropriate .po files. In short, this script will update/create all the relevant .po files in every language folder contained in `_translator-files/po/`. +When a source .md file in English is edited, this script will update its .po file counterparts in every language, adding/removing/changing the relevant strings as applicable. If a new file has been added, it will create the corresponding new .po file. Similarly, if a new language is added (also automated — more on this later), it will populate the new language folder with all the appropriate .po files. In short, this script will update/create all the relevant .po files in every language folder contained in `_translator-files/po/`. **po4a-create-all-targets.sh**: This script takes all the .po files in `_translator-files/po/*LANG*/` and uses them to generate the target translated .md files ready to be deployed. These target files are not stored in the repository, but are created via a GitHub action (which calls this script) just prior to deploying the website or zipping and uploading it (more on this later). This script also triggers the next one before exiting (`po4a-stats.sh`). @@ -50,12 +50,12 @@ Triggered when a new language is added. First it creates a folder for the new la These are contained in `.github/workflows/` and among other things, they automate the execution of the appropriate po4a scripts depending on the event that triggers them. -The website repository operates with two branches - 'release', which is the source for the live website, and 'next-release', which is where changes to the documentation happen in between releases of the Jamulus application. These different functions are relevant when it comes to how the GitHub actions scripts behave, explained as follows: +The website repository operates with two branches — 'release', which is the source for the live website, and 'next-release', which is where changes to the documentation happen in between releases of the Jamulus application. These different functions are relevant when it comes to how the GitHub actions scripts behave, explained as follows: **main.yml**: This script is triggered by 'push' events to the 'release' branch only. This is a summary of what it does: -1- Checks whether po4a and its dependencies have been previously cached. If they have, it retrieves the cache, and if not, it performs the installation and creates the cache so it is available in future - this step is shared by all three GH actions scripts and is what is in the `po4a-cache.sh` script. The po4a installation is necessary to run the po4a scripts later in the workflow. A po4a .deb file is stored in the 'assets' jamulus repository as a recent version is required that is not available from any official repositories. +1- Checks whether po4a and its dependencies have been previously cached. If they have, it retrieves the cache, and if not, it performs the installation and creates the cache so it is available in future — this step is shared by all three GH actions scripts and is what is in the `po4a-cache.sh` script. The po4a installation is necessary to run the po4a scripts later in the workflow. A po4a .deb file is stored in the 'assets' jamulus repository as a recent version is required that is not available from any official repositories. 2- dorny/paths-filter@v2 checks whether the commits being pushed contain any changes to English files in `wiki/en/`. If so, `po4a-update-templates.sh` is run to update/add the .po files for all languages. @@ -86,14 +86,14 @@ This script is for adding a new language. It is triggered when an issue is opene 8- Creates the target files with `po4a-create-all-targets.sh` and the 'Statistics' file. -9- Builds the site but doesn't deploy nor zip/upload it - this and the previous step are just a check to verify that it builds properly. +9- Builds the site but doesn't deploy nor zip/upload it — this and the previous step are just a check to verify that it builds properly. **jekyll.yml**: This is the more complex script. A distinction between 'pull request' and 'push' events will be made to better understand the flow of steps for each case: - **Pull Request events**. Applicable to both 'release' and 'next-release'; the steps are the same for both assuming the same PR content: - 1- dorny/paths-filter@v2 checks if English source files have changed/been added (but doesn't determine whether the script exits or not - see below). + 1- dorny/paths-filter@v2 checks if English source files have changed/been added (but doesn't determine whether the script exits or not — see below). 2- Checks po4a cache (as above). diff --git a/wiki/README.md b/wiki/README.md index 3f6d71d46..f0f8e7b67 100644 --- a/wiki/README.md +++ b/wiki/README.md @@ -14,7 +14,7 @@ The translated files are created via a GitHub action right before the website is ### Using po4a locally to update templates/create translated .md files -In order to run the `po4a-update-templates.sh` and `po4a-create-all-targets.sh` scripts locally, you will need to do so on a Linux distro with `po4a` installed. The minimum version required is 0.63, which may not be available from official repos. An unofficial .deb package is available [here](https://github.com/jamulussoftware/assets/tree/main/po4a). You can also compile it yourself - visit [its GitHub page](https://github.com/mquinson/po4a) and follow the instructions there on compiling po4a. +In order to run the `po4a-update-templates.sh` and `po4a-create-all-targets.sh` scripts locally, you will need to do so on a Linux distro with `po4a` installed. The minimum version required is 0.63, which may not be available from official repos. An unofficial .deb package is available [here](https://github.com/jamulussoftware/assets/tree/main/po4a). You can also compile it yourself — visit [its GitHub page](https://github.com/mquinson/po4a) and follow the instructions there on compiling po4a. ### Notes: diff --git a/wiki/en/Client-Troubleshooting.md b/wiki/en/Client-Troubleshooting.md index fd05ebf3f..fabdd27df 100644 --- a/wiki/en/Client-Troubleshooting.md +++ b/wiki/en/Client-Troubleshooting.md @@ -42,9 +42,9 @@ You can test whether you are hearing your signal correctly by doing the followin 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 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. +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 [forum](https://github.com/jamulussoftware/jamulus/discussions). +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 [forum](https://github.com/jamulussoftware/jamulus/discussions). 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 [User Manual](/wiki/Software-Manual) to understand how to adjust your setup to help with this. diff --git a/wiki/en/DNS-SRV-Support.md b/wiki/en/DNS-SRV-Support.md index b967e9b96..87079a038 100644 --- a/wiki/en/DNS-SRV-Support.md +++ b/wiki/en/DNS-SRV-Support.md @@ -9,7 +9,7 @@ permalink: "/wiki/DNS-SRV-Support" # DNS SRV Record Support -#### Background - connecting to a Server or Directory +#### Background — connecting to a Server or Directory The default UDP port on which a Jamulus Server or Directory listens is **22124**. Normally, when a Client or a Server is given a plain hostname or an IP address to connect to, such as `198.51.100.46` or `jamulus.example.com`, it will use `22124` as the destination port number. @@ -60,7 +60,7 @@ This technique allows you to host many Jamulus Servers or Directories at differe See the documentation of your DNS provider for instructions on creating an SRV record. -#### Example - SRV records for the main Jamulus public Directories +#### Example — SRV records for the main Jamulus public Directories In the `jamulus.io` domain, SRV records have been created to specify the correct port for each of the standard public Directories: diff --git a/wiki/en/FAQ.md b/wiki/en/FAQ.md index 32ea2d7be..c5a623655 100644 --- a/wiki/en/FAQ.md +++ b/wiki/en/FAQ.md @@ -22,7 +22,7 @@ permalink: "/wiki/FAQ" ### Is there a metronome, synchronization, or some other way of keeping in time? -No. Musicians on a Jamulus Server play in real time together as they would in person. If you want a time signal, there are shared metronome solutions on the Internet you can try. But it’s probably best to just minimise latency so nobody has an overall delay more than about 30-50 ms. +No. Musicians on a Jamulus Server play in real time together as they would in person. If you want a time signal, there are shared metronome solutions on the Internet you can try. But it’s probably best to just minimise latency so nobody has an overall delay more than about 30–50 ms. Bear in mind also that all participants should follow [The Golden Rule](/wiki/Client-Troubleshooting#you-all-sound-ok-but-its-difficult-to-keep-together) which will also determine whether you can play in time properly. diff --git a/wiki/en/Getting-Started.md b/wiki/en/Getting-Started.md index 1eba99e58..2a9fe2351 100644 --- a/wiki/en/Getting-Started.md +++ b/wiki/en/Getting-Started.md @@ -5,7 +5,7 @@ lang: "en" permalink: "/wiki/Getting-Started" --- -# Setup - getting started with Jamulus +# Setup — getting started with Jamulus To get the best from Jamulus, at a minimum you will need: diff --git a/wiki/en/Installation-for-Android.md b/wiki/en/Installation-for-Android.md index 5b2d3fc89..c1828b85c 100644 --- a/wiki/en/Installation-for-Android.md +++ b/wiki/en/Installation-for-Android.md @@ -16,7 +16,7 @@ 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. Android support is just a proof of concept. +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 PoC diff --git a/wiki/en/QOS-Windows.md b/wiki/en/QOS-Windows.md index 98ac56f7d..902a7f9e2 100644 --- a/wiki/en/QOS-Windows.md +++ b/wiki/en/QOS-Windows.md @@ -11,7 +11,7 @@ permalink: "/wiki/QOS-Windows" Jamulus uses Quality of Service (QoS) to mitigate network jitter delays. -If you want to explore the effect of non-default settings, see [RFC4594](https://datatracker.ietf.org/doc/html/rfc4594) pages 16-18. Jamulus sets the DS Field byte to 128 (or 0x80) to select DSCP/CS4 in an IPv4 or IPv6 packet header. Other byte values can be set using the -Q option, e.g. -Q [0..255]. However, most people will have no need to do this. +If you want to explore the effect of non-default settings, see [RFC4594](https://datatracker.ietf.org/doc/html/rfc4594) pages 16–18. Jamulus sets the DS Field byte to 128 (or 0x80) to select DSCP/CS4 in an IPv4 or IPv6 packet header. Other byte values can be set using the -Q option, e.g. -Q [0..255]. However, most people will have no need to do this. Jamulus' QoS settings (including the default) are set to 0 on recent Windows and macOS because of the operating system. To use QoS on Windows, follow these instructions. Note that you may need to repeat this procedure every time Jamulus is updated. diff --git a/wiki/en/Running-a-Server.md b/wiki/en/Running-a-Server.md index b13978ebe..38d48dfa4 100644 --- a/wiki/en/Running-a-Server.md +++ b/wiki/en/Running-a-Server.md @@ -33,7 +33,7 @@ Using a public Server might introduce you to strangers. If you want an undisturb Usually, problems are on the _Client_ side and should be fixed there. Have a look at the [Troubleshooting page](/wiki/Client-Troubleshooting) if needed. -However, various problems can also arise when setting up Servers - especially when run on a low-bandwidth home connection. It's usually fine to have less than 5 players on a slower-speed home connection (eg 10 Mbit/s down and 1 Mbit/s up). You can read more about network requirements at [different quality settings here](Server-Bandwidth). +However, various problems can also arise when setting up Servers — especially when run on a low-bandwidth home connection. It's usually fine to have less than 5 players on a slower-speed home connection (eg 10 Mbit/s down and 1 Mbit/s up). You can read more about network requirements at [different quality settings here](Server-Bandwidth). Consider using a cloud host, not your home internet connection, to get better ping times if you're having problems. diff --git a/wiki/en/Server-Troubleshooting.md b/wiki/en/Server-Troubleshooting.md index 781566513..8944bfbd5 100644 --- a/wiki/en/Server-Troubleshooting.md +++ b/wiki/en/Server-Troubleshooting.md @@ -19,7 +19,7 @@ permalink: "/wiki/Server-Troubleshooting" -## Servers - Registered +## Servers — Registered ### Why doesn't my Server show up in the list? Why isn't it registering? @@ -29,7 +29,7 @@ If you are seeing a message that says the Server is full, you will need to wait You can verify that your Server is listed in the relevant genre by [checking it here](https://explorer.jamulus.io/). -## Servers - Unregistered +## Servers — Unregistered ### I'm running my Client on the same machine/network as my Server but I can't connect to it @@ -37,14 +37,14 @@ Connect your Client to `localhost` or `127.0.0.1`. If you're running the Client ### What address do I give to people so that they can connect to my Server? -This should be your **public** IP address (find that with [Google](https://www.google.com/search?q=whatsmyip)). Connect your **own** Jamulus Client to the **local** IP address of your Server (`localhost` or `127.0.0.1` if it's on the same machine as your Client). Note that your public IP address can change - see the note on "dynamic DNS" in [this guide](Unregistered-Servers#dynamic-dns-and-why-you-will-probably-need-it). +This should be your **public** IP address (find that with [Google](https://www.google.com/search?q=whatsmyip)). Connect your **own** Jamulus Client to the **local** IP address of your Server (`localhost` or `127.0.0.1` if it's on the same machine as your Client). Note that your public IP address can change — see the note on "dynamic DNS" in [this guide](Unregistered-Servers#dynamic-dns-and-why-you-will-probably-need-it). ### What port numbers can I use? You can set your Server to listen on a custom port with the `--port` option. If you do this, you will need to tell people which port to connect on. They will need to append the port number to the address of your Server in the format `[serverAddress]:[portNumber]`. -### Nobody can connect to my Server - but I can connect locally +### Nobody can connect to my Server — but I can connect locally First of all, make sure you've enabled [port forwarding](Unregistered-Servers#port-forwarding). If you still don't see your server from outside of your local network, you may have issues with your Internet Service Provider (ISP). diff --git a/wiki/en/Software-Manual.md b/wiki/en/Software-Manual.md index 09fe87063..b1ab83ae9 100644 --- a/wiki/en/Software-Manual.md +++ b/wiki/en/Software-Manual.md @@ -103,7 +103,7 @@ The button that follows the field allows the current entry to be removed from th 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. +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). @@ -148,7 +148,7 @@ Closes all the windows and exits the application. ### Edit > Clear All Stored Solo/Mute Settings -Whenever you Solo or Mute a channel, Jamulus remembers these settings. Even if that person leaves and rejoins - or you join a server where they are playing - the settings will automatically be applied. Use this command to clear _all_ these stored settings. +Whenever you Solo or Mute a channel, Jamulus remembers these settings. Even if that person leaves and rejoins — or you join a server where they are playing — the settings will automatically be applied. Use this command to clear _all_ these stored settings. ### Edit > Set All Faders to New Client Level @@ -350,11 +350,11 @@ With MIDI-in enabled, Jamulus will detect the MIDI devices available for connect ### MIDI parameters -There is one global MIDI channel parameter (0-16) and two parameters you can set for each item controlled: First MIDI CC and consecutive CC numbers (count). First set the channel you want Jamulus to listen on (0 for all channels). Then, for each item you want to control (volume fader, pan, solo, mute), set the first MIDI CC (CC number to start from) and number of consecutive CC numbers (count) you wish to assign to that particular item. You can either type in the MIDI CC values or use the "Learn" button: click on "Learn", actuate the fader/knob/button on your MIDI controller, and the MIDI CC number will be detected and saved. +There is one global MIDI channel parameter (0–16) and two parameters you can set for each item controlled: First MIDI CC and consecutive CC numbers (count). First set the channel you want Jamulus to listen on (0 for all channels). Then, for each item you want to control (volume fader, pan, solo, mute), set the first MIDI CC (CC number to start from) and number of consecutive CC numbers (count) you wish to assign to that particular item. You can either type in the MIDI CC values or use the "Learn" button: click on "Learn", actuate the fader/knob/button on your MIDI controller, and the MIDI CC number will be detected and saved. -As an example, a 'First MIDI CC' of 0 and a 'Count' of 8 for volume faders will mean that CC numbers 0 - 7 will control the volume faders for up to 8 mixer channels. +As an example, a 'First MIDI CC' of 0 and a 'Count' of 8 for volume faders will mean that CC numbers 0–7 will control the volume faders for up to 8 mixer channels. -There is one exception that does not require establishing consecutive CC numbers which is the “Mute Myself” parameter - it only requires a single CC number as it is only applied to one’s own audio stream. +There is one exception that does not require establishing consecutive CC numbers which is the “Mute Myself” parameter — it only requires a single CC number as it is only applied to one’s own audio stream. ### Pick-up Mode @@ -399,4 +399,4 @@ For macOS, start a Terminal window and run Jamulus with the desired options like # Controlling the Client via API -In addition to the CLI, Jamulus can be controlled using an API. This is beneficial for advanced use cases - for example, where there is no GUI, or another application needs to interact with Jamulus. Please note that the API is still experimental. Information on the [JSON-RPC API can be found in the main repository](https://github.com/jamulussoftware/jamulus/blob/main/docs/JSON-RPC.md). +In addition to the CLI, Jamulus can be controlled using an API. This is beneficial for advanced use cases — for example, where there is no GUI, or another application needs to interact with Jamulus. Please note that the API is still experimental. Information on the [JSON-RPC API can be found in the main repository](https://github.com/jamulussoftware/jamulus/blob/main/docs/JSON-RPC.md). diff --git a/wiki/en/Tips-Tricks-More.md b/wiki/en/Tips-Tricks-More.md index 93bfc6010..dd2979a18 100644 --- a/wiki/en/Tips-Tricks-More.md +++ b/wiki/en/Tips-Tricks-More.md @@ -149,7 +149,7 @@ MIDI controller parameters can be set using the `--ctrlmidich` command-line opti 2. `u` enables `MIDI Pick-up Mode` for the fader and pan controls. - 3. `d` is an option to specify a particular MIDI input device by name -- without this, it is up to the user to make connections with a connection manager or by other means, and on Windows non-JACK Jamulus all devices will be assigned to Jamulus; with it, only the specified device will be used. For example: + 3. `d` is an option to specify a particular MIDI input device by name — without this, it is up to the user to make connections with a connection manager or by other means, and on Windows non-JACK Jamulus all devices will be assigned to Jamulus; with it, only the specified device will be used. For example: ``` --ctrlmidich "1;f0*8;dnanoKontrol"