Permalink
Browse files

Remove useless alias to MPD's currentsong command

  • Loading branch information...
multani committed Oct 31, 2011
1 parent d0b4fd4 commit cb68779c5675151e8e9adb7c223d561cfffd7886
Showing with 4 additions and 8 deletions.
  1. +1 −1 sonata/cli.py
  2. +1 −2 sonata/current.py
  3. +2 −2 sonata/main.py
  4. +0 −3 sonata/mpdhelper.py
View
@@ -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):
View
@@ -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,
- True)
+ currsong = mpdh.get(self.songinfo(), 'pos', 0, True)
self.boldrow(currsong)
self.prev_boldrow = currsong
View
@@ -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']:
View
@@ -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

0 comments on commit cb68779

Please sign in to comment.