From b67d7e02e9c0fcfdd59fab7f0a63db6009cb9843 Mon Sep 17 00:00:00 2001
From: "Diaz de Grenu, Jose" <Jose.DiazdeGrenu@digi.com>
Date: Thu, 14 Jul 2016 17:16:42 +0200
Subject: [PATCH] Revert "meta-digi-dey: pulseaudio: add HDMI audio sink on
 hotplug"

When module-alsa-sink is used, the audio is sometimes heard with
reverb. We will go back to module-udev-detect, so the functionality
introduced in the commit being reverted won't longer work.

This reverts commit fca507d316ded1e3126ba6db265b7fe871550fae.

https://jira.digi.com/browse/DEL-2587

Signed-off-by: Jose Diaz de Grenu de Pedro <Jose.DiazdeGrenudePedro@digi.com>
---
 .../pulseaudio/pulseaudio/hdmi_hotplug.sh      | 18 ------------------
 .../pulseaudio/pulseaudio_%.bbappend           | 14 --------------
 2 files changed, 32 deletions(-)
 delete mode 100644 meta-digi-dey/recipes-multimedia/pulseaudio/pulseaudio/hdmi_hotplug.sh

diff --git a/meta-digi-dey/recipes-multimedia/pulseaudio/pulseaudio/hdmi_hotplug.sh b/meta-digi-dey/recipes-multimedia/pulseaudio/pulseaudio/hdmi_hotplug.sh
deleted file mode 100644
index 63ce0772e..000000000
--- a/meta-digi-dey/recipes-multimedia/pulseaudio/pulseaudio/hdmi_hotplug.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-#
-# Called from udev on HDMI plug/unplug event
-
-# Find HDMI card number
-for card in /sys/class/sound/card*; do
-	if readlink ${card}/device | grep -qs hdmi; then
-		HDMI_CARD="${card##/sys/class/sound/card}"
-	fi
-done
-
-# On HDMI plugin event, if the sink has not been loaded yet, load the
-# HDMI audio sink from ALSA
-if [ "${EVENT}" = "plugin" ]; then
-	if ! pactl list sinks | grep -qs "imx-hdmi-soc"; then
-		pactl load-module module-alsa-sink device=hw:${HDMI_CARD}
-	fi
-fi
diff --git a/meta-digi-dey/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend b/meta-digi-dey/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend
index 47dc37227..8c02716bc 100644
--- a/meta-digi-dey/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend
+++ b/meta-digi-dey/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend
@@ -1,16 +1,2 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
-
-SRC_URI += "file://hdmi_hotplug.sh"
-
 # Do not include module-udev-detect so that module-detect is used instead
 RDEPENDS_pulseaudio-server_remove = "pulseaudio-module-udev-detect"
-
-do_install_append() {
-	install -d ${D}${sysconfdir}/udev/scripts
-	install -m 0755 ${WORKDIR}/hdmi_hotplug.sh ${D}${sysconfdir}/udev/scripts
-
-	cat >> ${D}${base_libdir}/udev/rules.d/90-pulseaudio.rules <<-_EOL_
-
-		SUBSYSTEM=="platform", KERNEL=="*hdmi_video", ACTION=="change", RUN+="/etc/udev/scripts/hdmi_hotplug.sh"
-	_EOL_
-}