Synced with xmmsclient API updates.

diff --git a/bin/euphoria b/bin/euphoria
index d2ad38fa13b0ff4a8fa237e800269269976f74e6..e2077a266f3db45d5569cfe63c9f0efa18debc35 100644 (file)
--- a/bin/euphoria
+++ b/bin/euphoria
@@ -110,7 +110,7 @@ class Euphoria
                end
 =end
 
                end
 =end
 

-               handle_current_pos(@xmms.playlist_current_pos.wait)
+               handle_current_pos(@xmms.playlist.current_pos.wait)

        end
 
        def show
        end
 
        def show

diff --git a/lib/playlist.rb b/lib/playlist.rb
index 0df6ff162ead0d094cf749bacc1326b22cd79998..e695e972d36571777cf4e7e662e621bc7e819616 100644 (file)
--- a/lib/playlist.rb
+++ b/lib/playlist.rb
@@ -12,12 +12,14 @@ class Playlist < Array
                @eet = nil
                @container = nil
 
                @eet = nil
                @container = nil
 

-               @xmms.playlist_list.notifier { |res| push(*res.value) }
+               @xmms.playlist.entries.notifier { |res| push(*res.value) }

 
 

-               begin
-                       @current_pos = @xmms.playlist_current_pos.wait.value
-               rescue Xmms::Result::ValueError
-                       @current_pos = nil
+               @xmms.playlist.current_pos.notifier do |res|
+                       begin
+                               @current_pos = res.value
+                       rescue Xmms::Result::ValueError
+                               @current_pos = nil
+                       end

                end
 
                @xmms.broadcast_playlist_current_pos.notifier do |res|
                end
 
                @xmms.broadcast_playlist_current_pos.notifier do |res|