From 0fc12438dbf4f108e36b4912c86cfa429ad6be2b Mon Sep 17 00:00:00 2001
From: TangoCash <eric@loxat.de>
Date: Sat, 7 Oct 2017 23:02:24 +0200
Subject: [PATCH] armbox: remove audiomixers

---
 libarmbox/Makefile.am |  1 -
 libarmbox/audio.cpp   | 14 +++++++++-----
 libarmbox/audio_lib.h |  2 ++
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/libarmbox/Makefile.am b/libarmbox/Makefile.am
index e3218f7..f39cd65 100644
--- a/libarmbox/Makefile.am
+++ b/libarmbox/Makefile.am
@@ -21,7 +21,6 @@ libarmbox_la_SOURCES = \
 	dmx.cpp \
 	video.cpp \
 	audio.cpp \
-	audio_mixer.cpp \
 	init.cpp \
 	playback_gst.cpp \
 	pwrmngr.cpp \
diff --git a/libarmbox/audio.cpp b/libarmbox/audio.cpp
index 9e5960b..3713be4 100644
--- a/libarmbox/audio.cpp
+++ b/libarmbox/audio.cpp
@@ -8,7 +8,7 @@
 
 #include <linux/dvb/audio.h>
 #include "audio_lib.h"
-#include "audio_mixer.h"
+//#include "audio_mixer.h"
 #include "lt_debug.h"
 
 #define AUDIO_DEVICE	"/dev/dvb/adapter0/audio0"
@@ -38,9 +38,11 @@ cAudio::cAudio(void *, void *, void *)
 	clipfd = -1;
 	mixer_fd = -1;
 
+/*
 	mixerAnalog = mixerHDMI = mixerSPDIF = NULL;
 	volumeAnalog = volumeHDMI = volumeSPDIF = 0;
-	mixersMuted = false;
+	mixersMuted = false
+*/
 
 	openDevice();
 	Muted = false;
@@ -48,13 +50,13 @@ cAudio::cAudio(void *, void *, void *)
 
 cAudio::~cAudio(void)
 {
-	closeMixers();
+	//closeMixers();
 	closeDevice();
 }
 
 void cAudio::openDevice(void)
 {
-	openMixers();
+	//openMixers();
 
 	if (fd < 0)
 	{
@@ -69,7 +71,7 @@ void cAudio::openDevice(void)
 
 void cAudio::closeDevice(void)
 {
-	closeMixers();
+	//closeMixers();
 
 	if (fd > -1) {
 		close(fd);
@@ -425,6 +427,7 @@ void cAudio::setBypassMode(bool disable)
 		lt_info("%s AUDIO_SET_BYPASS_MODE %d: %m\n", __func__, mode);
 }
 
+#if 0
 void cAudio::openMixers(void)
 {
 	if (!mixerAnalog)
@@ -476,3 +479,4 @@ void cAudio::muteMixers(bool m)
 		setMixerVolume("SPDIF", volumeSPDIF, false);
 	}
 }
+#endif
diff --git a/libarmbox/audio_lib.h b/libarmbox/audio_lib.h
index 8a71732..5fb3e9c 100644
--- a/libarmbox/audio_lib.h
+++ b/libarmbox/audio_lib.h
@@ -100,10 +100,12 @@ class cAudio
 		void ScheduleMute(bool On);
 		void EnableAnalogOut(bool enable);
 
+#if 0
 		void openMixers(void);
 		void closeMixers(void);
 		void setMixerVolume(const char *name, long value, bool remember = true);
 		void muteMixers(bool m = true);
+#endif
 };
 
 #endif