--- deliantra/Deliantra-Client/DC/Protocol.pm	2007/07/29 18:56:02	1.140
+++ deliantra/Deliantra-Client/DC/Protocol.pm	2007/07/31 02:03:13	1.143
@@ -50,11 +50,9 @@
    } sort { $a->{par} <=> $b->{par} }
           CFPlus::Pod::find command => "*";
 
-   $self->connect_ext (music => sub {
-      my ($ev) = @_;
-
-      &::audio_music_set ($self->{songs} = $ev->{play})
-         if $ev->{play};
+   $self->connect_ext (ambient_music => sub {
+      my ($songs) = @_;
+      &::audio_music_set_ambient ($songs);
    });
 
    $self->connect_ext (capabilities => sub {
@@ -760,28 +758,26 @@
             ::message ({ markup => "downloaded song #$facenum" })
                if $changed;
 
-            &::audio_music_set ($self->{songs});
+            &::audio_music_push ($facenum);
          };
       } elsif ($face->{type} == 5) { # FT_SOUND
          $cb = sub {
             $self->{sound_meta}{$facenum} = $face;
 
-            use Data::Dumper; warn Dumper $face;#d#
             ::message ({ markup => "downloaded sound #$facenum" })
                if $changed;
+
+            &::audio_sound_push ($facenum);
          };
       }
 
-
       if ($changed) { # new data
          my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
 
-         CFPlus::DB::put res_data => $face->{name} => $data, sub {
-            CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub {
-               $face->{meta} = $self->{json_coder}->decode ($meta_json);
-
-               $cb->();
-            };
+         CFPlus::DB::put res_data => $face->{name} => $data, sub { };
+         CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub {
+            $face->{meta} = $self->{json_coder}->decode ($meta_json);
+            $cb->();
          };
 
       } else {
@@ -825,10 +821,10 @@
 }
 
 sub sound_play {
-   my ($self, $x, $y, $soundnum, $type) = @_;
-   warn "sound play <@_>\n";#d#
+   my ($self, $type, $face, $dx, $dy, $vol) = @_;
 
-   #$self->{sound_play}->($x, $y, $soundnum, $type);
+   &::audio_sound_play ($face, $dx, $dy, $vol)
+      unless $type & 1; # odd types are silent for future expansion
 }
 
 my $LAST_QUERY; # server is stupid, stupid, stupid