Remove useless alias to MPD's currentsong command

multani · Oct 31, 2011 · cb68779 · cb68779
1 parent d0b4fd4
commit cb68779
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 8 deletions.
diff --git a/sonata/cli.py b/sonata/cli.py
@@ -150,7 +150,7 @@ def execute_cmd(self, cmd):
                     'preferences or MPD_HOST/MPD_PORT environment variables.'))
             sys.exit(1)
 
-        self.songinfo = self.MPDH.currsong()
+        self.songinfo = self.MPDH.currentsong()
         getattr(self, "_execute_%s" % cmd)()
 
     def _execute_play(self):

diff --git a/sonata/current.py b/sonata/current.py
@@ -295,8 +295,7 @@ def current_update(self, prevstatus_playlist, new_playlist_length):
                     pass
 
             if 'pos' in self.songinfo():
-                currsong = mpdh.get(self.songinfo(), 'pos', 0,
+                currsong = mpdh.get(self.songinfo(), 'pos', 0, True)
-                            True)
                 self.boldrow(currsong)
                 self.prev_boldrow = currsong
 

diff --git a/sonata/main.py b/sonata/main.py
@@ -469,7 +469,7 @@ def __init__(self, args, window=None, _sugar=False):
         if self.conn:
             self.status = self.MPDH.status()
             self.iterate_time = self.iterate_time_when_connected
-            self.songinfo = self.MPDH.currsong()
+            self.songinfo = self.MPDH.currentsong()
             self.artwork.update_songinfo(self.songinfo)
         elif self.config.initial_run:
             show_prefs = True
@@ -1157,7 +1157,7 @@ def update_status(self):
                     if self.status['state'] == 'stop':
                         self.iterate_time = \
                                 self.iterate_time_when_disconnected_or_stopped
-                    self.songinfo = self.MPDH.currsong()
+                    self.songinfo = self.MPDH.currentsong()
                     self.artwork.update_songinfo(self.songinfo)
                     if not self.last_repeat \
                        or self.last_repeat != self.status['repeat']:

diff --git a/sonata/mpdhelper.py b/sonata/mpdhelper.py
@@ -47,9 +47,6 @@ def status(self):
         else:
             return {}
 
-    def currsong(self):
-        return self.call('currentsong')
-
     @property
     def version(self):
         # XXX this is not supposed to change, unless the client reconnect to