--- deliantra/Deliantra-Client/DC/Protocol.pm	2007/07/12 18:28:34	1.114
+++ deliantra/Deliantra-Client/DC/Protocol.pm	2007/07/12 19:13:20	1.116
@@ -59,9 +59,9 @@
       my @songs;
 
       # request music from server if appropriate
-      my $pri = -100;
-      for my $face (@$faces) {
-         if (defined (my $chksum = $ev->{chksum}{$face})) {
+      if (my $faces = $ev->{faces}) {
+         for (@$faces) {
+            my ($face, $pri, $chksum) = @$_;
             utf8::downgrade $chksum;
 
             $chksum = unpack "H*", $chksum;
@@ -74,9 +74,8 @@
                if (defined $meta) {
                   $self->{music_meta}{$chksum} = $self->{json_coder}->decode ($meta);
                } else {
-                  ::message ({ markup => "starting to download song #$face, check your output-rate setting if your connection gets laggy." });
-                  $self->ask_face ($face, $pri, undef, sub {
-                     my $num = $_[0];
+                  ::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
+                  $self->ask_face ($face, -100 - $pri, undef, sub {
                      my $len = length $_[1];
                      my ($meta, $data) = unpack "(w/a*)*", $_[1];
 
@@ -91,12 +90,11 @@
                }
             }
          }
-
-         push @songs, $self->{music_map}{$face};
-         --$pri;
       }
 
-      &::audio_music_set ($self->{songs} = \@songs);
+      if (my $play = $ev->{play}) {
+         &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]);
+      }
    });
 
    $self->connect_ext (event_capabilities => sub {