adding replay_gain_mode and replay_gain_status commands

diff --git a/doc/commands.txt b/doc/commands.txt
index 969990c7ff8d126869eee868ee28b72cf8c816fa..d71063f40ad9b3138a673fac4d4fc471c4fdfc2d 100644 (file)
--- a/doc/commands.txt
+++ b/doc/commands.txt
@@ -1,97 +1,99 @@
 == Status Commands
-clearerror                               -> fetch_nothing
-currentsong                              -> fetch_object
-idle             [<str>]                 -> fetch_list
-noidle                                   -> None
-status                                   -> fetch_object
-stats                                    -> fetch_object
+clearerror                                 -> fetch_nothing
+currentsong                                -> fetch_object
+idle               [<str>]                 -> fetch_list
+noidle                                     -> None
+status                                     -> fetch_object
+stats                                      -> fetch_object
 
 == Playback Option Commands
-consume          <bool>                  -> fetch_nothing
-crossfade        <int>                   -> fetch_nothing
-mixrampdb        <str>                   -> fetch_nothing
-mixrampdelay     <int>                   -> fetch_nothing
-random           <bool>                  -> fetch_nothing
-repeat           <bool>                  -> fetch_nothing
-setvol           <int>                   -> fetch_nothing
-single           <bool>                  -> fetch_nothing
-volume           <int>                   -> fetch_nothing
+consume            <bool>                  -> fetch_nothing
+crossfade          <int>                   -> fetch_nothing
+mixrampdb          <str>                   -> fetch_nothing
+mixrampdelay       <int>                   -> fetch_nothing
+random             <bool>                  -> fetch_nothing
+repeat             <bool>                  -> fetch_nothing
+setvol             <int>                   -> fetch_nothing
+single             <bool>                  -> fetch_nothing
+replay_gain_mode   <str>                   -> fetch_nothing
+replay_gain_status                         -> fetch_item
+volume             <int>                   -> fetch_nothing
 
 == Playback Control Commands
-next                                     -> fetch_nothing
-pause            [<bool>]                -> fetch_nothing
-play             [<int>]                 -> fetch_nothing
-playid           [<int>]                 -> fetch_nothing
-previous                                 -> fetch_nothing
-seek             <int> <int>             -> fetch_nothing
-seekid           <int> <int>             -> fetch_nothing
-stop                                     -> fetch_nothing
+next                                       -> fetch_nothing
+pause              [<bool>]                -> fetch_nothing
+play               [<int>]                 -> fetch_nothing
+playid             [<int>]                 -> fetch_nothing
+previous                                   -> fetch_nothing
+seek               <int> <int>             -> fetch_nothing
+seekid             <int> <int>             -> fetch_nothing
+stop                                       -> fetch_nothing
 
 == Playlist Commands
-add              <str>                   -> fetch_nothing
-addid            <str> [<int>]           -> fetch_item
-clear                                    -> fetch_nothing
-delete           <int>                   -> fetch_nothing
-deleteid         <int>                   -> fetch_nothing
-move             <int> <int>             -> fetch_nothing
-moveid           <int> <int>             -> fetch_nothing
-playlist                                 -> fetch_playlist
-playlistfind     <locate>                -> fetch_songs
-playlistid       [<int>]                 -> fetch_songs
-playlistinfo     [<int>]                 -> fetch_songs
-playlistsearch   <locate>                -> fetch_songs
-plchanges        <int>                   -> fetch_songs
-plchangesposid   <int>                   -> fetch_changes
-shuffle          [<str>]                 -> fetch_nothing
-swap             <int> <int>             -> fetch_nothing
-swapid           <int> <int>             -> fetch_nothing
+add                <str>                   -> fetch_nothing
+addid              <str> [<int>]           -> fetch_item
+clear                                      -> fetch_nothing
+delete             <int>                   -> fetch_nothing
+deleteid           <int>                   -> fetch_nothing
+move               <int> <int>             -> fetch_nothing
+moveid             <int> <int>             -> fetch_nothing
+playlist                                   -> fetch_playlist
+playlistfind       <locate>                -> fetch_songs
+playlistid         [<int>]                 -> fetch_songs
+playlistinfo       [<int>]                 -> fetch_songs
+playlistsearch     <locate>                -> fetch_songs
+plchanges          <int>                   -> fetch_songs
+plchangesposid     <int>                   -> fetch_changes
+shuffle            [<str>]                 -> fetch_nothing
+swap               <int> <int>             -> fetch_nothing
+swapid             <int> <int>             -> fetch_nothing
 
 == Stored Playlist Commands
