From 24dd246d1ee3a53434dd1f21aa2afbeb55618ead Mon Sep 17 00:00:00 2001
From: Loïc Collignon <loic.collignon@iot.bzh>
Date: Fri, 20 Jul 2018 15:56:23 +0200
Subject: Added a 4a-info script use to test if 4a can work
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Test various things to check if 4a can work in this environment.

Change-Id: Ica4b739d7e8c6401db05a3b9b4d6ef9048ca1002
Signed-off-by: Loïc Collignon <loic.collignon@iot.bzh>
---
 bin/4a-play | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 bin/4a-play

(limited to 'bin/4a-play')

diff --git a/bin/4a-play b/bin/4a-play
new file mode 100644
index 0000000..894ab7f
--- /dev/null
+++ b/bin/4a-play
@@ -0,0 +1 @@
+# TODO: play using aplay
-- 
cgit 1.2.3-korg


From 28e86894895d16d1a707fd218990a0a58403bee8 Mon Sep 17 00:00:00 2001
From: Stephane Desneux <stephane.desneux@iot.bzh>
Date: Sat, 21 Jul 2018 02:48:47 +0200
Subject: fix modes scripts

Change-Id: I2c5d4ff7d6c3107d814bbcabe8870af18ac3c525
Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh>
---
 bin/4a-play         | 0
 bin/4a-speaker-test | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 bin/4a-play
 mode change 100644 => 100755 bin/4a-speaker-test

(limited to 'bin/4a-play')

diff --git a/bin/4a-play b/bin/4a-play
old mode 100644
new mode 100755
diff --git a/bin/4a-speaker-test b/bin/4a-speaker-test
old mode 100644
new mode 100755
-- 
cgit 1.2.3-korg


From e8b23b37394800332baf1ffc9b9777c67dc664cd Mon Sep 17 00:00:00 2001
From: Stephane Desneux <stephane.desneux@iot.bzh>
Date: Sat, 21 Jul 2018 16:17:44 +0200
Subject: change media paths

Change-Id: I0d4783d37da25a315073eb847c7f525ed1b51d5c
Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh>
---
 Makefile           |  8 ++++----
 bin/4a-api         | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++--
 bin/4a-play        | 18 +++++++++++++++++-
 bin/4a-status      | 53 ++++++++++++++++++++++++++---------------------------
 bin/lib4a-tools.sh | 35 +++++++++++++++++++++++++++++++++++
 5 files changed, 133 insertions(+), 34 deletions(-)
 create mode 100644 bin/lib4a-tools.sh

(limited to 'bin/4a-play')

diff --git a/Makefile b/Makefile
index 65393e0..906432b 100644
--- a/Makefile
+++ b/Makefile
@@ -14,13 +14,13 @@ help:
 	@echo "* make install DESTDIR=/usr"
 	@echo "  changes the destination dir (in this example, the scripts will be installed in /usr/bin)"
 
-install: $(MEDIA)
+install: $(SCRIPTS) $(MEDIA)
 	@echo "Installing audio scripts $(notdir $(SCRIPTS)) into $(DESTDIR)/bin"
 	mkdir -p $(DESTDIR)/bin
 	install $(SCRIPTS) -m 750 $(DESTDIR)/bin
-	@echo "Installing audio test files $(notdir $(MEDIA)) into $(DESTDIR)/media"
-	mkdir -p $(DESTDIR)/media
-	install $(MEDIA) -m 640 $(DESTDIR)/media
+	@echo "Installing audio test files $(notdir $(MEDIA)) into $(DESTDIR)/4a/media"
+	mkdir -p $(DESTDIR)/4a/media
+	install $(MEDIA) -m 640 $(DESTDIR)/4a/media
 
 clean:
 	@echo "Cleanup done."
diff --git a/bin/4a-api b/bin/4a-api
index 4a26121..1e1bb39 100755
--- a/bin/4a-api
+++ b/bin/4a-api
@@ -1,8 +1,57 @@
 #!/bin/bash
 
-WS4A=unix:/run/user/0/apis/ws/ahl-4a
+# load shell lib
+. $(dirname $BASH_SOURCE)/lib4a-tools.sh
 
