From 5b0a02eb31dd804deeaf2c357522ab15b390a673 Mon Sep 17 00:00:00 2001
From: Carl Suster <carl@contraflo.ws>
Date: Fri, 5 Apr 2019 18:56:34 +1100
Subject: [PATCH] bpd: don't send volume if zero in status

---
 beetsplug/bpd/__init__.py | 4 +++-
 test/test_player.py       | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/beetsplug/bpd/__init__.py b/beetsplug/bpd/__init__.py
index 4432ab526..dc7f64db7 100644
--- a/beetsplug/bpd/__init__.py
+++ b/beetsplug/bpd/__init__.py
@@ -309,7 +309,6 @@ class BaseServer(object):
         playlist, playlistlength, and xfade.
         """
         yield (
-            u'volume: ' + six.text_type(self.volume),
             u'repeat: ' + six.text_type(int(self.repeat)),
             u'random: ' + six.text_type(int(self.random)),
             u'consume: ' + six.text_type(int(self.consume)),
@@ -319,6 +318,9 @@ class BaseServer(object):
             u'mixrampdb: ' + six.text_type(self.mixrampdb),
         )
 
+        if self.volume > 0:
+            yield u'volume: ' + six.text_type(self.volume)
+
         if not math.isnan(self.mixrampdelay):
             yield u'mixrampdelay: ' + six.text_type(self.mixrampdelay)
         if self.crossfade > 0:
diff --git a/test/test_player.py b/test/test_player.py
index 98fd13f63..aa3c3d6a8 100644
--- a/test/test_player.py
+++ b/test/test_player.py
@@ -384,7 +384,7 @@ class BPDQueryTest(BPDTestHelper):
         fields_not_playing = {
             'repeat', 'random', 'single', 'consume', 'playlist',
             'playlistlength', 'mixrampdb', 'state',
-            'volume'  # not (always?) returned by MPD
+            'volume'
         }
         self.assertEqual(fields_not_playing, set(responses[0].data.keys()))
         fields_playing = fields_not_playing | {