-listplaylist     <str>                   -> fetch_list
-listplaylistinfo <str>                   -> fetch_songs
-listplaylists                            -> fetch_playlists
-load             <str>                   -> fetch_nothing
-playlistadd      <str> <str>             -> fetch_nothing
-playlistclear    <str>                   -> fetch_nothing
-playlistdelete   <str> <int>             -> fetch_nothing
-playlistmove     <str> <int> <int>       -> fetch_nothing
-rename           <str> <str>             -> fetch_nothing
-rm               <str>                   -> fetch_nothing
-save             <str>                   -> fetch_nothing
+listplaylist       <str>                   -> fetch_list
+listplaylistinfo   <str>                   -> fetch_songs
+listplaylists                              -> fetch_playlists
+load               <str>                   -> fetch_nothing
+playlistadd        <str> <str>             -> fetch_nothing
+playlistclear      <str>                   -> fetch_nothing
+playlistdelete     <str> <int>             -> fetch_nothing
+playlistmove       <str> <int> <int>       -> fetch_nothing
+rename             <str> <str>             -> fetch_nothing
+rm                 <str>                   -> fetch_nothing
+save               <str>                   -> fetch_nothing
 
 == Database Commands
-count            <locate>                -> fetch_object
-find             <locate>                -> fetch_songs
-findadd          <locate>                -> fetch_nothing
-list             <str> [<locate>]        -> fetch_list
-listall          [<str>]                 -> fetch_database
-listallinfo      [<str>]                 -> fetch_database
-lsinfo           [<str>]                 -> fetch_database
-search           <locate>                -> fetch_songs
-update           [<str>]                 -> fetch_item
-rescan           [<str>]                 -> fetch_item
+count              <locate>                -> fetch_object
+find               <locate>                -> fetch_songs
+findadd            <locate>                -> fetch_nothing
+list               <str> [<locate>]        -> fetch_list
+listall            [<str>]                 -> fetch_database
+listallinfo        [<str>]                 -> fetch_database
+lsinfo             [<str>]                 -> fetch_database
+search             <locate>                -> fetch_songs
+update             [<str>]                 -> fetch_item
+rescan             [<str>]                 -> fetch_item
 
 == Sticker Commands
-sticker get      <str> <str> <str>       -> fetch_item
-sticker set      <str> <str> <str> <str> -> fetch_nothing
-sticker delete   <str> <str> [<str>]     -> fetch_nothing
-sticker list     <str> <str>             -> fetch_list
-sticker find     <str> <str> <str>       -> fetch_songs
+sticker   get      <str> <str> <str>       -> fetch_item
+sticker   set      <str> <str> <str> <str> -> fetch_nothing
+sticker   delete   <str> <str> [<str>]     -> fetch_nothing
+sticker   list     <str> <str>             -> fetch_list
+sticker   find     <str> <str> <str>       -> fetch_songs
 
 == Connection Commands
-close                                    -> None
-kill                                     -> None
-password         <str>                   -> fetch_nothing
-ping                                     -> fetch_nothing
+close                                      -> None
+kill                                       -> None
+password           <str>                   -> fetch_nothing
+ping                                       -> fetch_nothing
 
 == Audio Output Commands
-disableoutput    <int>                   -> fetch_nothing
-enableoutput     <int>                   -> fetch_nothing
-outputs                                  -> fetch_outputs
+disableoutput      <int>                   -> fetch_nothing
+enableoutput       <int>                   -> fetch_nothing
+outputs                                    -> fetch_outputs
 
 == Reflection Commands
