Merge branch 'main' into hlsplayer

This commit is contained in:
Julien Valentin 2024-01-20 02:59:01 +01:00 committed by GitHub
commit 927afec865
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 75 additions and 14 deletions

View File

@ -29,7 +29,7 @@ jobs:
- uses: actions/setup-python@v5
with:
python-version: "3.x"
- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ inputs.context }}-${{ hashFiles(format('{0}/{1}', inputs.context, '**/setup.py')) }}
@ -65,7 +65,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ~/.cache/pip
key: ${{ matrix.release }}-pip-${{ inputs.context }}-${{ hashFiles(format('{0}/{1}', inputs.context, '**/setup.py')) }}

View File

@ -29,7 +29,7 @@ jobs:
with:
python-version: "3.x"
- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-api-${{ hashFiles('api/**/setup.py') }}

View File

@ -64,7 +64,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ~/.cache/pip
key: ${{ matrix.release }}-pip-api-${{ hashFiles('api/**/setup.py') }}

View File

@ -26,7 +26,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: |
/usr/local/bin/vale*

View File

@ -40,7 +40,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: .lycheecache
key: housekeeping-find-broken-links-${{ github.sha }}

View File

@ -74,7 +74,7 @@ jobs:
run: |
echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

View File

@ -21,7 +21,7 @@ jobs:
with:
python-version: "3.x"
- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ~/.cache/pip
key: ${{ runner.os }}-project-pre-commit-pip-${{ hashFiles('.pre-commit-config.yaml') }}

View File

@ -17,6 +17,12 @@ Setting a higher bitrate for your output stream will only benefit your listeners
:::
:::caution
The liquidsoap playout handler version 1.4.3 shipped in Debian Bullseye and 1.4.1 shipped in Ubuntu Focal doesn't support AAC streaming output. If you want to stream AAC, you will need to replace the liquidsoap package with a version that supports AAC. See this [tutorial](./tutorials/setup-liquidsoap-aac-streaming.md) for more information.
:::
## Icecast
### UTF-8 metadata in Icecast MP3 streams

View File

@ -0,0 +1,54 @@
---
title: How to update liquidsoap to support AAC streaming
---
This tutorials walks you though the steps required to replace the liquidsoap package with a version that supports AAC streaming.
:::warning
Replacing the liquidsoap package has security implications, since this will remove the package from the system's package manager. This means that the package manager will not be able to update the liquidsoap package in the future. This includes backports of security fixes.
Libretime is NOT compatible with Liquidsoap 2.x at the time of this writing. Future versions of Libretime will support Liquidsoap 2.x which will render these instructions obsolete.
:::info
Lets assume you already [installed LibreTime using the native OS installer](../install/install-using-the-installer.md). Execute the following commands as the libretime user.
:::
## 1. Obtain liquidsoap with AAC support
For Ubuntu 20.04 LTS ('focal'), use the following file:
```bash
wget https://github.com/savonet/liquidsoap/releases/download/v1.4.4/liquidsoap-v1.4.4_1.4.4-ubuntu-focal-amd64-1_amd64.deb
```
For Debian 11 ('Bullseye'), use the following file:
```bash
wget https://github.com/savonet/liquidsoap/releases/download/v1.4.4/liquidsoap-v1.4.4_1.4.4-debian-stable-amd64-1_amd64.deb
```
## 2. Install and replace the liquidsoap package
Install the package using `apt`, then remove the old liquidsoap dependencies:
```bash
sudo apt -y install ./liquidsoap-v1.4.4_1.4.4-*-amd64-1_amd64.deb
sudo apt -y autoremove
```
## 3. Configure LibreTime to use the new liquidsoap package
Nothing to do, this is a drop-in replacement. Just restart the libretime target once and then check the status page in the LibreTime web interface to see if the liquidsoap service is running.
```bash
sudo systemctl restart libretime.target
```
:::warning
If you want to update LibreTime in the future, you'll need to re-run the installer schript. This will replace the liquidsoap package with the version that doesn't support AAC streaming. Add `--packages-excludes liquidsoap` to the installer command to prevent this from happening.
:::

View File

@ -15,15 +15,16 @@ msgstr ""
"Project-Id-Version: LibreTime\n"
"Report-Msgid-Bugs-To: https://github.com/libretime/libretime/issues\n"
"POT-Creation-Date: 2023-12-25 01:55+0000\n"
"PO-Revision-Date: 2023-05-19 16:32+0000\n"
"Last-Translator: Dave Berg <dberg316@gmail.com>\n"
"Language-Team: German <https://hosted.weblate.org/projects/libretime/legacy/de/>\n"
"PO-Revision-Date: 2024-01-19 16:00+0000\n"
"Last-Translator: Domenik Töfflinger <domenikt96@yahoo.de>\n"
"Language-Team: German <https://hosted.weblate.org/projects/libretime/legacy/"
"de/>\n"
"Language: de_DE\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 4.18-dev\n"
"X-Generator: Weblate 5.4-dev\n"
#: application/common/DateHelper.php:216
#, php-format
@ -582,11 +583,11 @@ msgstr "Zulu"
#: application/common/Timezone.php:21
msgid "Use station default"
msgstr ""
msgstr "Standardeinstellung der Station verwenden"
#: application/common/UsabilityHints.php:65
msgid "Upload some tracks below to add them to your library!"
msgstr "Lade Tracks hoch, um sie deiner Bibliotheke hinzuzufügen!"
msgstr "Lade Tracks hoch, um sie deiner Bibliothek hinzuzufügen!"
#: application/common/UsabilityHints.php:69
#, php-format