diff --git a/src/common/startup_scripts/vnc_startup.sh b/src/common/startup_scripts/vnc_startup.sh index f5401ee..6b64d26 100755 --- a/src/common/startup_scripts/vnc_startup.sh +++ b/src/common/startup_scripts/vnc_startup.sh @@ -318,25 +318,6 @@ function start_audio_out (){ fi } -function start_pcm_audio (){ - if [[ ${KASM_SVC_AUDIO:-1} == 1 ]]; then - log 'Starting audio out' - if [ "${START_PULSEAUDIO:-0}" == "1" ] ; - then - echo "Starting Pulse" - HOME=/var/run/pulse pulseaudio --start - fi - /opt/audio/start kasmaudio 4901 ${HOME}/.vnc/self.pem ${HOME}/.vnc/self.pem "kasm_user:$VNC_PW" & - - KASM_PROCS['kasm_audio_server']=$! - - if [[ $DEBUG == true ]]; then - echo -e "\n------------------ Started Audio Server ----------------------------" - echo "Kasm Audio Server PID: ${KASM_PROCS['kasm_audio_server']}"; - fi - fi -} - function start_audio_in (){ if [[ ${KASM_SVC_AUDIO_INPUT:-1} == 1 ]]; then log 'Starting audio input server' @@ -639,12 +620,8 @@ wait_on_printer wait_on_smartcard start_kasmvnc start_window_manager -if [ -z ${PCM_AUDIO+x} ]; then - start_audio_out_websocket - start_audio_out -else - start_pcm_audio -fi +start_audio_out_websocket +start_audio_out start_audio_in start_upload start_gamepad @@ -712,10 +689,6 @@ do echo "Restarting Audio Out Service" start_audio_out ;; - kasm_audio_server) - echo "Restarting Audio Server" - start_pcm_audio - ;; kasm_audio_in) echo "Audio In Service Failed" # TODO: Needs work in python project to support auto restart diff --git a/src/ubuntu/install/audio/install_audio.sh b/src/ubuntu/install/audio/install_audio.sh index 6cee4a1..cd38ea9 100644 --- a/src/ubuntu/install/audio/install_audio.sh +++ b/src/ubuntu/install/audio/install_audio.sh @@ -90,13 +90,7 @@ WS_COMMIT_ID="f7efb82dc59a02d1b99e2e2b3c6d127dc548ba72" WS_BRANCH="develop" WS_COMMIT_ID_SHORT=$(echo "${WS_COMMIT_ID}" | cut -c1-6) -AS_COMMIT_ID="40caefd2f6732fe5ab90091e89a1e364210afff0" -AS_BRANCH="develop" -AS_COMMIT_ID_SHORT=$(echo "${AS_COMMIT_ID}" | cut -c1-6) - cd $STARTUPDIR mkdir jsmpeg wget -qO- https://kasmweb-build-artifacts.s3.amazonaws.com/kasm_websocket_relay/${WS_COMMIT_ID}/kasm_websocket_relay_${ARCH}_${WS_BRANCH}.${WS_COMMIT_ID_SHORT}.tar.gz | tar xz --strip 1 -C $STARTUPDIR/jsmpeg chmod +x $STARTUPDIR/jsmpeg/kasm_audio_out-linux -mkdir /opt/audio -wget -qO- https://kasmweb-build-artifacts.s3.amazonaws.com/kasm_audio_server/${AS_COMMIT_ID}/kasm_audio_server_${ARCH}_${AS_BRANCH}.${AS_COMMIT_ID_SHORT}.tar.gz | tar xz -C /opt/audio