From 39dc83bd82cd4c4c2b9db485f6f33af43548f21c Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@musicpd.org>
Date: Tue, 19 Dec 2017 10:36:32 +0100
Subject: [PATCH] output/Print: print the plugin name

---
 NEWS                    | 1 +
 doc/protocol.xml        | 1 +
 src/output/Control.cxx  | 6 ++++++
 src/output/Control.hxx  | 3 +++
 src/output/Filtered.hxx | 4 ++++
 src/output/Print.cxx    | 5 ++++-
 6 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 4812e159e..e30950bd2 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@ ver 0.21 (not yet released)
 * protocol
   - "tagtypes" can be used to hide tags
   - "find" and "search" can sort
+  - "outputs" prints the plugin name
   - close connection when client sends HTTP request
 * tags
   - new tag "OriginalDate"
diff --git a/doc/protocol.xml b/doc/protocol.xml
index 16f6b0683..517e89caa 100644
--- a/doc/protocol.xml
+++ b/doc/protocol.xml
@@ -2521,6 +2521,7 @@ OK
             <screen>
 outputid: 0
 outputname: My ALSA Device
+plugin: alsa
 outputenabled: 0
 OK
             </screen>
diff --git a/src/output/Control.cxx b/src/output/Control.cxx
index 468a48ec7..f75bb2134 100644
--- a/src/output/Control.cxx
+++ b/src/output/Control.cxx
@@ -58,6 +58,12 @@ AudioOutputControl::GetName() const noexcept
 	return output->GetName();
 }
 
+const char *
+AudioOutputControl::GetPluginName() const noexcept
+{
+	return output->GetPluginName();
+}
+
 const char *
 AudioOutputControl::GetLogName() const noexcept
 {
diff --git a/src/output/Control.hxx b/src/output/Control.hxx
index 5e1c39554..2c230f5bf 100644
--- a/src/output/Control.hxx
+++ b/src/output/Control.hxx
@@ -232,6 +232,9 @@ public:
 	gcc_pure
 	const char *GetName() const noexcept;
 
+	gcc_pure
+	const char *GetPluginName() const noexcept;
+
 	gcc_pure
 	const char *GetLogName() const noexcept;
 
diff --git a/src/output/Filtered.hxx b/src/output/Filtered.hxx
index 4f0a8713d..f2195b83d 100644
--- a/src/output/Filtered.hxx
+++ b/src/output/Filtered.hxx
@@ -147,6 +147,10 @@ public:
 		return name;
 	}
 
+	const char *GetPluginName() const noexcept {
+		return plugin_name;
+	}
+
 	const char *GetLogName() const noexcept {
 		return log_name.c_str();
 	}
diff --git a/src/output/Print.cxx b/src/output/Print.cxx
index d2d39b898..1fb7eb0ed 100644
--- a/src/output/Print.cxx
+++ b/src/output/Print.cxx
@@ -36,7 +36,10 @@ printAudioDevices(Response &r, const MultipleOutputs &outputs)
 
 		r.Format("outputid: %u\n"
 			 "outputname: %s\n"
+			 "plugin: %s\n"
 			 "outputenabled: %i\n",
-			 i, ao.GetName(), ao.IsEnabled());
+			 i,
+			 ao.GetName(), ao.GetPluginName(),
+			 ao.IsEnabled());
 	}
 }