--- deliantra/Deliantra-Client/DC/Protocol.pm	2007/07/10 16:25:16	1.112
+++ deliantra/Deliantra-Client/DC/Protocol.pm	2007/07/15 22:07:48	1.122
@@ -50,6 +50,60 @@
    } sort { $a->{par} <=> $b->{par} }
           CFPlus::Pod::find command => "*";
 
+   $self->connect_ext (event_music => sub {
+      my ($ev) = @_;
+
+      return unless $::CFG->{bgm_enable};
+
+      my $faces = $ev->{faces};
+      my @songs;
+
+      # request music from server if appropriate
+      if (my $faces = $ev->{faces}) {
+         for (@$faces) {
+            my ($face, $pri, $chksum) = @$_;
+            utf8::downgrade $chksum;
+
+            $chksum = unpack "H*", $chksum;
+            $self->{music_map}{$face} = $chksum;
+
+            # check if already cached
+            CFPlus::DB::get "res-metadata" => $chksum, sub {
+               my ($meta_json) = @_;
+               my $path = CFPlus::DB::path_of_res $chksum;
+
+               if (defined $meta_json) {
+                  my $meta = $self->{json_coder}->decode ($meta_json);
+                  $meta->{path} = $path;
+                  $self->{music_meta}{$chksum} = $meta;
+                  &::audio_music_set ($self->{songs});
+               } else {
+                  ::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_json, $data) = unpack "(w/a*)*", $_[1];
+
+                     CFPlus::DB::write_file $path, $data, sub {
+                        CFPlus::DB::put "res-metadata" => $chksum => $meta_json, sub {
+                           my $meta = $self->{json_coder}->decode ($meta_json);
+                           $meta->{path} = $path;
+                           $self->{music_meta}{$chksum} = $meta;
+
+                           ::message ({ markup => "downloaded song #$face, size $len octets" });
+                           &::audio_music_set ($self->{songs});
+                        };
+                     };
+                  });
+               }
+            }
+         }
+      }
+
+      if (my $play = $ev->{play}) {
+         &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]);
+      }
+   });
+
    $self->connect_ext (event_capabilities => sub {
       my ($cap) = @_;
 
@@ -714,12 +768,28 @@
 sub set_texture {
    my ($self, $id, $data) = @_;
 
+   return unless $self->{map};
+
    $self->{texture}[$id] = my $tex =
       new_from_image CFPlus::Texture
          $data, minify => 1, mipmap => 1;
 
    $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
    $self->{map_widget}->update;
+
+   $_->() for @{(delete $self->{face_cb}{$id}) || []};
+}
+
+sub connect_face_update {
+   my ($self, $id, $cb) = @_;
+
+   push @{$self->{face_cb}{$id}}, $cb;
+
+   CFPlus::guard {
+      @{$self->{face_cb}{$id}}
+         = grep $_ != $cb,
+              @{$self->{face_cb}{$id}};
+   }
 }
 
 sub sound_play {