-afb-client-demo -H -d $WS4A get_roles ""
+cmd=$1
+shift
+
+function usage() {
+	log "Usage: $0 <cmd> [opts]"
+	log "Commands:"
+	log "   help: show this help"
+	log "   api <verb> [args]: send direct request to API verb with args"
+	log "   roles: get AHL roles"
+	log "   hals [-a|--all] [-v|--verbose]: get HALs status"
+	log "   mediaplayer ... : interact with mediaplayer service"
+	log "   radio ... : interact with radio service"
+	exit 1
+}
+
+case $cmd in
+	roles)
+		4a-client ahl-4a get_roles ""
+		;;
+	api)
+		4a-client "$@"
+		;;
+	hals)
+		verbose=false
+		all=false
+		while [[ -n "$1" ]]; do
+			case $1 in
+				-a|--all) all=true;;
+				-v|--verbose) verbose=true;;
+				-av) all=true; verbose=true;;
+			esac
+			shift
+		done
+		4a-client 4a-hal-manager loaded "{'verbose':$verbose,'all':$all}"
+		;;
+	mediaplayer)
+		echo "TODO"
+		;;
+	radio)
+		echo "TODO"
+		;;
+	help|-h|--help)
+		usage
+		;;
+	*)
+		error "Invalid command"
+		usage
+		;;
+esac
 
 # commandes HAL manager:
 # 4a-hal-manager loaded
diff --git a/bin/4a-play b/bin/4a-play
index 894ab7f..483b892 100755
--- a/bin/4a-play
+++ b/bin/4a-play
@@ -1 +1,17 @@
-# TODO: play using aplay
+#!/bin/bash
+
+# load shell lib
+. $(dirname $BASH_SOURCE)/lib4a-tools.sh
+
+function usage() {
+	log "Usage: $0 <role:file1> [role:file2 ...]"
+	log "Available roles:"
+	exit 1
+}
+
+[[ $# == 0 ]] && usage
+
+for x in "$@"; do
+	log "Playing $x ..."
+	aplay -D Loopback,0,2 $x
+done
diff --git a/bin/4a-status b/bin/4a-status
index 519f470..c3e361e 100755
--- a/bin/4a-status
+++ b/bin/4a-status
@@ -1,51 +1,50 @@
 #!/bin/bash
 
-set -o pipefail
+# load shell lib
+. $(dirname $BASH_SOURCE)/lib4a-tools.sh
 
-ERR="\\e[31mERROR\\e[0m"
-WRN="\\e[33mWARNING\\e[0m"
-SUC="\\e[32mSUCCESS\\e[0m"
+set -o pipefail
 
-function cout {
-	echo -e "$*"
-}
+ERR="${color_red}ERROR${color_none}"
+WRN="${color_yellow}WARNING${color_none}"
+SUC="${color_green}SUCCESS${color_none}"
 
 EXIT_CODE=0
 
-SOUND_CARDS=$( LANG="C" aplay -l | grep -oEe "^card\\s+[^\\[]+" | cut -d':' -f2 | uniq )
+# ------------------- enumerate sound cards ------------------------
+
+log "---- Audio cards detected ----"
+LANG="C" aplay -l | grep -oEe "^card\\s+[^\\[]+" | sort -u
+
+# -------------------- snd-aloop ------------------------
 
-cout " -- Is snd-aloop is available?"
+log ""
+log "---- snd-aloop driver availability ----"
 if zcat /proc/config.gz | grep "CONFIG_SND_ALOOP=y" > /dev/null; then
-	cout "     -- $SUC: Built into the kernel"
+	log "$SUC: Built into the kernel"
 else
-	cout "     -- $WRN: Not built into the kernel, devices order can randomly change!"
+	log "$WRN: Not built into the kernel, devices order can randomly change!"
 	if zcat /proc/config.gz | grep "CONFIG_SND_ALOOP=m" > /dev/null; then
-		cout "     -- $SUC: snd-aloop is provided!"
+		log "$SUC: snd-aloop is provided!"
 		if lsmod | grep "snd_aloop" > /dev/null; then
-			cout "     -- $SUC: snd-aloop is loaded!"
+			log "$SUC: snd-aloop is loaded!"
 		else
-			cout "     -- $ERR: snd-aloop is not loaded! 4a-softmixer can't work, please load it using: modprobe snd-aloop"
+			log "$ERR: snd-aloop is not loaded! 4a-softmixer can't work, please load it using: modprobe snd-aloop"
 		fi
 	else
-		cout "     -- $ERR: snd-aloop is not provided at all, 4a-softmixer can't work!"
+		log "$ERR: snd-aloop is not provided at all, 4a-softmixer can't work!"
 		EXIT_CODE=1
 	fi
 fi
 
-cout " -- Is 4a running?"
+log ""
+log "---- 4a service status ----"
 if ps x | grep "service-audio-4a" | grep -v "grep" > /dev/null; then
-	cout "     -- $SUC: Service is currently running!"
+	log "$SUC: Service is currently running!"
 else
-	cout "     -- $WRN: Service is not currently running!"
+	log "$WRN: Service is not currently running!"
+	log "It can be started using the following command:"
+	log "systemctl restart *agl-service-audio-4a*.service"
 fi
 
-
-#SERVICE_FILE=$( basename "$( ls "/var/local/lib/systemd/system/afm-service-agl-service-audio-4a--"* )" )
-
-cout
-cout "Found audio cards:"
-for card in $SOUND_CARDS; do
-	cout "    - $card"
-done
-
 exit $EXIT_CODE
diff --git a/bin/lib4a-tools.sh b/bin/lib4a-tools.sh
new file mode 100644
index 0000000..4029046
--- /dev/null
+++ b/bin/lib4a-tools.sh
@@ -0,0 +1,35 @@
+stdout_in_terminal=0
+[[ -t 1 ]] && stdout_in_terminal=1
+function color {
+	[[ $stdout_in_terminal == 0 ]] && return
+	for k in $*; do
+		case $k in
+			bold) tput bold 2>/dev/null;;
+			none) tput sgr0 2>/dev/null;;
+			*) tput setaf $k 2>/dev/null;;
+		esac
+	done
+}
+color_green=$(color bold 2)
+color_yellow=$(color bold 3)
+color_red=$(color bold 1)
+color_blue=$(color bold 4)
+color_none=$(color none)
+
+function error() { echo "${color_red}$@${color_none}" >&2; }
+function warning() { echo "${color_yellow}$@${color_none}" >&2; }
+function info() { echo "${color_green}$@${color_none}" >&2; }
+function log() { echo "$@" >&2; }
+function debug() { [[ "$DEBUG" == 1 ]] && echo "${color_blue}DEBUG:" "$@" "${color_none}" >&2; }
+
+function 4a-client() {
+	# get port for audio service
+	local port=$(grep -sr X-AFM-http /var/local/lib/systemd/system/afm-service-agl-service-audio-4a*.service | cut -f2 -d'=')
+
+	debug "Detected 4A service on port $port"
+	afb-client-demo -H "localhost:$port/api?token=HELLO&uuid=magic" "$@"
+}
+
+function 4a-roles() {
+	4a-client ahl-4a get_roles "" | tail -n +2 | jq '.response|.[]'
+}
-- 
cgit 1.2.3-korg


