f0d707c38ccb — Oben Sonne 10 years ago
server: fix mlib messages from server to client
2 files changed, 9 insertions(+), 4 deletions(-)

M server/src/remuco/session.py
M server/src/tests/bong.py
M server/src/remuco/session.py +8 -3
@@ 627,7 627,7 @@ class Player(object):
             *slice* over a tracklist.
 
         """
-        def reply(tracks, sublists):
+        def reply(sublists, tracks, listactionids, trackactionids):
             """
             Tracklist reply callback.
 

          
@@ 641,8 641,13 @@ class Player(object):
             cut = max(len(sublists) - frm, 0)
             sublists, tracks = slize[:cut], slize[cut:]
 
-            client.send('settracklist', path=path, fromto=fromto, length=length,
-                        sublists=sublists, tracks=tracks)
+            client.send('settracklist',
+                        path=path, fromto=fromto, length=length,
+                        sublists=sublists, tracks=tracks,
+                        listactionids=listactionids,
+                        trackactionids=trackactionids)
+
+        # TODO: where do we provide the file list? isn't this the right place?
 
         if not islistof(path, basestring):
             raise InvalidValueError('path', path)

          
M server/src/tests/bong.py +1 -1
@@ 152,7 152,7 @@ class Bong(dbus.service.Object):
         tracks = level['tracks']
         listactionids = [x[0] for x in self.features['listactions']]
         trackactionids = [x[0] for x in self.features['trackactions']]
-        return (sublists, listactionids, tracks, trackactionids)
+        return (sublists, tracks, listactionids, trackactionids)
 
     # -------------------------------------------------------------------------
     # set methods