-commands                                 -> fetch_list
-notcommands                              -> fetch_list
-tagtypes                                 -> fetch_list
-urlhandlers                              -> fetch_list
-decoders                                 -> fetch_plugins
+commands                                   -> fetch_list
+notcommands                                -> fetch_list
+tagtypes                                   -> fetch_list
+urlhandlers                                -> fetch_list
+decoders                                   -> fetch_plugins

diff --git a/mpd.py b/mpd.py
index 5973a39b34c5580b3a885e67a232c76b5649d8fd..05a78297d82a4d477d9ede7eea1d09b21d90f6a8 100644 (file)
--- a/mpd.py
+++ b/mpd.py
@@ -58,93 +58,95 @@ class MPDClient(object):
         self._reset()
         self._commands = {
             # Status Commands
-            "clearerror":       self._fetch_nothing,
-            "currentsong":      self._fetch_object,
-            "idle":             self._fetch_list,
-            "noidle":           None,
-            "status":           self._fetch_object,
-            "stats":            self._fetch_object,
+            "clearerror":         self._fetch_nothing,
+            "currentsong":        self._fetch_object,
+            "idle":               self._fetch_list,
+            "noidle":             None,
+            "status":             self._fetch_object,
+            "stats":              self._fetch_object,
             # Playback Option Commands
-            "consume":          self._fetch_nothing,
-            "crossfade":        self._fetch_nothing,
-            "mixrampdb":        self._fetch_nothing,
-            "mixrampdelay":     self._fetch_nothing,
-            "random":           self._fetch_nothing,
-            "repeat":           self._fetch_nothing,
-            "setvol":           self._fetch_nothing,
-            "single":           self._fetch_nothing,
-            "volume":           self._fetch_nothing,
+            "consume":            self._fetch_nothing,
+            "crossfade":          self._fetch_nothing,
+            "mixrampdb":          self._fetch_nothing,
+            "mixrampdelay":       self._fetch_nothing,
+            "random":             self._fetch_nothing,
+            "repeat":             self._fetch_nothing,
+            "setvol":             self._fetch_nothing,
+            "single":             self._fetch_nothing,
+            "replay_gain_mode":   self._fetch_nothing,
+            "replay_gain_status": self._fetch_item,
+            "volume":             self._fetch_nothing,
             # Playback Control Commands
-            "next":             self._fetch_nothing,
-            "pause":            self._fetch_nothing,
-            "play":             self._fetch_nothing,
-            "playid":           self._fetch_nothing,
-            "previous":         self._fetch_nothing,
-            "seek":             self._fetch_nothing,
-            "seekid":           self._fetch_nothing,
-            "stop":             self._fetch_nothing,
+            "next":               self._fetch_nothing,
+            "pause":              self._fetch_nothing,
+            "play":               self._fetch_nothing,
+            "playid":             self._fetch_nothing,
+            "previous":           self._fetch_nothing,
+            "seek":               self._fetch_nothing,
+            "seekid":             self._fetch_nothing,
+            "stop":               self._fetch_nothing,
             # Playlist Commands
-            "add":              self._fetch_nothing,
-            "addid":            self._fetch_item,
-            "clear":            self._fetch_nothing,
-            "delete":           self._fetch_nothing,
-            "deleteid":         self._fetch_nothing,
-            "move":             self._fetch_nothing,
-            "moveid":           self._fetch_nothing,
-            "playlist":         self._fetch_playlist,
-            "playlistfind":     self._fetch_songs,
-            "playlistid":       self._fetch_songs,
-            "playlistinfo":     self._fetch_songs,
-            "playlistsearch":   self._fetch_songs,
-            "plchanges":        self._fetch_songs,
-            "plchangesposid":   self._fetch_changes,
-            "shuffle":          self._fetch_nothing,
-            "swap":             self._fetch_nothing,
-            "swapid":           self._fetch_nothing,
+            "add":                self._fetch_nothing,
+            "addid":              self._fetch_item,
+            "clear":              self._fetch_nothing,
+            "delete":             self._fetch_nothing,
+            "deleteid":           self._fetch_nothing,
+            "move":               self._fetch_nothing,
+            "moveid":             self._fetch_nothing,
+            "playlist":           self._fetch_playlist,
+            "playlistfind":       self._fetch_songs,
+            "playlistid":         self._fetch_songs,
+            "playlistinfo":       self._fetch_songs,
+            "playlistsearch":     self._fetch_songs,
+            "plchanges":          self._fetch_songs,
+            "plchangesposid":     self._fetch_changes,
+            "shuffle":            self._fetch_nothing,
+            "swap":               self._fetch_nothing,
+            "swapid":             self._fetch_nothing,
             # Stored Playlist Commands
-            "listplaylist":     self._fetch_list,
-            "listplaylistinfo": self._fetch_songs,
-            "listplaylists":    self._fetch_playlists,
-            "load":             self._fetch_nothing,
-            "playlistadd":      self._fetch_nothing,
-            "playlistclear":    self._fetch_nothing,
-            "playlistdelete":   self._fetch_nothing,
-            "playlistmove":     self._fetch_nothing,
-            "rename":           self._fetch_nothing,
-            "rm":               self._fetch_nothing,
-            "save":             self._fetch_nothing,
+            "listplaylist":       self._fetch_list,
+            "listplaylistinfo":   self._fetch_songs,
+            "listplaylists":      self._fetch_playlists,
+            "load":               self._fetch_nothing,
+            "playlistadd":        self._fetch_nothing,
+            "playlistclear":      self._fetch_nothing,
+            "playlistdelete":     self._fetch_nothing,
+            "playlistmove":       self._fetch_nothing,
+            "rename":             self._fetch_nothing,
+            "rm":                 self._fetch_nothing,
+            "save":               self._fetch_nothing,
             # Database Commands
-            "count":            self._fetch_object,
-            "find":             self._fetch_songs,
-            "findadd":          self._fetch_nothing,
-            "list":             self._fetch_list,
-            "listall":          self._fetch_database,
-            "listallinfo":      self._fetch_database,
-            "lsinfo":           self._fetch_database,
-            "search":           self._fetch_songs,
-            "update":           self._fetch_item,
-            "rescan":           self._fetch_item,
+            "count":              self._fetch_object,
+            "find":               self._fetch_songs,
+            "findadd":            self._fetch_nothing,
+            "list":               self._fetch_list,
+            "listall":            self._fetch_database,
+            "listallinfo":        self._fetch_database,
+            "lsinfo":             self._fetch_database,
+            "search":             self._fetch_songs,
+            "update":             self._fetch_item,
+            "rescan":             self._fetch_item,
             # Sticker Commands
-            "sticker get":      self._fetch_item,
-            "sticker set":      self._fetch_nothing,
-            "sticker delete":   self._fetch_nothing,
-            "sticker list":     self._fetch_list,
-            "sticker find":     self._fetch_songs,
+            "sticker get":        self._fetch_item,
+            "sticker set":        self._fetch_nothing,
+            "sticker delete":     self._fetch_nothing,
+            "sticker list":       self._fetch_list,
+            "sticker find":       self._fetch_songs,
             # Connection Commands
-            "close":            None,
-            "kill":             None,
-            "password":         self._fetch_nothing,
-            "ping":             self._fetch_nothing,
+            "close":              None,
+            "kill":               None,
+            "password":           self._fetch_nothing,
+            "ping":               self._fetch_nothing,
             # Audio Output Commands
-            "disableoutput":    self._fetch_nothing,
-            "enableoutput":     self._fetch_nothing,
-            "outputs":          self._fetch_outputs,
+            "disableoutput":      self._fetch_nothing,
+            "enableoutput":       self._fetch_nothing,
+            "outputs":            self._fetch_outputs,
             # Reflection Commands
-            "commands":         self._fetch_list,
-            "notcommands":      self._fetch_list,
-            "tagtypes":         self._fetch_list,
-            "urlhandlers":      self._fetch_list,
-            "decoders":         self._fetch_plugins,
+            "commands":           self._fetch_list,
+            "notcommands":        self._fetch_list,
+            "tagtypes":           self._fetch_list,
+            "urlhandlers":        self._fetch_list,
+            "decoders":           self._fetch_plugins,
         }
 
     def __getattr__(self, attr):