From f43f3cb73ff3f8f9c20e8e9efe533ff19e9d3fc6 Mon Sep 17 00:00:00 2001
From: Loïc Collignon <loic.collignon@iot.bzh>
Date: Mon, 23 Jul 2018 00:48:19 +0200
Subject: Fix issue with the unit file detection
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix a bug introduced by the commit e4e0b9b, due to the wildcard in the
unit file.

Change-Id: Iddc47378207a0ced207861433cd0ec02a52bc1a5
Signed-off-by: Loïc Collignon <loic.collignon@iot.bzh>
---
 TODO                                   |   7 -----
 bin/4a-gst                             |   3 --
 bin/4a-play                            |  56 ++++++++++++++++++++++++++++-----
 bin/4a-speaker-test                    |   1 -
 bin/gst-play                           |  56 ---------------------------------
 bin/lib4a-tools.sh                     |   3 +-
 media/tone-440-mono-24000-16bits.wav   | Bin 480044 -> 0 bytes
 media/tone-440-mono-24000-24bits.wav   | Bin 720044 -> 0 bytes
 media/tone-440-mono-24000-32bits.wav   | Bin 960080 -> 0 bytes
 media/tone-440-mono-44100-32bits.wav   | Bin 1764080 -> 0 bytes
 media/tone-440-mono-48000-32bits.wav   | Bin 1920080 -> 0 bytes
 media/tone-440-stereo-44100-16bits.wav | Bin 0 -> 1764044 bytes
 media/tone-440-stereo-44100-24bits.wav | Bin 0 -> 2646044 bytes
 media/tone-440-stereo-48000-16bits.wav | Bin 0 -> 1920044 bytes
 media/tone-440-stereo-48000-24bits.wav | Bin 0 -> 2880044 bytes
 15 files changed, 50 insertions(+), 76 deletions(-)
 delete mode 100644 TODO
 delete mode 100755 bin/4a-gst
 delete mode 100755 bin/4a-speaker-test
 delete mode 100755 bin/gst-play
 delete mode 100644 media/tone-440-mono-24000-16bits.wav
 delete mode 100644 media/tone-440-mono-24000-24bits.wav
 delete mode 100644 media/tone-440-mono-24000-32bits.wav
 delete mode 100644 media/tone-440-mono-44100-32bits.wav
 delete mode 100644 media/tone-440-mono-48000-32bits.wav
 create mode 100644 media/tone-440-stereo-44100-16bits.wav
 create mode 100644 media/tone-440-stereo-44100-24bits.wav
 create mode 100644 media/tone-440-stereo-48000-16bits.wav
 create mode 100644 media/tone-440-stereo-48000-24bits.wav

(limited to 'bin/4a-play')

diff --git a/TODO b/TODO
deleted file mode 100644
index 436b8b3..0000000
--- a/TODO
+++ /dev/null
@@ -1,7 +0,0 @@
-* push OGG file
-* finish script 4a-api (calls to AHL/Hal-manager)
-* add script for basic aplay on role or device
-* add script for basic gst-launch on role or device
-* add script for speaker test on role or device
-* add script to play with mediaplayer api: list / play / stop / next / prev ...
-* add script to play with radio api
diff --git a/bin/4a-gst b/bin/4a-gst
deleted file mode 100755
index 9a06c83..0000000
--- a/bin/4a-gst
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-gst-launch-1.0 -v uridecodebin uri=file:///media/OrchestralBackgroundMusic.mp3 ! audioconvert ! audioresample ! alsasink device=hw:Loopback,0,2
diff --git a/bin/4a-play b/bin/4a-play
index 483b892..620f311 100755
--- a/bin/4a-play
+++ b/bin/4a-play
@@ -4,14 +4,54 @@
 . $(dirname $BASH_SOURCE)/lib4a-tools.sh
 
 function usage() {
-	log "Usage: $0 <role:file1> [role:file2 ...]"
-	log "Available roles:"
-	exit 1
+	log "$0 <file> [device] [role]"
+	log "    - 'device' can be hw:X where X is a number or the device name."
+	log "      It can also be hw:X,Y,Z, it is used when playing on the loopback card"
+	log "      which is the 4a default sink."
+	log "      Default: hw:Loopback,0,2"
+	log "    - 'role' is the 4a role to use. In future version it will be guessed"
+	log "      based on the device. Use '4a-api roles' to get a list of known roles"
+	log "      Default: multimedia"
 }
 
