Add readcomments and toggleoutput commands

[python-musicpd.git] / musicpd.py

diff --git a/musicpd.py b/musicpd.py
index 864337e711baeb4ffa1cf05841df5c2acd87d3c0..f365bb021027948bf731e18dd5dc08d47a31575b 100644 (file)
--- a/musicpd.py
+++ b/musicpd.py
@@ -131,6 +131,7 @@ class MPDClient(object):
             "searchaddpl":        self._fetch_nothing,
             "update":             self._fetch_item,
             "rescan":             self._fetch_item,
+            "readcomments":       self._fetch_object,
             # Sticker Commands
             "sticker get":        self._fetch_item,
             "sticker set":        self._fetch_nothing,
@@ -145,6 +146,7 @@ class MPDClient(object):
             # Audio Output Commands
             "disableoutput":      self._fetch_nothing,
             "enableoutput":       self._fetch_nothing,
+            "toggleoutput":       self._fetch_nothing,
             "outputs":            self._fetch_outputs,
             # Reflection Commands
             "commands":           self._fetch_list,
@@ -440,7 +442,7 @@ class MPDClient(object):
             self._rfile.close()
         if hasattr(self._wfile, 'close'):
             self._wfile.close()
-        if isinstance(self._sock, socket.socket):
+        if hasattr(self._sock, 'close'):
             self._sock.close()
         self._reset()