ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/Protocol.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.115 by root, Thu Jul 12 19:10:52 2007 UTC vs.
Revision 1.117 by root, Fri Jul 13 05:31:31 2007 UTC

66 66
67 $chksum = unpack "H*", $chksum; 67 $chksum = unpack "H*", $chksum;
68 $self->{music_map}{$face} = $chksum; 68 $self->{music_map}{$face} = $chksum;
69 69
70 # check if already cached 70 # check if already cached
71 CFPlus::DB::get resmap => $chksum, sub { 71 CFPlus::DB::get "res-metadata" => $chksum, sub {
72 my ($meta) = @_; 72 my ($meta) = @_;
73 73
74 if (defined $meta) { 74 if (defined $meta) {
75 $self->{music_meta}{$chksum} = $self->{json_coder}->decode ($meta); 75 $self->{music_meta}{$chksum} = $self->{json_coder}->decode ($meta);
76 } else { 76 } else {
78 $self->ask_face ($face, -100 - $pri, undef, sub { 78 $self->ask_face ($face, -100 - $pri, undef, sub {
79 my $len = length $_[1]; 79 my $len = length $_[1];
80 my ($meta, $data) = unpack "(w/a*)*", $_[1]; 80 my ($meta, $data) = unpack "(w/a*)*", $_[1];
81 81
82 CFPlus::DB::write_file $chksum, $data, sub { }; 82 CFPlus::DB::write_file $chksum, $data, sub { };
83 CFPlus::DB::put resmap => $chksum => $meta, sub { }; 83 CFPlus::DB::put "res-metadata" => $chksum => $meta, sub { };
84 84
85 $self->{music_meta}{$chksum} = $self->{json_coder}->decode ($meta); 85 $self->{music_meta}{$chksum} = $self->{json_coder}->decode ($meta);
86 ::message ({ markup => "downloaded song #$face, size $len octets" }); 86 ::message ({ markup => "downloaded song #$face, size $len octets" });
87 87
88 &::audio_music_set ($self->{songs}); 88 &::audio_music_set ($self->{songs});
92 } 92 }
93 } 93 }
94 94
95 if (my $play = $ev->{play}) { 95 if (my $play = $ev->{play}) {
96 &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]); 96 &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]);
97 use Data::Dumper;
98 warn Dumper $self->{songs};#d#
99 } 97 }
100 }); 98 });
101 99
102 $self->connect_ext (event_capabilities => sub { 100 $self->connect_ext (event_capabilities => sub {
103 my ($cap) = @_; 101 my ($cap) = @_;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines