--- deliantra/Deliantra-Client/DC/Protocol.pm 2007/07/10 16:25:16 1.112 +++ deliantra/Deliantra-Client/DC/Protocol.pm 2007/07/12 19:10:52 1.115 @@ -50,6 +50,55 @@ } 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 resmap => $chksum, sub { + my ($meta) = @_; + + if (defined $meta) { + $self->{music_meta}{$chksum} = $self->{json_coder}->decode ($meta); + } 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, $data) = unpack "(w/a*)*", $_[1]; + + CFPlus::DB::write_file $chksum, $data, sub { }; + CFPlus::DB::put resmap => $chksum => $meta, sub { }; + + $self->{music_meta}{$chksum} = $self->{json_coder}->decode ($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]); + use Data::Dumper; + warn Dumper $self->{songs};#d# + } + }); + $self->connect_ext (event_capabilities => sub { my ($cap) = @_;