diff --git a/Dockerfile b/Dockerfile index e814373..63dd33d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,7 +30,6 @@ RUN \ py-gobject \ mailcap \ su-exec \ - icecast \ gstreamer \ gst-plugins-base \ gst-plugins-good \ diff --git a/root/defaults/icecast.xml b/root/defaults/icecast.xml deleted file mode 100644 index 9aa9d9e..0000000 --- a/root/defaults/icecast.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - 1000 - 42 - 5 - 524288 - 30 - 15 - 10 - - 0 - 65535 - - - - 3ds6ksvNGm6WeccXrd - 3ds6ksvNGm6WeccXrd - - admin - 3ds6ksvNGm6WeccXrd - - - icecast.local - unknown - noreply@icecast.local - 1 - - - 8000 - 0.0.0.0 - - - - /mopidy - /silence.mp3 - 1 - - - - /usr/share/icecast - /data/logs/icecast - /usr/share/icecast/web - /usr/share/icecast/admin - - - diff --git a/root/defaults/mopidy.conf b/root/defaults/mopidy.conf index da0875f..3983f0d 100755 --- a/root/defaults/mopidy.conf +++ b/root/defaults/mopidy.conf @@ -3,6 +3,9 @@ cache_dir = /data/.cache config_dir = /data/.config data_dir = /data +[audio] +output = audioresample ! audioconvert ! audio/x-raw,rate=48000,channels=2,format=S16LE ! wavenc ! filesink location=/tmp/snapfifo + [file] media_dirs = /music|Music @@ -20,8 +23,8 @@ hostname = 0.0.0.0 hostname = 0.0.0.0 [iris] +snapcast_enabled = true +snapcast_host = snapserver +snapcast_port = 1705 country = US locale = en_US - -[audio] -output = lamemp3enc bitrate=320 ! shout2send async=false mount=mopidy ip=127.0.0.1 port=8000 password=3ds6ksvNGm6WeccXrd diff --git a/root/usr/local/bin/entrypoint.sh b/root/usr/local/bin/entrypoint.sh index b94f9ab..90387f3 100644 --- a/root/usr/local/bin/entrypoint.sh +++ b/root/usr/local/bin/entrypoint.sh @@ -7,16 +7,6 @@ if [ ! -r /data/.config/mopidy.conf ]; then cp /defaults/mopidy.conf /data/.config fi -if [ ! -r /data/.config/icecast.xml ]; then - mkdir -p /data/.config - cp /defaults/icecast.xml /data/.config -fi - -if [ ! -r /data/logs ]; then - mkdir -p /data/logs/mopidy - mkdir -p /data/logs/icecast -fi - chown -R mopidy:mopidy /data su-exec mopidy mopidy --config /data/.config/mopidy.conf local scan diff --git a/root/usr/local/bin/run.sh b/root/usr/local/bin/run.sh index 99adaa9..2e7c7d7 100755 --- a/root/usr/local/bin/run.sh +++ b/root/usr/local/bin/run.sh @@ -1,7 +1,6 @@ #!/bin/sh trap "kill $PID" HUP INT TERM -su-exec mopidy icecast -c /data/.config/icecast.xml -b & su-exec mopidy mopidy --config /data/.config/mopidy.conf "${@}" & PID=$! wait $PID diff --git a/root/usr/share/icecast/web/silence.mp3 b/root/usr/share/icecast/web/silence.mp3 deleted file mode 100644 index 16de7c3..0000000 Binary files a/root/usr/share/icecast/web/silence.mp3 and /dev/null differ