From a564f192f808841ad8dfa9a4aa6c8db3335bd6fd Mon Sep 17 00:00:00 2001
From: "Steinar H. Gunderson" <sgunderson@bigfoot.com>
Date: Sat, 17 Sep 2016 22:26:47 +0200
Subject: [PATCH] Move InputMapping and friends into its own header file.

---
 audio_mixer.h   | 41 +----------------------------------------
 input_mapping.h | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 40 deletions(-)
 create mode 100644 input_mapping.h

diff --git a/audio_mixer.h b/audio_mixer.h
index 21ea371..7ae5464 100644
--- a/audio_mixer.h
+++ b/audio_mixer.h
@@ -25,6 +25,7 @@
 #include "defs.h"
 #include "ebu_r128_proc.h"
 #include "filter.h"
+#include "input_mapping.h"
 #include "resampling_queue.h"
 #include "stereocompressor.h"
 
@@ -32,26 +33,6 @@ namespace bmusb {
 struct AudioFormat;
 }  // namespace bmusb
 
-enum class InputSourceType { SILENCE, CAPTURE_CARD, ALSA_INPUT };
-struct DeviceSpec {
-	InputSourceType type;
-	unsigned index;
-
-	bool operator== (const DeviceSpec &other) const {
-		return type == other.type && index == other.index;
-	}
-
-	bool operator< (const DeviceSpec &other) const {
-		if (type != other.type)
-			return type < other.type;
-		return index < other.index;
-	}
-};
-struct DeviceInfo {
-	std::string display_name;
-	unsigned num_channels;
-};
-
 enum EQBand {
 	EQ_BAND_BASS = 0,
 	EQ_BAND_MID,
@@ -59,26 +40,6 @@ enum EQBand {
 	NUM_EQ_BANDS
 };
 
-static inline uint64_t DeviceSpec_to_key(const DeviceSpec &device_spec)
-{
-	return (uint64_t(device_spec.type) << 32) | device_spec.index;
-}
-
-static inline DeviceSpec key_to_DeviceSpec(uint64_t key)
-{
-	return DeviceSpec{ InputSourceType(key >> 32), unsigned(key & 0xffffffff) };
-}
-
-struct InputMapping {
-	struct Bus {
-		std::string name;
-		DeviceSpec device;
-		int source_channel[2] { -1, -1 };  // Left and right. -1 = none.
-	};
-
-	std::vector<Bus> buses;
-};
-
 class AudioMixer {
 public:
 	AudioMixer(unsigned num_cards);
diff --git a/input_mapping.h b/input_mapping.h
new file mode 100644
index 0000000..a1e90eb
--- /dev/null
+++ b/input_mapping.h
@@ -0,0 +1,49 @@
+#ifndef _INPUT_MAPPING_H
+#define _INPUT_MAPPING_H 1
+
+#include <stdint.h>
+#include <string>
+#include <vector>
+
+enum class InputSourceType { SILENCE, CAPTURE_CARD, ALSA_INPUT };
+struct DeviceSpec {
+	InputSourceType type;
+	unsigned index;
+
+	bool operator== (const DeviceSpec &other) const {
+		return type == other.type && index == other.index;
+	}
+
+	bool operator< (const DeviceSpec &other) const {
+		if (type != other.type)
+			return type < other.type;
+		return index < other.index;
+	}
+};
+struct DeviceInfo {
+	std::string display_name;
+	unsigned num_channels;
+	std::string alsa_name, alsa_info, alsa_address;  // ALSA devices only, obviously.
+};
+
+static inline uint64_t DeviceSpec_to_key(const DeviceSpec &device_spec)
+{
+	return (uint64_t(device_spec.type) << 32) | device_spec.index;
+}
+
+static inline DeviceSpec key_to_DeviceSpec(uint64_t key)
+{
+	return DeviceSpec{ InputSourceType(key >> 32), unsigned(key & 0xffffffff) };
+}
+
+struct InputMapping {
+	struct Bus {
+		std::string name;
+		DeviceSpec device;
+		int source_channel[2] { -1, -1 };  // Left and right. -1 = none.
+	};
+
+	std::vector<Bus> buses;
+};
+
+#endif  // !defined(_INPUT_MAPPING_H)
-- 
2.39.2