-[[ $# == 0 ]] && usage
+if [ "$#" == "0" ]; then
+	error "No file to play!"
+	usage
+fi
+
+FILEPATH="$( realpath "$1" )"
+DEVICE=${2:-'hw:Loopback,0,2'}
+ROLE=${3:-'multimedia'}
+
+CARDID=$( echo "$DEVICE" | cut -d':' -f2 | cut -d',' -f1 )
+
+log "Play '$FILEPATH' on '$DEVICE'"
+
+LOOPBACK_CARDID=$( LANG="C" aplay -l | grep -oEe "^card\\s+[0-9]: Loopback" | uniq | grep -oEe "[0-9]+" )
+if [ "$CARDID" == "Loopback" ] || [ "$CARDID" == "$LOOPBACK_CARDID" ]; then
+	IS_4A_DEVICE=1
+else
+	IS_4A_DEVICE=0
+fi
+
+if [ "$IS_4A_DEVICE" == "1" ]; then
+	log "The selected card (hw:$CARDID) is handle by 4a, call open on '$ROLE'"
+	4a-client ahl-4a "$ROLE" '{ "action": "open" }'
+
+	# BUG: afb-client-demo does not exit an exit code different from zero when api return an error
+	#if [ "$?" -ne "0" ]; then
+	#	exit -1
+	#fi
+fi
+
+if [ "$DEBUG" == "1" ]; then
+	gst-launch-1.0 -v uridecodebin uri="file://$FILEPATH" ! audioconvert ! audioresample ! alsasink device="$DEVICE"
+else
+	gst-launch-1.0 -v uridecodebin uri="file://$FILEPATH" ! audioconvert ! audioresample ! alsasink device="$DEVICE" > /dev/null
+fi
+
+if [ "$IS_4A_DEVICE" == "1" ]; then
+	log "The selected card (hw;$CARDID) is handled by 4a, call close on '$ROLE'"
+	4a-client ahl-4a "$ROLE" '{ "action": "close" }'
+fi
 
-for x in "$@"; do
-	log "Playing $x ..."
-	aplay -D Loopback,0,2 $x
-done
diff --git a/bin/4a-speaker-test b/bin/4a-speaker-test
deleted file mode 100755
index 770ddfd..0000000
--- a/bin/4a-speaker-test
+++ /dev/null
@@ -1 +0,0 @@
-# TODO: run speaker test
diff --git a/bin/gst-play b/bin/gst-play
deleted file mode 100755
index 46a6c4a..0000000
--- a/bin/gst-play
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/bash
-
-# load shell lib
-. $(dirname $BASH_SOURCE)/lib4a-tools.sh
-
-function usage() {
-	log "$0 <file> [device] [role]"
-	log "    - 'device' can be hw:X where X is a number or the device name."
-	log "      It can also be hw:X,Y,Z, it is used when playing on the loopback card"
-	log "      which is the 4a default sink."
-	log "      Default: hw:Loopback,0,2"
-	log "    - 'role' is the 4a role to use. In future version it will be guessed"
-	log "      based on the device. Use '4a-api roles' to get a list of known roles"
-	log "      Default: multimedia"
-}
-
-if [ "$#" == "0" ]; then
-	error "No file to play!"
-	usage
-fi
-
-FILEPATH="$( realpath "$1" )"
-DEVICE=${2:-'hw:Loopback,0,2'}
-ROLE=${3:-'multimedia'}
-
-CARDID=$( echo "$DEVICE" | cut -d':' -f2 | cut -d',' -f1 )
-
-log "Play '$FILEPATH' on '$DEVICE'"
-
-LOOPBACK_CARDID=$( LANG="C" aplay -l | grep -oEe "^card\\s+[0-9]: Loopback" | uniq | grep -oEe "[0-9]+" )
-if [ "$CARDID" == "Loopback" ] || [ "$CARDID" == "$LOOPBACK_CARDID" ]; then
-	IS_4A_DEVICE=1
-else
-	IS_4A_DEVICE=0
-fi
-
-if [ "$IS_4A_DEVICE" == "1" ]; then
-	log "The selected card (hw:$CARDID) is handle by 4a, call open on '$ROLE'"
-	4a-client ahl-4a "$ROLE" '{ "action": "open" }'
-
-	# BUG: afb-client-demo does not exit an exit code different from zero when api return an error
-	#if [ "$?" -ne "0" ]; then
-	#	exit -1
-	#fi
-fi
-
-if [ "$DEBUG" == "1" ]; then
-	gst-launch-1.0 -v uridecodebin uri="file://$FILEPATH" ! audioconvert ! audioresample ! alsasink device="$DEVICE"
-else
-	gst-launch-1.0 -v uridecodebin uri="file://$FILEPATH" ! audioconvert ! audioresample ! alsasink device="$DEVICE" > /dev/null
-fi
-
-if [ "$IS_4A_DEVICE" == "1" ]; then
-	log "The selected card (hw;$CARDID) is handled by 4a, call close on '$ROLE'"
-	4a-client ahl-4a "$ROLE" '{ "action": "close" }'
-fi
diff --git a/bin/lib4a-tools.sh b/bin/lib4a-tools.sh
index ab0ee18..776b1c0 100644
--- a/bin/lib4a-tools.sh
+++ b/bin/lib4a-tools.sh
@@ -26,8 +26,9 @@ function 4a-client() {
 	# get port for audio service
 	local port=""
 	local token="HELLO"
+	local unitfile=$( ls /var/local/lib/systemd/system/afm-service-agl-service-audio-4a*.service )
 
-	if [ -f "/var/local/lib/systemd/system/afm-service-agl-service-audio-4a*.service" ]; then
+	if [ -f "$unitfile" ]; then
 		log "Detected systemd unit file!"
 		port=$( grep -sr X-AFM-http /var/local/lib/systemd/system/afm-service-agl-service-audio-4a*.service | cut -f2 -d'=' )
 		log "Port detected: $port"
diff --git a/media/tone-440-mono-24000-16bits.wav b/media/tone-440-mono-24000-16bits.wav
deleted file mode 100644
index ce57beb..0000000
Binary files a/media/tone-440-mono-24000-16bits.wav and /dev/null differ
diff --git a/media/tone-440-mono-24000-24bits.wav b/media/tone-440-mono-24000-24bits.wav
deleted file mode 100644
index 54d88b0..0000000
Binary files a/media/tone-440-mono-24000-24bits.wav and /dev/null differ
diff --git a/media/tone-440-mono-24000-32bits.wav b/media/tone-440-mono-24000-32bits.wav
deleted file mode 100644
index 6b6f5a5..0000000
Binary files a/media/tone-440-mono-24000-32bits.wav and /dev/null differ
diff --git a/media/tone-440-mono-44100-32bits.wav b/media/tone-440-mono-44100-32bits.wav
deleted file mode 100644
index 4237d49..0000000
Binary files a/media/tone-440-mono-44100-32bits.wav and /dev/null differ
diff --git a/media/tone-440-mono-48000-32bits.wav b/media/tone-440-mono-48000-32bits.wav
deleted file mode 100644
index 1b262db..0000000
Binary files a/media/tone-440-mono-48000-32bits.wav and /dev/null differ
diff --git a/media/tone-440-stereo-44100-16bits.wav b/media/tone-440-stereo-44100-16bits.wav
new file mode 100644
index 0000000..d5c685f
Binary files /dev/null and b/media/tone-440-stereo-44100-16bits.wav differ
diff --git a/media/tone-440-stereo-44100-24bits.wav b/media/tone-440-stereo-44100-24bits.wav
new file mode 100644
index 0000000..e800d37
Binary files /dev/null and b/media/tone-440-stereo-44100-24bits.wav differ
diff --git a/media/tone-440-stereo-48000-16bits.wav b/media/tone-440-stereo-48000-16bits.wav
new file mode 100644
index 0000000..9c5d8c9
Binary files /dev/null and b/media/tone-440-stereo-48000-16bits.wav differ
diff --git a/media/tone-440-stereo-48000-24bits.wav b/media/tone-440-stereo-48000-24bits.wav
new file mode 100644
index 0000000..06b448f
Binary files /dev/null and b/media/tone-440-stereo-48000-24bits.wav differ
-- 
cgit 1.2.3-korg


From 4d67fb6cfb56d0abd8ec1c9149b88efd4828935d Mon Sep 17 00:00:00 2001
From: Thierry Bultel <thierry.bultel@iot.bzh>
Date: Wed, 24 Apr 2019 13:42:49 +0200
Subject: 4a-aplay: added avirt detection

Adds the detection of avirt of electing the default
playback device.

Signed-off-by: Thierry Bultel <thierry.bultel@iot.bzh>
---
 bin/4a-play | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'bin/4a-play')

diff --git a/bin/4a-play b/bin/4a-play
index 620f311..7650d4d 100755
--- a/bin/4a-play
+++ b/bin/4a-play
@@ -19,8 +19,15 @@ if [ "$#" == "0" ]; then
 	usage
 fi
 
+avirt=$(cat /proc/modules | grep avirt_ap_loopback | head -n1 | cut -d ' ' -f 1)
+if [ x$avirt == x ]; then
+hwdev=Loopback,0,2
+else
+hwdev=avirt,0
+fi
+
 FILEPATH="$( realpath "$1" )"
-DEVICE=${2:-'hw:Loopback,0,2'}
+DEVICE=${2:-"hw:$hwdev"}
 ROLE=${3:-'multimedia'}
 
 CARDID=$( echo "$DEVICE" | cut -d':' -f2 | cut -d',' -f1 )
-- 
cgit 1.2.3-korg