From b70870bf726577b5b847280ee14f9a63845d2fa5 Mon Sep 17 00:00:00 2001
From: John Melton - G0ORX/N6LYT <john.d.melton@googlemail.com>
Date: Fri, 9 Sep 2016 16:15:59 +0000
Subject: [PATCH] switch from pulse audio to ALSA

---
 Makefile                           |  8 ++++++--
 release/pihpsdr/pulseaudio.service | 11 -----------
 release/pihpsdr/pulseaudio.sh      |  7 -------
 3 files changed, 6 insertions(+), 20 deletions(-)
 delete mode 100644 release/pihpsdr/pulseaudio.service
 delete mode 100755 release/pihpsdr/pulseaudio.sh

diff --git a/Makefile b/Makefile
index 3da5170..9cd3db8 100644
--- a/Makefile
+++ b/Makefile
@@ -93,12 +93,16 @@ else
   gpio.o
 endif
 
-OPTIONS=-g -D $(UNAME_N) $(GPIO_OPTIONS) $(LIMESDR_OPTIONS) $(FREEDV_OPTIONS) $(PSK_OPTIONS) -D GIT_DATE='"$(GIT_DATE)"' -D GIT_VERSION='"$(GIT_VERSION)"' $(DEBUG_OPTION) -O3
 
 GTKINCLUDES=`pkg-config --cflags gtk+-3.0`
 GTKLIBS=`pkg-config --libs gtk+-3.0`
 
-LIBS=-lrt -lm -lwdsp -lpthread -lpulse-simple -lpulse $(PSKLIBS) $(GTKLIBS) $(GPIO_LIBS) $(SOAPYSDRLIBS) $(FREEDVLIBS)
+AUDIO_OPTIONS=-D ALSA
+AUDIO_LIBS=-lasound
+
+OPTIONS=-g -D $(UNAME_N) $(GPIO_OPTIONS) $(LIMESDR_OPTIONS) $(FREEDV_OPTIONS) $(PSK_OPTIONS) -D GIT_DATE='"$(GIT_DATE)"' -D GIT_VERSION='"$(GIT_VERSION)"' $(DEBUG_OPTION) $(AUDIO_OPTIONS) -O3
+
+LIBS=-lrt -lm -lwdsp -lpthread $(AUDIO_LIBS) -lpulse $(PSKLIBS) $(GTKLIBS) $(GPIO_LIBS) $(SOAPYSDRLIBS) $(FREEDVLIBS)
 INCLUDES=$(GTKINCLUDES)
 
 COMPILE=$(CC) $(OPTIONS) $(INCLUDES)
diff --git a/release/pihpsdr/pulseaudio.service b/release/pihpsdr/pulseaudio.service
deleted file mode 100644
index bafe34b..0000000
--- a/release/pihpsdr/pulseaudio.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=PulseAudio Daemon
- 
-[Install]
-WantedBy=multi-user.target
- 
-[Service]
-Type=simple
-PrivateTmp=true
-ExecStart=/usr/bin/pulseaudio --system --realtime --disallow-exit --no-cpu-limit
-
diff --git a/release/pihpsdr/pulseaudio.sh b/release/pihpsdr/pulseaudio.sh
deleted file mode 100755
index 7581360..0000000
--- a/release/pihpsdr/pulseaudio.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-sudo usermod -a -G pulse-access pi
-sudo usermod -a -G audio root
-sudo usermod -a -G pulse root
-sudo usermod -a -G pulse-access root
-sudo cp pulseaudio.service /etc/systemd/system
-sudo systemctl --system enable pulseaudio.service
-sudo systemctl --system start pulseaudio.service
-- 
2.45.2