diff --git a/userpatches/customize-image.sh b/userpatches/customize-image.sh index 9aa5a52..ba22516 100644 --- a/userpatches/customize-image.sh +++ b/userpatches/customize-image.sh @@ -26,8 +26,8 @@ Main() { #touch /root/.no_rootfs_resize apt-get install -y wsjtx quisk tigervnc-standalone-server socat ser2net gdb-minimal gdbserver strace e2fsprogs xfce4-battery-plugin xfce4-power-manager libqt5sql5-sqlite xinetd - apt-get install -y gstreamer1.0-plugins-good gstreamer1.0-plugins-base gstreamer1.0-pulseaudio - apt-get install -y nano htop curl ncdu gpg dtrx localepurge mtr-tiny screen iotop git wget net-tools etckeeper sudo file bash-completion psmisc dnsutils software-properties-common apt-transport-https xauth aptitude fzf + apt-get install -y gstreamer1.0-plugins-good gstreamer1.0-plugins-base gstreamer1.0-pulseaudio gstreamer1.0-alsa + apt-get install -y nano htop curl ncdu gpg dtrx localepurge mtr-tiny screen iotop git wget net-tools sudo file bash-completion psmisc dnsutils software-properties-common apt-transport-https xauth aptitude fzf cp /tmp/overlay/extracted/sun8i-r16-x6100.dtb /boot/ cp /tmp/overlay/extracted/sun8i-r16-x6100.dts /boot/ @@ -60,7 +60,7 @@ Main() { systemctl enable alsa_2_pulse.service #systemctl enable pulse_2_alsa.service - systemctl enable pulse_2_network_rx.service + systemctl enable alsa_2_network_rx.service # startup systemctl enable x6100_chroot.service diff --git a/userpatches/overlay/etc/systemd/system/alsa_2_network_rx.service b/userpatches/overlay/etc/systemd/system/alsa_2_network_rx.service new file mode 100644 index 0000000..0d4f81b --- /dev/null +++ b/userpatches/overlay/etc/systemd/system/alsa_2_network_rx.service @@ -0,0 +1,13 @@ +[Unit] +Description=alsa 2 network X6100 RX +Before=systemd-user-sessions.service +Before=lightdm.service +Requires=amixer.service + +[Service] +User=root +ExecStart=/usr/bin/gst-launch-1.0 alsasrc device=mixcapture ! audioconvert ! audio/x-raw,rate=16000,channels=2,format=S16LE ! wavenc ! tcpserversink port=7000 host=0.0.0.0 +Restart=on-failure + +[Install] +WantedBy=multi-user.target diff --git a/userpatches/overlay/etc/systemd/system/pulse_2_network_rx.service b/userpatches/overlay/etc/systemd/system/pulse_2_network_rx.service deleted file mode 100644 index 34cac8c..0000000 --- a/userpatches/overlay/etc/systemd/system/pulse_2_network_rx.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=pulseaudio 2 network X6100 RX -Before=systemd-user-sessions.service -Before=lightdm.service -Requires=pulseaudio_system.service -Requires=alsa_2_pulse.service - -[Service] -User=root -ExecStart=/usr/bin/gst-launch-1.0 pulsesrc device=X6100_RX.monitor ! audioconvert ! audio/x-raw,rate=16000,channels=2,format=S16LE ! wavenc ! tcpserversink port=7000 host=0.0.0.0 -Restart=on-failure - -[Install] -WantedBy=multi-user.target