Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 404.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<html lang="en">

<head>
<title>404 Not found - Jamulus</title>
<title>404 Not found Jamulus</title>
{% include headtags.html %}
</head>

Expand Down
2 changes: 1 addition & 1 deletion _posts/2020-10-19-Software-Synth.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
10 changes: 5 additions & 5 deletions _posts/2021-01-05-Jamulus-Sound-Devices.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).

---

Expand Down Expand Up @@ -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.

Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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 1718 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).

Expand Down
2 changes: 1 addition & 1 deletion _posts/2022-01-26-Routing-JACK-Windows.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
2 changes: 1 addition & 1 deletion _posts/2022-08-04-Translating-po-files.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
8 changes: 4 additions & 4 deletions contribute/en/Release-Process.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down Expand Up @@ -320,7 +320,7 @@ Current state: <!-- Planning|Translations (beta)|Code freeze (rc)|Released -->
- [ ] 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
Expand Down Expand Up @@ -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.

~~~
2 changes: 1 addition & 1 deletion contribute/en/Style-and-Tone.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
10 changes: 5 additions & 5 deletions contribute/en/po4a-Setup-Explained.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`).
Expand All @@ -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.

Expand Down Expand Up @@ -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).

Expand Down
2 changes: 1 addition & 1 deletion wiki/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
4 changes: 2 additions & 2 deletions wiki/en/Client-Troubleshooting.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
Loading