makefu/stockholm
1
0
Fork 0
Code Issues Pull requests Actions 1 Packages Projects Releases Wiki Activity

l radio: remove icecast, let mpd stream directly (icecast has hiccups)

Browse source
This commit is contained in:
lassulus 2020-12-17 14:49:38 +01:00
parent 46c5284a1d
commit 9a862040dc
1 changed files with 11 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
lass/2configs/radio.nix
View file

@ -6,9 +6,6 @@ let
name = "radio"; name = "radio";
mainUser = config.users.extraUsers.mainUser; mainUser = config.users.extraUsers.mainUser;
admin-password = import <secrets/icecast-admin-pw>;
source-password = import <secrets/icecast-source-pw>;
music_dir = "/home/radio/music"; music_dir = "/home/radio/music";
add_random = pkgs.writeDashBin "add_random" '' add_random = pkgs.writeDashBin "add_random" ''
@ -138,51 +135,16 @@ in {
auto_update "yes" auto_update "yes"
audio_output { audio_output {
type "shout" type "httpd"
encoding "lame" name "lassulus radio"
name "the_playlist_mp3" encoder "vorbis" # optional
host "localhost" port "8000"
port "8000" quality "5.0" # do not define if bitrate is defined
mount "/radio.mp3" # bitrate "128" # do not define if quality is defined
password "${source-password}" format "44100:16:1"
bitrate "128" always_on "yes" # prevent MPD from disconnecting all listeners when playback is stopped.
tags "yes" # httpd supports sending tags to listening streams.
format "44100:16:2"
user "source"
genre "good music"
} }
audio_output {
type "shout"
encoding "ogg"
name "the_playlist_ogg"
host "localhost"
port "8000"
mount "/radio.ogg"
password "${source-password}"
bitrate "128"
format "44100:16:2"
user "source"
genre "good music"
}
'';
};
services.icecast = {
enable = true;
hostname = "radio.lassul.us";
admin.password = admin-password;
extraConf = ''
<mount>
<mount-name>/radio.mp3</mount-name>
<password>${source-password}</password>
</mount>
<mount>
<mount-name>/radio.ogg</mount-name>
<password>${source-password}</password>
</mount>
''; '';
}; };
@ -206,7 +168,7 @@ in {
systemd.services.radio = let systemd.services.radio = let
autoAdd = pkgs.writeDash "autoAdd" '' autoAdd = pkgs.writeDash "autoAdd" ''
LIMIT=$1 #in secconds LIMIT=$1 #in seconds
timeLeft () { timeLeft () {
playlistDuration=$(${pkgs.mpc_cli}/bin/mpc --format '%time%' playlist | ${pkgs.gawk}/bin/awk -F ':' 'BEGIN{t=0} {t+=$1*60+$2} END{print t}') playlistDuration=$(${pkgs.mpc_cli}/bin/mpc --format '%time%' playlist | ${pkgs.gawk}/bin/awk -F ':' 'BEGIN{t=0} {t+=$1*60+$2} END{print t}')
@ -238,8 +200,7 @@ in {
${pkgs.mpc_cli}/bin/mpc idle player > /dev/null ${pkgs.mpc_cli}/bin/mpc idle player > /dev/null
${pkgs.mpc_cli}/bin/mpc current -f %file% ${pkgs.mpc_cli}/bin/mpc current -f %file%
done | while read track; do done | while read track; do
listeners=$(${pkgs.curl}/bin/curl 'http://localhost:8000/status-json.xsl' \ listeners=$(${pkgs.iproute}/bin/ss -Hno state established '( sport = :8000 )' | wc -l)
| ${pkgs.jq}/bin/jq '[.icestats.source[].listeners] | add')
echo "$(date -Is)" "$track" | tee -a "$HISTORY_FILE" echo "$(date -Is)" "$track" | tee -a "$HISTORY_FILE"
echo "$(tail -$LIMIT "$HISTORY_FILE")" > "$HISTORY_FILE" echo "$(tail -$LIMIT "$HISTORY_FILE")" > "$HISTORY_FILE"
${write_to_irc} "playing: $track listeners: $listeners" ${write_to_irc} "playing: $track listeners: $listeners"